Merge branch 'Huang' of http://192.168.0.105:45441/PineappleTech/Zombie into Huang

# Conflicts:
#	Assets/_Zombie/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset

Assets/_Zombie/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity

@@ -12581,11 +12581,14 @@ PrefabInstance:
       propertyPath: m_Name
       value: "\u6CB3\u5357\u5546\u4E18"
       objectReference: {fileID: 0}
+<<<<<<< HEAD
     - target: {fileID: 6480501167749381553, guid: e463e2a5a50d0a244a1b3a5cc5f681a1,
         type: 3}
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+=======
+>>>>>>> eb1566f0a79cad39f10ab740ee7ab9f8ec97e8f8
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

ProjectSettings/EditorBuildSettings.asset

@@ -197,12 +197,18 @@ EditorBuildSettings:
   - enabled: 0
     path: Assets/_Zombie/Scenes/Jiangxi_Ganzhou_Longnan_WandaGuangchang_Shinei.unity
     guid: 8ba211bdfe6b5204d9f3eaf3667fe51d
+<<<<<<< HEAD
   - enabled: 0
     path: Assets/_Zombie/Scenes/Jiangxi_Ganzhou_Zhanggong_GanzhouShucheng.unity
     guid: 72cacd349decdb941938da562d3ce54f
   - enabled: 1
     path: Assets/_Zombie/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity
     guid: ebe09b16f5fee374db343fdbea8e3f07
+=======
+  - enabled: 1
+    path: Assets/_Zombie/Scenes/Jiangxi_Ganzhou_Zhanggong_GanzhouShucheng.unity
+    guid: 72cacd349decdb941938da562d3ce54f
+>>>>>>> eb1566f0a79cad39f10ab740ee7ab9f8ec97e8f8
   m_configObjects:
     Unity.XR.PXR.Settings: {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2,
       type: 2}

ProjectSettings/ProjectSettings.asset

@@ -163,7 +163,11 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
+<<<<<<< HEAD
     Android: com.pineappletech.zombie.henanshangqiujuyangwuyueguangchang
+=======
+    Android: com.pineappletech.zombie.jiangxiganzhouzhanggongganzhoushucheng
+>>>>>>> eb1566f0a79cad39f10ab740ee7ab9f8ec97e8f8
     Standalone: com.DefaultCompany.com.unity.template.ar
   buildNumber:
     Standalone: 0