From c5522e8aa28a600eeb72e1d6b1f63b48a7399606 Mon Sep 17 00:00:00 2001 From: xy451 <307378529@qq.com> Date: Sat, 20 Dec 2025 15:56:43 +0800 Subject: [PATCH] =?UTF-8?q?=C2=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Bullet_BlazingRed_Small_Projectile.prefab | 42 ++++++-- .../AirPlane/Enemy/Nightingale Binder.prefab | 8 ++ .../AirPlane/Enemy/Orca Defender.prefab | 8 ++ .../AirPlane/Enemy/Panzer Binder.prefab | 8 ++ .../AirPlane/Enemy/Panzer Defender.prefab | 8 ++ .../AirPlane/Enemy/Panzer Guarder.prefab | 8 ++ .../Enemy/Quellease Guarder (Slot).prefab | 8 ++ .../AirPlane/Enemy/Radiation Binder.prefab | 8 ++ .../Enemy/Rattlesnake Defender.prefab | 8 ++ .../AirPlane/Enemy/Raven Binder.prefab | 8 ++ .../AirPlane/Enemy/Rhino Guarder.prefab | 8 ++ .../AirPlane/Enemy/Round Binder.prefab | 8 ++ .../AirPlane/Enemy/Round Defender.prefab | 8 ++ .../AirPlane/Enemy/Round Guarder.prefab | 8 ++ .../Prefabs/AirPlane/Enemy/Round Veil.prefab | 8 ++ .../AirPlane/Enemy/Santabadoveru .prefab | 8 ++ .../AirPlane/Enemy/Schneider Guarder.prefab | 8 ++ .../AirPlane/Enemy/Stormriser Veil.prefab | 8 ++ .../AirPlane/Enemy/Tiger Guarder.prefab | 8 ++ .../AirPlane/Enemy/Warfare (Black).prefab | 8 ++ .../Prefabs/AirPlane/Enemy/vert leader.prefab | 8 ++ Assets/Game1/Prefabs/EnemyCube.prefab | 57 ++++++----- Assets/Game1/Scenes/Game1_Level1.unity | 53 ++++------ Assets/Scripts/Bullet.cs | 98 ++++++++++--------- Assets/Scripts/Shot.cs | 18 +++- ProjectSettings/TagManager.asset | 2 +- 26 files changed, 309 insertions(+), 121 deletions(-) diff --git a/Assets/EffectCore/packs/StylizedProjectilePack1/prefabs/Bullet/Bullet_BlazingRed/Bullet_Small_BlazingRed/Bullet_BlazingRed_Small_Projectile.prefab b/Assets/EffectCore/packs/StylizedProjectilePack1/prefabs/Bullet/Bullet_BlazingRed/Bullet_Small_BlazingRed/Bullet_BlazingRed_Small_Projectile.prefab index 6cd7014..a05f1f6 100644 --- a/Assets/EffectCore/packs/StylizedProjectilePack1/prefabs/Bullet/Bullet_BlazingRed/Bullet_Small_BlazingRed/Bullet_BlazingRed_Small_Projectile.prefab +++ b/Assets/EffectCore/packs/StylizedProjectilePack1/prefabs/Bullet/Bullet_BlazingRed/Bullet_Small_BlazingRed/Bullet_BlazingRed_Small_Projectile.prefab @@ -14,6 +14,7 @@ GameObject: - component: {fileID: 114591203083495332} - component: {fileID: 198228151580939694} - component: {fileID: 3756797071505677828} + - component: {fileID: 5448640415463596241} m_Layer: 0 m_HasEditorInfo: 1 m_Name: Bullet_BlazingRed_Small_Projectile @@ -30,16 +31,16 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1238843893459588} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4749193282715014} - {fileID: 4259899786885656} - {fileID: 4521043017447906} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114950535843143764 MonoBehaviour: m_ObjectHideFlags: 0 @@ -181,7 +182,6 @@ ParticleSystemRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 4cc738b733acd1d4ba4d504ad5d46ea5, type: 2} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -250,7 +250,7 @@ MonoBehaviour: type: 3} explosionPrefab: {fileID: 0} thrust: 0 - thisRigidbody: {fileID: 0} + thisRigidbody: {fileID: 5448640415463596241} particleKillGroup: {fileID: 0} LookRotation: 1 Missile: 0 @@ -5012,7 +5012,7 @@ MonoBehaviour: type: 3} explosionPrefab: {fileID: 0} thrust: 0 - thisRigidbody: {fileID: 0} + thisRigidbody: {fileID: 5448640415463596241} particleKillGroup: {fileID: 0} LookRotation: 1 Missile: 0 @@ -5022,6 +5022,33 @@ MonoBehaviour: ignorePrevRotation: 0 explodeOnTimer: 0 explosionTimer: 0 +--- !u!54 &5448640415463596241 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1238843893459588} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &1540588367011230 GameObject: m_ObjectHideFlags: 0 @@ -9803,7 +9830,6 @@ ParticleSystemRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 1d4efe2e7e01f2a408fa16199f23230d, type: 2} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -14691,7 +14717,6 @@ ParticleSystemRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: be8a68a4ceb83f947b32e8cd8e36d668, type: 2} - - {fileID: 2100000, guid: be8a68a4ceb83f947b32e8cd8e36d668, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -19525,7 +19550,6 @@ ParticleSystemRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 5761576d2d8b55549bb01953b3d2a60c, type: 2} - - {fileID: 2100000, guid: 5761576d2d8b55549bb01953b3d2a60c, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Nightingale Binder.prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Nightingale Binder.prefab index 2b0c4a1..d964734 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Nightingale Binder.prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Nightingale Binder.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: d2ec959e818f76d44a0c26d06b593f19, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: d2ec959e818f76d44a0c26d06b593f19, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400000, guid: d2ec959e818f76d44a0c26d06b593f19, type: 3} propertyPath: m_LocalScale.x value: 0.05 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Orca Defender.prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Orca Defender.prefab index 67c8e7c..da3a206 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Orca Defender.prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Orca Defender.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: 6b84f490d490c0543ac9da701955a595, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 6b84f490d490c0543ac9da701955a595, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400000, guid: 6b84f490d490c0543ac9da701955a595, type: 3} propertyPath: m_LocalScale.x value: 0.05 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Panzer Binder.prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Panzer Binder.prefab index 4991514..f6d9cfb 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Panzer Binder.prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Panzer Binder.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: 9b19f67ad3fa461479efd32506b3be32, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 9b19f67ad3fa461479efd32506b3be32, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: 9b19f67ad3fa461479efd32506b3be32, type: 3} propertyPath: m_LocalPosition.x value: 80.15141 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Panzer Defender.prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Panzer Defender.prefab index 1511e11..209638d 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Panzer Defender.prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Panzer Defender.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: b652d71fb6c8cc64a9e21643423f40cc, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: b652d71fb6c8cc64a9e21643423f40cc, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: b652d71fb6c8cc64a9e21643423f40cc, type: 3} propertyPath: m_LocalPosition.x value: 112.38421 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Panzer Guarder.prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Panzer Guarder.prefab index a722521..9c8bdfe 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Panzer Guarder.prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Panzer Guarder.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: e9cc1837312f92f4ca9bfe219c73a7a4, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: e9cc1837312f92f4ca9bfe219c73a7a4, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: e9cc1837312f92f4ca9bfe219c73a7a4, type: 3} propertyPath: m_LocalPosition.x value: 150.22029 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Quellease Guarder (Slot).prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Quellease Guarder (Slot).prefab index 3f16368..8109d04 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Quellease Guarder (Slot).prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Quellease Guarder (Slot).prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: 9c19be78e12bbfe48aa4bfc15ca590d2, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 9c19be78e12bbfe48aa4bfc15ca590d2, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: 9c19be78e12bbfe48aa4bfc15ca590d2, type: 3} propertyPath: m_LocalPosition.x value: 189.45187 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Radiation Binder.prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Radiation Binder.prefab index cd07072..928a17f 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Radiation Binder.prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Radiation Binder.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: cf0264fe24acf964b88749bf52a8fcf7, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: cf0264fe24acf964b88749bf52a8fcf7, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: cf0264fe24acf964b88749bf52a8fcf7, type: 3} propertyPath: m_LocalPosition.x value: 0 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Rattlesnake Defender.prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Rattlesnake Defender.prefab index 2cf3e77..e7a6c51 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Rattlesnake Defender.prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Rattlesnake Defender.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: 07cc5e327088bad4f80061b99e3e0fdb, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 07cc5e327088bad4f80061b99e3e0fdb, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: 07cc5e327088bad4f80061b99e3e0fdb, type: 3} propertyPath: m_LocalPosition.x value: 80.421616 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Raven Binder.prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Raven Binder.prefab index c714cac..e31d56d 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Raven Binder.prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Raven Binder.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: 3224324000493904ea23b1fd7d1cbac0, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 3224324000493904ea23b1fd7d1cbac0, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: 3224324000493904ea23b1fd7d1cbac0, type: 3} propertyPath: m_LocalPosition.x value: 112.314705 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Rhino Guarder.prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Rhino Guarder.prefab index d8be125..292dd83 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Rhino Guarder.prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Rhino Guarder.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: a5d9b0da7f42e12439f053358c66ad92, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: a5d9b0da7f42e12439f053358c66ad92, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: a5d9b0da7f42e12439f053358c66ad92, type: 3} propertyPath: m_LocalPosition.x value: 149.76842 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Round Binder.prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Round Binder.prefab index 2c8eb04..c78e729 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Round Binder.prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Round Binder.prefab @@ -8,10 +8,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: 70328a2818eec4c4189c82b8531ca4ff, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 100002, guid: 70328a2818eec4c4189c82b8531ca4ff, type: 3} propertyPath: m_Name value: Round Binder objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 70328a2818eec4c4189c82b8531ca4ff, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: 70328a2818eec4c4189c82b8531ca4ff, type: 3} propertyPath: m_LocalPosition.x value: 40.96852 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Round Defender.prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Round Defender.prefab index 1b6c375..dcfcae5 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Round Defender.prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Round Defender.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: 805bfc47316d16b42b0ea385adef398d, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 805bfc47316d16b42b0ea385adef398d, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: 805bfc47316d16b42b0ea385adef398d, type: 3} propertyPath: m_LocalPosition.x value: 80.359764 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Round Guarder.prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Round Guarder.prefab index 434709a..e9f857c 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Round Guarder.prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Round Guarder.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: 43da9dfce57b3934f9870302fd57458e, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 43da9dfce57b3934f9870302fd57458e, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: 43da9dfce57b3934f9870302fd57458e, type: 3} propertyPath: m_LocalPosition.x value: 112.31804 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Round Veil.prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Round Veil.prefab index c3593d3..ce8254f 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Round Veil.prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Round Veil.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: 0ed6b83f74237454586bb0a00f8befb3, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 0ed6b83f74237454586bb0a00f8befb3, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: 0ed6b83f74237454586bb0a00f8befb3, type: 3} propertyPath: m_LocalPosition.x value: 148.67815 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Santabadoveru .prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Santabadoveru .prefab index e77b707..31dc723 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Santabadoveru .prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Santabadoveru .prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: f94b787169c54144a98730806f6c9654, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: f94b787169c54144a98730806f6c9654, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: f94b787169c54144a98730806f6c9654, type: 3} propertyPath: m_LocalPosition.x value: 186.92711 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Schneider Guarder.prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Schneider Guarder.prefab index 0c68ccd..99a8c1c 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Schneider Guarder.prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Schneider Guarder.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: 0a8306d31cc774c40a6114204316efd6, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 0a8306d31cc774c40a6114204316efd6, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: 0a8306d31cc774c40a6114204316efd6, type: 3} propertyPath: m_LocalPosition.x value: 0 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Stormriser Veil.prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Stormriser Veil.prefab index 860178b..75cf7ba 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Stormriser Veil.prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Stormriser Veil.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: 5ee820c317889a14687afa64112564ca, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 5ee820c317889a14687afa64112564ca, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: 5ee820c317889a14687afa64112564ca, type: 3} propertyPath: m_LocalPosition.x value: 111.77209 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Tiger Guarder.prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Tiger Guarder.prefab index 5f5bf9b..5018517 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Tiger Guarder.prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Tiger Guarder.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: f3c08554280214647a95ccee194103ce, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: f3c08554280214647a95ccee194103ce, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: f3c08554280214647a95ccee194103ce, type: 3} propertyPath: m_LocalPosition.x value: 0 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/Warfare (Black).prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/Warfare (Black).prefab index d616c1b..218aac4 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/Warfare (Black).prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/Warfare (Black).prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: da3bee2f22b2ce849affcf79f8da849d, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: da3bee2f22b2ce849affcf79f8da849d, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: da3bee2f22b2ce849affcf79f8da849d, type: 3} propertyPath: m_LocalPosition.x value: 113.06756 diff --git a/Assets/Game1/Prefabs/AirPlane/Enemy/vert leader.prefab b/Assets/Game1/Prefabs/AirPlane/Enemy/vert leader.prefab index d6a7cd4..ec0abd1 100644 --- a/Assets/Game1/Prefabs/AirPlane/Enemy/vert leader.prefab +++ b/Assets/Game1/Prefabs/AirPlane/Enemy/vert leader.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: 1d4ac76b755ee6446910455eab2bd844, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 1d4ac76b755ee6446910455eab2bd844, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1d4ac76b755ee6446910455eab2bd844, type: 3} propertyPath: m_LocalPosition.x value: 80.662056 diff --git a/Assets/Game1/Prefabs/EnemyCube.prefab b/Assets/Game1/Prefabs/EnemyCube.prefab index 5248ae4..18cf9e4 100644 --- a/Assets/Game1/Prefabs/EnemyCube.prefab +++ b/Assets/Game1/Prefabs/EnemyCube.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 4772313552620397260} - component: {fileID: 4579250586432094141} - component: {fileID: 7686039730129808690} - m_Layer: 0 + m_Layer: 7 m_HasEditorInfo: 1 m_Name: Text (TMP) m_TagString: Untagged @@ -260,6 +260,11 @@ PrefabInstance: propertyPath: m_Name value: EnemyCube objectReference: {fileID: 0} + - target: {fileID: 7304703238220018618, guid: 8bb63234a9c557945804df0a35dc3be8, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -275,11 +280,11 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7304703238220018618, guid: 8bb63234a9c557945804df0a35dc3be8, type: 3} insertIndex: -1 - addedObject: {fileID: 7184475042745427347} + addedObject: {fileID: 37724935703979242} - targetCorrespondingSourceObject: {fileID: 7304703238220018618, guid: 8bb63234a9c557945804df0a35dc3be8, type: 3} insertIndex: -1 - addedObject: {fileID: 37724935703979242} + addedObject: {fileID: 3583116669738958109} m_SourcePrefab: {fileID: -300627645422932318, guid: 8bb63234a9c557945804df0a35dc3be8, type: 3} --- !u!1 &4559604773718587029 stripped @@ -307,30 +312,9 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 0.1 - m_BaseOffset: 0.8 + m_BaseOffset: 0.5 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 3 ---- !u!65 &7184475042745427347 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4559604773718587029} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 1 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 0.76849854, y: 0.77102774, z: 0.77107286} - m_Center: {x: 0.0029235482, y: 0.38553926, z: 0.0013365} --- !u!114 &37724935703979242 MonoBehaviour: m_ObjectHideFlags: 0 @@ -348,7 +332,7 @@ MonoBehaviour: health: 200 boomClip: {fileID: 0} addEulerX: 0 - isChangeInitColor: 1 + isChangeInitColor: 0 randomColors: - {r: 0.16316585, g: 0.61898494, b: 0.9433962, a: 1} - {r: 0.067738436, g: 0.8616352, b: 0.28963506, a: 1} @@ -358,6 +342,27 @@ MonoBehaviour: - {r: 1, g: 0.3050313, b: 1, a: 1} - {r: 0.8805031, g: 0.27146077, b: 0, a: 1} arrivalThreshold: 0.5 +--- !u!65 &3583116669738958109 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4559604773718587029} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.76849854, y: 0.77102774, z: 0.77107286} + m_Center: {x: 0.0029235482, y: 0.38553926, z: 0.0013365} --- !u!4 &9189720110917698241 stripped Transform: m_CorrespondingSourceObject: {fileID: -6516412589137246226, guid: 8bb63234a9c557945804df0a35dc3be8, diff --git a/Assets/Game1/Scenes/Game1_Level1.unity b/Assets/Game1/Scenes/Game1_Level1.unity index 55a0a7f..bd7c33b 100644 --- a/Assets/Game1/Scenes/Game1_Level1.unity +++ b/Assets/Game1/Scenes/Game1_Level1.unity @@ -1682,7 +1682,7 @@ PrefabInstance: - target: {fileID: 279031484294811146, guid: 435ba18295a2b0240b1511cd4d5a7bc3, type: 3} propertyPath: shotDuration - value: 0.3 + value: 0.35 objectReference: {fileID: 0} - target: {fileID: 1083892317890881295, guid: 435ba18295a2b0240b1511cd4d5a7bc3, type: 3} @@ -1765,7 +1765,7 @@ PrefabInstance: - target: {fileID: 2521485966335614540, guid: 435ba18295a2b0240b1511cd4d5a7bc3, type: 3} propertyPath: shotDuration - value: 0.3 + value: 0.35 objectReference: {fileID: 0} - target: {fileID: 4123303403043117342, guid: 435ba18295a2b0240b1511cd4d5a7bc3, type: 3} @@ -1823,7 +1823,7 @@ PrefabInstance: - target: {fileID: 5445074278298902311, guid: 435ba18295a2b0240b1511cd4d5a7bc3, type: 3} propertyPath: shotDuration - value: 0.3 + value: 0.35 objectReference: {fileID: 0} - target: {fileID: 5684374028056023295, guid: 435ba18295a2b0240b1511cd4d5a7bc3, type: 3} @@ -1851,7 +1851,7 @@ PrefabInstance: - target: {fileID: 5684374028056023295, guid: 435ba18295a2b0240b1511cd4d5a7bc3, type: 3} propertyPath: shotDuration - value: 0.3 + value: 0.35 objectReference: {fileID: 0} - target: {fileID: 7381137082989080464, guid: 435ba18295a2b0240b1511cd4d5a7bc3, type: 3} @@ -1924,14 +1924,19 @@ PrefabInstance: - target: {fileID: 8361625887681834942, guid: 435ba18295a2b0240b1511cd4d5a7bc3, type: 3} propertyPath: shotDuration - value: 0.3 + value: 0.35 objectReference: {fileID: 0} - target: {fileID: 8610239330163254585, guid: 435ba18295a2b0240b1511cd4d5a7bc3, type: 3} propertyPath: m_LocalPosition.z value: -23 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6892961907289798823, guid: 435ba18295a2b0240b1511cd4d5a7bc3, type: 3} + - {fileID: 7536917327343674820, guid: 435ba18295a2b0240b1511cd4d5a7bc3, type: 3} + - {fileID: 2003561615492901185, guid: 435ba18295a2b0240b1511cd4d5a7bc3, type: 3} + - {fileID: 8235899192063057206, guid: 435ba18295a2b0240b1511cd4d5a7bc3, type: 3} + - {fileID: 2793702232617789511, guid: 435ba18295a2b0240b1511cd4d5a7bc3, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 1083892317890881293, guid: 435ba18295a2b0240b1511cd4d5a7bc3, @@ -2426,6 +2431,8 @@ MonoBehaviour: - {fileID: 1867731326} - {fileID: 902390765} - {fileID: 1866826697} + - {fileID: 1864148352} + - {fileID: 1874630956} shotTypeInfos: - {fileID: 2088730279} - {fileID: 194344597} @@ -2623,7 +2630,7 @@ RectTransform: m_GameObject: {fileID: 1138813630} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 4.2899303, y: 4.2899303, z: 1} + m_LocalScale: {x: 1.9131944, y: 1.9131944, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 97192695} @@ -3616,7 +3623,6 @@ GameObject: m_Component: - component: {fileID: 1864148350} - component: {fileID: 1864148352} - - component: {fileID: 1864148351} m_Layer: 0 m_HasEditorInfo: 1 m_Name: gun6 @@ -3640,18 +3646,6 @@ Transform: m_Children: [] m_Father: {fileID: 1721029600} m_LocalEulerAnglesHint: {x: 0, y: 200, z: 0} ---- !u!114 &1864148351 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1864148349} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 65a4533fe3b7da9469110b583843330f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &1864148352 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3674,7 +3668,7 @@ MonoBehaviour: gun: {fileID: 0} shotAudioClip: {fileID: 8300000, guid: 038911361e37ae84b8fdc585b7b83895, type: 3} hitAudioClip: {fileID: 8300000, guid: a6290313a43dc7c4fb5c684559b9b776, type: 3} - shotDuration: 0.3 + shotDuration: 0.35 shotNextDuration: 0.1 shotDistance: 18 shotSpeed: 20 @@ -3720,7 +3714,6 @@ GameObject: m_Component: - component: {fileID: 1874630954} - component: {fileID: 1874630956} - - component: {fileID: 1874630955} m_Layer: 0 m_HasEditorInfo: 1 m_Name: gun7 @@ -3744,18 +3737,6 @@ Transform: m_Children: [] m_Father: {fileID: 1721029600} m_LocalEulerAnglesHint: {x: 0, y: 160, z: 0} ---- !u!114 &1874630955 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1874630953} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 65a4533fe3b7da9469110b583843330f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &1874630956 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3778,7 +3759,7 @@ MonoBehaviour: gun: {fileID: 0} shotAudioClip: {fileID: 8300000, guid: 038911361e37ae84b8fdc585b7b83895, type: 3} hitAudioClip: {fileID: 8300000, guid: a6290313a43dc7c4fb5c684559b9b776, type: 3} - shotDuration: 0.3 + shotDuration: 0.35 shotNextDuration: 0.1 shotDistance: 18 shotSpeed: 20 @@ -3915,7 +3896,7 @@ RectTransform: m_GameObject: {fileID: 2083258305} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 4.2899303, y: 4.2899303, z: 1} + m_LocalScale: {x: 1.9131944, y: 1.9131944, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 97192695} diff --git a/Assets/Scripts/Bullet.cs b/Assets/Scripts/Bullet.cs index e8eecfb..bcdb9d8 100644 --- a/Assets/Scripts/Bullet.cs +++ b/Assets/Scripts/Bullet.cs @@ -52,11 +52,11 @@ namespace Assets.Scripts { get { - if (LockTarget != null) - { - _shotTargetPosition = LockTarget.transform.position; - //return LockTarget.transform.position; - } + //if (LockTarget != null) + //{ + // _shotTargetPosition = LockTarget.transform.position; + // //return LockTarget.transform.position; + //} return _shotTargetPosition; } set @@ -79,11 +79,13 @@ namespace Assets.Scripts private Vector3 previousPosition; private Camera _cam; private int wallLayer = 0; + private int enemyLayerMask = 0; private void Awake() { wallLayer = LayerMask.NameToLayer("Wall"); + enemyLayerMask = LayerMask.GetMask("Enemy"); _cam = Camera.main; } @@ -95,7 +97,7 @@ namespace Assets.Scripts { missileTarget = GameObject.FindWithTag("Target").transform; } - thisCollider = GetComponentInChildren(); + thisCollider = GetComponent(); previousPosition = transform.position; } @@ -137,6 +139,11 @@ namespace Assets.Scripts CheckCollision(previousPosition); previousPosition.Set(transform.position.x, transform.position.y, transform.position.z); + + if (Tweener != null) + { + Tweener.ManualUpdate(Time.deltaTime, 0); + } } /// @@ -145,23 +152,21 @@ namespace Assets.Scripts /// 射线碰撞结果数组 /// 输出最近的碰撞信息 /// 是否找到有效碰撞 - private Enemy FindEnemyHit(RaycastHit[] hits, out RaycastHit rthit) + private Enemy FindEnemyHit(RaycastHit[] hits) { - rthit = new RaycastHit(); float minDistance = Mathf.Infinity; // 遍历所有碰撞结果，找到距离最小的 foreach (RaycastHit hit in hits) { - if (hit.collider.gameObject.layer == wallLayer) - { - rthit = hit; - return null; - } + //if (hit.collider.gameObject.layer == wallLayer) + //{ + // rthit = hit; + // return null; + //} var enemy = hit.collider.gameObject.GetComponentInParent(); if (enemy != null && enemy != BeforeHitTarget) { - rthit = hit; minDistance = hit.distance; return enemy; } @@ -185,43 +190,44 @@ namespace Assets.Scripts Vector3 direction = transform.position - prevPos; Ray ray = new Ray(prevPos, direction); - //float halfLen = 0; + //float boxLen = 0; //if (thisCollider != null) //{ // var extents = thisCollider.bounds.extents; - // halfLen = extents.magnitude * 0.5f; + // boxLen = extents.magnitude; //} + float dist = Vector3.Distance(transform.position, prevPos); - hits = Physics.RaycastAll(ray, dist); + hits = Physics.RaycastAll(ray, dist, enemyLayerMask); if (hits.Length > 0) { - var enemy = FindEnemyHit(hits, out RaycastHit hit); + var enemy = FindEnemyHit(hits); - if (hit.collider == null) - { - return;//穿过 - } - //穿墙处理 - if (hit.collider.gameObject == null) - { - return;//穿过 - } - if (hit.collider.gameObject.layer == wallLayer) - { - return;//穿过 - } - if (hit.collider.gameObject.GetComponentInParent() != null) - { - return;//穿过 - } - //if (hit.collider.gameObject.GetComponentInParent() != null) + //if (hit.collider == null) + //{ + // return;//穿过 + //} + ////穿墙处理 + //if (hit.collider.gameObject == null) + //{ + // return;//穿过 + //} + //if (hit.collider.gameObject.layer == wallLayer) + //{ + // return;//穿过 + //} + //if (hit.collider.gameObject.GetComponentInParent() != null) + //{ + // return;//穿过 + //} + ////if (hit.collider.gameObject.GetComponentInParent() != null) + ////{ + //// return;//穿过 + ////} + //if (hit.collider.gameObject != gameObject && hit.collider.gameObject.GetComponentInParent() != null) //{ // return;//穿过 //} - if (hit.collider.gameObject != gameObject && hit.collider.gameObject.GetComponentInParent() != null) - { - return;//穿过 - } if (enemy != null) { @@ -331,12 +337,12 @@ namespace Assets.Scripts private void Hitted() { - if (IsShoting) - { - IsShoting = false; - Tweener.Complete(true); - Tweener.Kill(); - } + //if (IsShoting) + //{ + // IsShoting = false; + Tweener.Complete(true); + Tweener.Kill(); + //} } void Explode() diff --git a/Assets/Scripts/Shot.cs b/Assets/Scripts/Shot.cs index 3063419..90e44b2 100644 --- a/Assets/Scripts/Shot.cs +++ b/Assets/Scripts/Shot.cs @@ -360,8 +360,19 @@ public class Shot : MonoBehaviour if (bulletComp.LockTarget != null && bulletComp.transform != null) { bulletComp.ShotTargetPosition = bulletComp.LockTarget.transform.position; - bulletComp.transform.LookAt(bulletComp.ShotTargetPosition); } + + //if (isAutoLock) + //{ + float x = bulletComp.transform.eulerAngles.x; + + bulletComp.transform.LookAt(bulletComp.ShotTargetPosition); + + var eulerAngles = bulletComp.transform.eulerAngles; + eulerAngles.Set(x, eulerAngles.y, eulerAngles.z); + bulletComp.transform.eulerAngles = eulerAngles; + //} + if (CalcBulletBoom(bulletComp)) { bulletComp.transform.DOComplete(true); @@ -506,7 +517,7 @@ public class Shot : MonoBehaviour } // 8. ӳһ֡ȴһ֡״̬º󣬿ʼڵ߼ִ - DOVirtual.DelayedCall(Time.deltaTime, () => + DOVirtual.DelayedCall(Time.fixedDeltaTime, () => { bulletComp.Tweener = DOTween.To( () => @@ -525,6 +536,7 @@ public class Shot : MonoBehaviour ) .SetSpeedBased() .SetEase(Ease.Linear) + .SetUpdate(UpdateType.Manual) .OnUpdate(() => { //ÿ֡ڵ״̬ @@ -534,7 +546,7 @@ public class Shot : MonoBehaviour { //ɴӾ෶Χ⣬߻бը ShotBulletComplete(bulletComp, currentShotCount, muzzleObj); - }); + }); if (muzzleObj != null) { diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index f61a34d..e7c0e16 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -13,7 +13,7 @@ TagManager: - Water - UI - Background - - + - Enemy - - -