Merge remote-tracking branch 'origin/main_ZYT'

# Conflicts: # ProjectSettings/ProjectSettings.asset
2025-09-02 18:25:55 +08:00
parent 5a84813302 445e2eecdc
commit aa4ba610ef
3 changed files with 688 additions and 24388 deletions
--- a/Assets/_Zombie/Scenes/Liaoning_Anshan.unity
+++ b/Assets/_Zombie/Scenes/Liaoning_Anshan.unity
@@ -9145,7 +9145,7 @@ MonoBehaviour:
  IncludeChildColliders: 0
  RuntimeFollower: {fileID: 0}
  colliderMaxDistance: 100
-  lastTimeMaxDistanceCalced: 638924235149417414
+  lastTimeMaxDistanceCalced: 638924305884756521
 --- !u!1 &679496949
 GameObject:
  m_ObjectHideFlags: 0
@@ -15411,6 +15411,8 @@ MonoBehaviour:
  - {fileID: 793457653}
  - {fileID: 928947492}
  - {fileID: 178864040}
+  - {fileID: 1886713433}
+  - {fileID: 1255622855}
  gunPropPos:
  - {fileID: 1134898388}
  - {fileID: 450657585}
--- a/Assets/_Zombie/Scenes/Zhejiang_Shaoxing_Shengzhou_Wuyueguangchang.unity
+++ b/Assets/_Zombie/Scenes/Zhejiang_Shaoxing_Shengzhou_Wuyueguangchang.unity