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

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

Browse Source 
# Conflicts:
#	Assets/Scripts/Apis/Models/MapCompetition.cs
This commit is contained in:
lishuo committed 2021-07-23 09:43:46 +08:00
2 parents e76b5c443f d9d66ab96c
commit d18ff09002
50 files changed
+14689 -227
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Resources/UI/Prefab/Panel/RaceHomePanel.prefab
+1611
View File
File diff suppressed because it is too large. Load diff
Assets/Resources/UI/Prefab/Panel/RaceHomePanel.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: db242b09d397f4f499c8a6d8fdb1ce79
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/UI/Prefab/Panel/RaceListPanel.prefab
+3064
View File
File diff suppressed because it is too large. Load diff
Assets/Resources/UI/Prefab/Panel/RaceListPanel.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c229180641622644c9de5f6dc904affc
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: