lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp

Browse Source
This commit is contained in:
Caiyanpeng committed 2022-01-13 18:58:01 +08:00
2 parents 5489fa2a24 5bc1bec425
commit fed54ad85b
7 files changed
+21 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Resources/UI/Prefab/Match/CountDownPanel.prefab
+2 -2
View File
@@ -156,7 +156,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Riding Time
m_Text: 'Get Ready:'
--- !u!114 &3886708269221531246
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -248,7 +248,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Get Ready
m_Text: Competition Time
--- !u!114 &5952686733100152547
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/Resources/UI/Prefab/Ride/CancelPanel.prefab
+1 -1
View File
@@ -5325,7 +5325,7 @@ GameObject:
- component: {fileID: 8046915994613852834}
- component: {fileID: 5739020646471174006}
m_Layer: 5
m_Name: CancelButton
m_Name: CloseButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Assets/Resources/UI/Prefab/Ride/Mobile/CancelPanel.prefab
+1 -1
View File
@@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 2981122519614947927}
- component: {fileID: 2993340167898118021}
m_Layer: 5
m_Name: CancelButton
m_Name: CloseButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0