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

This commit is contained in:
Caiyanpeng committed 2021-12-29 17:06:04 +08:00
commit 95d845ac0f
3 files changed
+25 -8

No files matched your search

@@ -3536,13 +3536,13 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 48
m_Alignment: 0
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Top 10
m_Text: RANKING
--- !u!114 &8872437898649796386
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4219,6 +4219,7 @@ GameObject:
- component: {fileID: 4131203580560256159}
- component: {fileID: 5921965671833874072}
- component: {fileID: 1126882534568575374}
- component: {fileID: 3122355159842659469}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
@@ -4286,6 +4287,19 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: View All
--- !u!114 &3122355159842659469
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5635372946248809289}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!1 &6046649886281115850
GameObject:
m_ObjectHideFlags: 0