From 777db1792e1e85c9721ee72d9372948e1dedc14e Mon Sep 17 00:00:00 2001 From: bzx <496597135@qq.com> Date: Tue, 2 Sep 2025 13:31:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E9=81=93=E5=85=B7?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_Zombie/Prefabs/GameManager.prefab | 13 +-- Assets/_Zombie/Prefabs/Prop/ItemProp.prefab | 118 +++++++++++++++++++- Assets/_Zombie/Scenes/Company1Floor.unity | 1 + ProjectSettings/TagManager.asset | 4 +- 4 files changed, 122 insertions(+), 14 deletions(-) diff --git a/Assets/_Zombie/Prefabs/GameManager.prefab b/Assets/_Zombie/Prefabs/GameManager.prefab index 7c568d2e..18390447 100644 --- a/Assets/_Zombie/Prefabs/GameManager.prefab +++ b/Assets/_Zombie/Prefabs/GameManager.prefab @@ -65,16 +65,11 @@ MonoBehaviour: syncDirection: 0 syncMode: 0 syncInterval: 0 - PowerCorePre: {fileID: 8825645320952646756, guid: b94e3563a43d3204e8603d7df16b9858, - type: 3} DoorPre: {fileID: 2201411466238183742, guid: 1becc5b2e4b48c74a941f2abfebff177, type: 3} gunPropPre: {fileID: 1274079096308579815, guid: bd68abdbbd5c63148bd42a37c73cac78, type: 3} - TowerPres: - - {fileID: 8825645320952646756, guid: b94e3563a43d3204e8603d7df16b9858, type: 3} - - {fileID: 4810116376554984694, guid: e946c65d2aa3a284290da8e25a190453, type: 3} - - {fileID: 4810116376554984694, guid: ce1f671ca7643854ead9298b18366dc4, type: 3} - - {fileID: 4810116376554984694, guid: b62e3cff54acc3f43a797b9aafac5d09, type: 3} + itemPropPre: {fileID: 1274079096308579815, guid: 78fd5a17f4729e045a8fd3bc149969a5, + type: 3} EnemyPres: - {fileID: 7630197715568248853, guid: 0ee7fcb1076f9f74081540c325e7247a, type: 3} - {fileID: 2571627240868883349, guid: 40a6b32c0e9717d4d84fbc31003a073c, type: 3} @@ -85,8 +80,8 @@ MonoBehaviour: type: 3} EnemyUIPre: {fileID: 905399022738026712, guid: 5495a17eb1e04dc42b68347dae126e2f, type: 3} - players: [] towerIndex: 0 + isStart: 0 roundIndex: 0 settleData: gameState: 0 @@ -95,3 +90,5 @@ MonoBehaviour: roundWaveTime: 0 curRoundWaveTime: 0 curRoundEnemyCount: 0 + gunProp1: 0 + gunProp2: 0 diff --git a/Assets/_Zombie/Prefabs/Prop/ItemProp.prefab b/Assets/_Zombie/Prefabs/Prop/ItemProp.prefab index ef8f48a4..e15f957e 100644 --- a/Assets/_Zombie/Prefabs/Prop/ItemProp.prefab +++ b/Assets/_Zombie/Prefabs/Prop/ItemProp.prefab @@ -13,9 +13,9 @@ GameObject: - component: {fileID: 7852722055280247665} - component: {fileID: 5503304241196554872} - component: {fileID: 6673157921488967293} - m_Layer: 14 + m_Layer: 15 m_Name: ItemProp - m_TagString: WeaponProp + m_TagString: ItemProp m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -132,8 +132,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1.5, y: 1, z: 1.5} - m_Center: {x: 0, y: 0.5, z: 0} + m_Size: {x: 2, y: 1, z: 2} + m_Center: {x: 0, y: 0, z: 0} --- !u!114 &6673157921488967293 MonoBehaviour: m_ObjectHideFlags: 0 @@ -210,11 +210,61 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1101926233390666961, guid: 80e0894006921e047a62f88fa1b38b0a, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 1233956214774776873, guid: 80e0894006921e047a62f88fa1b38b0a, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 1252632656682875994, guid: 80e0894006921e047a62f88fa1b38b0a, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 1349953979761355390, guid: 80e0894006921e047a62f88fa1b38b0a, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} - target: {fileID: 1432000175373195692, guid: 80e0894006921e047a62f88fa1b38b0a, type: 3} propertyPath: m_Name value: "\u6CBB\u7597\u7BB1" objectReference: {fileID: 0} + - target: {fileID: 1432000175373195692, guid: 80e0894006921e047a62f88fa1b38b0a, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 5364599802556864648, guid: 80e0894006921e047a62f88fa1b38b0a, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 5917740928146404341, guid: 80e0894006921e047a62f88fa1b38b0a, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 7144093575203524941, guid: 80e0894006921e047a62f88fa1b38b0a, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 7905341536310234654, guid: 80e0894006921e047a62f88fa1b38b0a, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 8159008930476799005, guid: 80e0894006921e047a62f88fa1b38b0a, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -289,6 +339,11 @@ PrefabInstance: propertyPath: looping value: 1 objectReference: {fileID: 0} + - target: {fileID: 646428754428221778, guid: c1029da1ff31d8448b2ff65c04411cda, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} - target: {fileID: 1949087354086492498, guid: c1029da1ff31d8448b2ff65c04411cda, type: 3} propertyPath: looping @@ -309,6 +364,16 @@ PrefabInstance: propertyPath: m_Name value: "\u6CBB\u7597\u836F\u5242\u7279\u6548" objectReference: {fileID: 0} + - target: {fileID: 7539080896010719509, guid: c1029da1ff31d8448b2ff65c04411cda, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 8844583702265607237, guid: c1029da1ff31d8448b2ff65c04411cda, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -328,11 +393,51 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1363603555789101606} m_Modifications: + - target: {fileID: 950877517808929759, guid: c62cc55b158cf004193c3770270091c9, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 1009465242357089601, guid: c62cc55b158cf004193c3770270091c9, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} - target: {fileID: 1134369481314700721, guid: c62cc55b158cf004193c3770270091c9, type: 3} propertyPath: m_Name value: "\u67AA\u5468\u56F4\u5149\u5708\u7279\u654802" objectReference: {fileID: 0} + - target: {fileID: 1134369481314700721, guid: c62cc55b158cf004193c3770270091c9, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 3638305416909078098, guid: c62cc55b158cf004193c3770270091c9, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 3863667168268822279, guid: c62cc55b158cf004193c3770270091c9, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 5682986289942542980, guid: c62cc55b158cf004193c3770270091c9, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 7911000408926587808, guid: c62cc55b158cf004193c3770270091c9, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 8059904997510323676, guid: c62cc55b158cf004193c3770270091c9, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} - target: {fileID: 8505914673053782672, guid: c62cc55b158cf004193c3770270091c9, type: 3} propertyPath: m_LocalPosition.x @@ -383,6 +488,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8630554304944364007, guid: c62cc55b158cf004193c3770270091c9, + type: 3} + propertyPath: m_Layer + value: 15 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/_Zombie/Scenes/Company1Floor.unity b/Assets/_Zombie/Scenes/Company1Floor.unity index 31483507..27d19cff 100644 --- a/Assets/_Zombie/Scenes/Company1Floor.unity +++ b/Assets/_Zombie/Scenes/Company1Floor.unity @@ -3668,6 +3668,7 @@ MonoBehaviour: - {fileID: 1671084456144575652, guid: 090b79e423ef3df44818c0557afad48a, type: 3} - {fileID: 1671084456144575652, guid: 9435fdf3551c5b940b19d148c459dc0d, type: 3} - {fileID: 1671084456144575652, guid: 4b58e4dc55f38d248be2c027708cb872, type: 3} + - {fileID: 1274079096308579815, guid: 78fd5a17f4729e045a8fd3bc149969a5, type: 3} snapshotSettings: bufferTimeMultiplier: 2 bufferLimit: 32 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 5fada815..d85c30c5 100644 --- 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 - - -