Merge remote-tracking branch 'origin/Huang' into main_ZYT
# Conflicts: # ProjectSettings/EditorBuildSettings.asset # ProjectSettings/ProjectSettings.asset
This commit is contained in:
13489
Assets/_KOF/Scenes/Guangdong_Meizhou_Meixian_TianhongShangchang.unity
Normal file
13489
Assets/_KOF/Scenes/Guangdong_Meizhou_Meixian_TianhongShangchang.unity
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b07e7da73e98be8419bcdc8ac71290df
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
14050
Assets/_KOF/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity
Normal file
14050
Assets/_KOF/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bdfb071b863634445b186a2b95f428f9
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
14167
Assets/_KOF/Scenes/Ningxia_Yinchuang_Shizuishan_WandaGuangchang.unity
Normal file
14167
Assets/_KOF/Scenes/Ningxia_Yinchuang_Shizuishan_WandaGuangchang.unity
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 138586f967fbdca448df162889d97ce3
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -99,6 +99,10 @@ public enum Place
|
||||
Jiangxi_Ganzhou_Longnan_WandaGuangchang=57,
|
||||
Jiangxi_Ganzhou_Longnan_WandaGuangchang_Shinei = 58,
|
||||
Jiangxi_Ganzhou_Zhanggong_GanzhouShucheng = 59,
|
||||
Henan_Shangqiu_Juyang_WuyueGuangchang = 60,
|
||||
Guangdong_Meizhou_Meixian_TianhongShangchang = 61,
|
||||
Beijing_Tongzhou_Luyijie_XiangrikuiGuangchang = 62,
|
||||
Ningxia_Yinchuang_Shizuishan_WandaGuangchang = 63,
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user