Merge remote-tracking branch 'origin/main_ZYT'
# Conflicts: # ProjectSettings/ProjectSettings.asset
This commit is contained in:
@@ -8,7 +8,7 @@ EditorBuildSettings:
|
||||
- enabled: 0
|
||||
path: Assets/_Zombie/Scenes/Company1Floor.unity
|
||||
guid: 386a8fdea01af8a4e8d4a9835407ddec
|
||||
- enabled: 0
|
||||
- enabled: 1
|
||||
path: Assets/_Zombie/Scenes/Zhejiang_Shaoxing_Shengzhou_Wuyueguangchang.unity
|
||||
guid: df8c4c84bf9690442a51ed602038e198
|
||||
- enabled: 0
|
||||
|
||||
Reference in New Issue
Block a user