You've already forked taptap2024_GJ_chidouren
Merge branch 'master' into master_mapDev
# Conflicts: # Assets/GameRes/AlwaysRes/FontResource/Fonts & Materials/SourceHanSansCN-Medium SDF.asset
This commit is contained in:
File diff suppressed because one or more lines are too long
2930
Assets/GameRes/View/EndAboutPanel.prefab
Normal file
2930
Assets/GameRes/View/EndAboutPanel.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/GameRes/View/EndAboutPanel.prefab.meta
Normal file
7
Assets/GameRes/View/EndAboutPanel.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7efb22974f40b414d9a8ba8a46eee2ed
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user