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

# Conflicts: # ProjectSettings/ProjectSettings.asset
2026-01-27 16:50:09 +08:00
parent 18dcc1a513 75f5d49451
commit 0dac42c8de
10 changed files with 15174 additions and 0 deletions
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -227,6 +227,9 @@ EditorBuildSettings:
  - enabled: 0
    path: Assets/_KOF/Scenes/Hunan_Xiangxi_Yongshun_XintiandiShangchang.unity
    guid: 3b05187c93e1d1f4e9de6b338cead46d
+  - enabled: 1
+    path: Assets/_KOF/Scenes/Shanxi_Yuncheng_Yanhu_WandaGuangchang.unity
+    guid: db5f65d66c695814f841cb083f10d2fa
  m_configObjects:
    Unity.XR.PXR.Settings: {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2,
      type: 2}