Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp · 02111a57b1 - powerfun-unity - JuZe Git Server

lishuo/powerfun-unity

1 Fork 0

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

# Conflicts:
#	Assets/Resources/UI/language.json

This commit is contained in:

Caiyanpeng committed 2022-01-12 16:56:50 +08:00

2 parents 91fa3cc82d 61fefda590

commit 02111a57b1

8 files changed

+4026 -465

No files matched your search

Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab

+1992 -248

View File

File diff suppressed because it is too large. Load diff

Assets/Resources/UI/Prefab/Ride/MySelfRankingItem.prefab

+1 -1

View File

@@ -327,7 +327,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
     m_Alignment: 0
     m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0

Assets/Resources/UI/Prefab/Ride/Panel.prefab

+1989 -203

View File

File diff suppressed because it is too large. Load diff