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

# Conflicts: # ProjectSettings/ProjectSettings.asset
2025-09-02 14:48:30 +08:00
parent 5861a46e42 532e054580
commit 688b5e3dcf
214 changed files with 30812 additions and 340 deletions
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -5,7 +5,7 @@ EditorBuildSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Scenes:
-  - enabled: 0
+  - enabled: 1
    path: Assets/_Zombie/Scenes/Company1Floor.unity
    guid: 386a8fdea01af8a4e8d4a9835407ddec
  - enabled: 0
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -11,7 +11,7 @@ TagManager:
  - Tower
  - Controller
  - WeaponProp
-  - Enemy
+  - ItemProp
  layers:
  - Default
  - TransparentFX
@@ -28,7 +28,7 @@ TagManager:
  - Player
  - Air
  - WeaponProp
-  - 
+  - ItemProp
  - 
  - 
  -