Merge remote-tracking branch 'origin/main_ZYT' into Huang

# Conflicts: # ProjectSettings/ProjectSettings.asset
2026-01-28 18:32:27 +08:00
parent d735cf352e bff47de606
commit e48b45bfe4
3 changed files with 51 additions and 3 deletions
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -134,7 +134,7 @@ EditorBuildSettings:
  - enabled: 0
    path: Assets/_KOF/Scenes/Henan_Xinxiang_Wandaguangchang_Shinei.unity
    guid: b09470651ebef8841bf194df66b89800
-  - enabled: 0
+  - enabled: 1
    path: Assets/_KOF/Scenes/Nanjing_Pukou_Longhutianjie.unity
    guid: 6d8510f4d2a2dce43a497a8373573d70
  - enabled: 0
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -162,7 +162,7 @@ PlayerSettings:
  androidSupportedAspectRatio: 1
  androidMaxAspectRatio: 2.1
  applicationIdentifier:
-    Android: com.pineappletech.kof.shandongjinanhuaiyinshengfutngshangmao
+    Android: com.pineappletech.kof.nanjingpukoulonghutianjie
    Standalone: com.DefaultCompany.com.unity.template.ar
  buildNumber:
    Standalone: 0