From fa227bebd5e5f363c17f9659662bdde8db12738a Mon Sep 17 00:00:00 2001 From: Sveske Juice Date: Sun, 21 Apr 2024 02:56:51 +0200 Subject: [PATCH] turret, lazer, tesla sfx --- Assets/Prefabs/Towers/MrLazer.prefab | 74 +++++++--- Assets/Prefabs/Towers/Tesla.prefab | 90 ++++++++++-- Assets/Prefabs/Towers/Turret.prefab | 132 +++++++++++++++++ Assets/Scenes/TowerTest.unity | 187 ++++++++++++++++-------- Assets/Scripts/Tower/BeamTower.cs | 1 + Assets/Scripts/Tower/ProjectileTower.cs | 1 + Assets/Scripts/Tower/Tower.cs | 3 + 7 files changed, 396 insertions(+), 92 deletions(-) diff --git a/Assets/Prefabs/Towers/MrLazer.prefab b/Assets/Prefabs/Towers/MrLazer.prefab index 7c5a5dd..6cc8a2e 100644 --- a/Assets/Prefabs/Towers/MrLazer.prefab +++ b/Assets/Prefabs/Towers/MrLazer.prefab @@ -1073,37 +1073,37 @@ PrefabInstance: - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.x - value: -5.8355417 + value: -2.776234 objectReference: {fileID: 0} - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.y - value: 2.294 + value: 2.5 objectReference: {fileID: 0} - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.z - value: -2.3897073 + value: -1.136893 objectReference: {fileID: 0} - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.w - value: 0.8721452 + value: 0.7905079 objectReference: {fileID: 0} - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.x - value: 0.28036886 + value: 0.25412488 objectReference: {fileID: 0} - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: 0.3817056 + value: 0.5305031 objectReference: {fileID: 0} - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: -0.12270706 + value: -0.17054105 objectReference: {fileID: 0} - target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1163,72 +1163,72 @@ PrefabInstance: - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.x - value: -5.8355417 + value: -2.776234 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.y - value: 2.294 + value: 2.5 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.z - value: -2.3897073 + value: -1.136893 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.w - value: 0.86138517 + value: 0.7807551 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.x - value: 0.31186444 + value: 0.28267232 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: 0.37699637 + value: 0.52395815 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: -0.13649149 + value: -0.189699 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.x - value: -5.8355417 + value: -2.776234 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.y - value: 2.294 + value: 2.5 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.z - value: -2.3897073 + value: -1.136893 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.w - value: 0.86691535 + value: 0.7857676 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.x - value: 0.29614466 + value: 0.268424 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: 0.3794167 + value: 0.527322 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: -0.12961154 + value: -0.18013711 objectReference: {fileID: 0} - target: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1265,6 +1265,11 @@ PrefabInstance: propertyPath: m_Center.z value: -0.056650817 objectReference: {fileID: 0} + - target: {fileID: 7883233016828513649, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: OnHealthZero.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -1323,6 +1328,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: selectedUI: {fileID: 4921653813610390360} + OnAttack: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2915935455592246780} + m_TargetAssemblyTypeName: PlaySound, Assembly-CSharp + m_MethodName: PlayASound + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Laser Beam fire + m_BoolArgument: 0 + m_CallState: 2 barrel: {fileID: 2855975055267202294} horizontalArc: {fileID: 7877969574926732052} verticalArc: {fileID: 5988398579311035611} @@ -1342,6 +1362,18 @@ MonoBehaviour: m_Bits: 1281 beam: {fileID: 4784832335096719658} attackSecondsDelay: 1 +--- !u!114 &2915935455592246780 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3214375543219620994, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + m_PrefabInstance: {fileID: 354863385000927614} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645933633211530419} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d720360aef3510faf93af9ce3a78b2fc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4921653813610390360 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, diff --git a/Assets/Prefabs/Towers/Tesla.prefab b/Assets/Prefabs/Towers/Tesla.prefab index 2543985..2512c4e 100644 --- a/Assets/Prefabs/Towers/Tesla.prefab +++ b/Assets/Prefabs/Towers/Tesla.prefab @@ -1400,6 +1400,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.5083871 + objectReference: {fileID: 0} - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.y @@ -1408,17 +1413,27 @@ PrefabInstance: - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.z - value: 6 + value: 6.406784 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9191785 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.29548866 objectReference: {fileID: 0} - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: 0.000000023165901 + value: 0.24788545 objectReference: {fileID: 0} - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: -0.0000000074471513 + value: -0.079687834 objectReference: {fileID: 0} - target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1475,6 +1490,11 @@ PrefabInstance: propertyPath: m_Name value: Tesla objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.5083871 + objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.y @@ -1483,17 +1503,32 @@ PrefabInstance: - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.z - value: 6 + value: 6.406784 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9078383 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.32868278 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: 0.0000000228801 + value: 0.24482724 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: -0.000000008283737 + value: -0.08863968 + objectReference: {fileID: 0} + - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.5083871 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1503,17 +1538,27 @@ PrefabInstance: - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.z - value: 6 + value: 6.406784 + objectReference: {fileID: 0} + - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.91366667 + objectReference: {fileID: 0} + - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.31211528 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: -0.000000016282542 + value: 0.24639907 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: 0.0000000055622356 + value: -0.08417174 objectReference: {fileID: 0} - target: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1631,6 +1676,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: selectedUI: {fileID: 6833525999184607182} + OnAttack: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3670379242193959274} + m_TargetAssemblyTypeName: PlaySound, Assembly-CSharp + m_MethodName: PlayASound + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Laser Shoot + m_BoolArgument: 0 + m_CallState: 2 barrel: {fileID: 4238883548874461012} horizontalArc: {fileID: 3939161517085364569} verticalArc: {fileID: 7537316220314343809} @@ -1671,6 +1731,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2194396509644994024} m_PrefabAsset: {fileID: 0} +--- !u!114 &3670379242193959274 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3214375543219620994, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + m_PrefabInstance: {fileID: 2194396509644994024} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1328109535653931045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d720360aef3510faf93af9ce3a78b2fc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6833525999184607182 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, diff --git a/Assets/Prefabs/Towers/Turret.prefab b/Assets/Prefabs/Towers/Turret.prefab index 7eda18d..9c61ed3 100644 --- a/Assets/Prefabs/Towers/Turret.prefab +++ b/Assets/Prefabs/Towers/Turret.prefab @@ -903,6 +903,41 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.84 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.z + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.99934006 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.03632495 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.y + value: 3.153011e-36 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.z + value: 1.3634104e-37 + objectReference: {fileID: 0} - target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.x @@ -963,6 +998,76 @@ PrefabInstance: propertyPath: m_Name value: Turret objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.84 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.z + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.x + value: 2.524355e-29 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.84 + objectReference: {fileID: 0} + - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.z + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9998346 + objectReference: {fileID: 0} + - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.018189488 + objectReference: {fileID: 0} + - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.00000001990998 + objectReference: {fileID: 0} + - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.z + value: -3.6221226e-10 + objectReference: {fileID: 0} - target: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_IsActive @@ -1286,6 +1391,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 8778754593817981653} m_PrefabAsset: {fileID: 0} +--- !u!114 &6147315961823657559 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3214375543219620994, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + m_PrefabInstance: {fileID: 8778754593817981653} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8488737342646939416} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d720360aef3510faf93af9ce3a78b2fc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6291702125683746906 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3352080502988888719, guid: f54a14318952c90c5b47a300aedb0d15, @@ -1492,6 +1609,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: selectedUI: {fileID: 4140468893953896691} + OnAttack: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6147315961823657559} + m_TargetAssemblyTypeName: PlaySound, Assembly-CSharp + m_MethodName: PlayASound + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Shotgun Shoot + m_BoolArgument: 0 + m_CallState: 2 barrel: {fileID: 2740722787380423134} horizontalArc: {fileID: 8981486734084153558} verticalArc: {fileID: 5247639431516572416} diff --git a/Assets/Scenes/TowerTest.unity b/Assets/Scenes/TowerTest.unity index ca3553e..7572f5c 100644 --- a/Assets/Scenes/TowerTest.unity +++ b/Assets/Scenes/TowerTest.unity @@ -427,6 +427,11 @@ PrefabInstance: propertyPath: m_Name value: Tesla objectReference: {fileID: 0} + - target: {fileID: 1328109535653931045, guid: 148ea27cfb89dc0398835d59bed11cca, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1812052588934623903, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalPosition.x @@ -492,15 +497,25 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -3 objectReference: {fileID: 0} + - target: {fileID: 2259584953001852341, guid: 148ea27cfb89dc0398835d59bed11cca, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.952017 + objectReference: {fileID: 0} + - target: {fileID: 2259584953001852341, guid: 148ea27cfb89dc0398835d59bed11cca, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.30604526 + objectReference: {fileID: 0} - target: {fileID: 2259584953001852341, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalRotation.y - value: 0.000000023165901 + value: 0.000000023165915 objectReference: {fileID: 0} - target: {fileID: 2259584953001852341, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalRotation.z - value: -0.0000000074471513 + value: -0.0000000074471567 objectReference: {fileID: 0} - target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} @@ -517,15 +532,25 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -3 objectReference: {fileID: 0} + - target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9463082 + objectReference: {fileID: 0} + - target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.32326588 + objectReference: {fileID: 0} - target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalRotation.y - value: 0.000000016282542 + value: 0.000000016282518 objectReference: {fileID: 0} - target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalRotation.z - value: -0.0000000055622356 + value: -0.0000000055622285 objectReference: {fileID: 0} - target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} @@ -542,15 +567,25 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -3 objectReference: {fileID: 0} + - target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9402716 + objectReference: {fileID: 0} + - target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.34042525 + objectReference: {fileID: 0} - target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalRotation.y - value: 0.0000000228801 + value: -0.000000022880894 objectReference: {fileID: 0} - target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalRotation.z - value: -0.000000008283737 + value: 0.000000008284025 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -779,6 +814,11 @@ PrefabInstance: propertyPath: m_Name value: Turret objectReference: {fileID: 0} + - target: {fileID: 8488737342646939416, guid: 9415cb10a1bd579269301ca4f61a1554, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8717774532810144392, guid: 9415cb10a1bd579269301ca4f61a1554, type: 3} propertyPath: m_LocalPosition.y @@ -1046,18 +1086,23 @@ PrefabInstance: - target: {fileID: 415207662981277987, guid: 4e5e3131ea2a78cfd93219be3806da6d, type: 3} propertyPath: m_LocalRotation.y - value: 0.00000002314971 + value: -0.000000023165908 objectReference: {fileID: 0} - target: {fileID: 415207662981277987, guid: 4e5e3131ea2a78cfd93219be3806da6d, type: 3} propertyPath: m_LocalRotation.z - value: -0.0000000074419453 + value: 0.000000007447153 objectReference: {fileID: 0} - target: {fileID: 645933633211530419, guid: 4e5e3131ea2a78cfd93219be3806da6d, type: 3} propertyPath: m_Name value: MrLazer objectReference: {fileID: 0} + - target: {fileID: 645933633211530419, guid: 4e5e3131ea2a78cfd93219be3806da6d, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2897404306948410700, guid: 4e5e3131ea2a78cfd93219be3806da6d, type: 3} propertyPath: m_LocalPosition.x @@ -1086,12 +1131,12 @@ PrefabInstance: - target: {fileID: 2897404306948410700, guid: 4e5e3131ea2a78cfd93219be3806da6d, type: 3} propertyPath: m_LocalRotation.y - value: -0.00000002309675 + value: 0.00000002288009 objectReference: {fileID: 0} - target: {fileID: 2897404306948410700, guid: 4e5e3131ea2a78cfd93219be3806da6d, type: 3} propertyPath: m_LocalRotation.z - value: 0.000000008362176 + value: -0.000000008283735 objectReference: {fileID: 0} - target: {fileID: 4503151795702995559, guid: 4e5e3131ea2a78cfd93219be3806da6d, type: 3} @@ -1121,17 +1166,12 @@ PrefabInstance: - target: {fileID: 4503151795702995559, guid: 4e5e3131ea2a78cfd93219be3806da6d, type: 3} propertyPath: m_LocalRotation.y - value: 0.00000001627116 + value: -0.000000016282542 objectReference: {fileID: 0} - target: {fileID: 4503151795702995559, guid: 4e5e3131ea2a78cfd93219be3806da6d, type: 3} propertyPath: m_LocalRotation.z - value: -0.0000000055583484 - objectReference: {fileID: 0} - - target: {fileID: 7605001933718563855, guid: 4e5e3131ea2a78cfd93219be3806da6d, - type: 3} - propertyPath: OnHealthZero.m_PersistentCalls.m_Calls.Array.size - value: 0 + value: 0.0000000055622356 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -1243,52 +1283,74 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1395991985 -GameObject: +--- !u!1001 &1231481559 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1395991987} - - component: {fileID: 1395991986} - m_Layer: 0 - m_Name: gm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1395991986 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1395991985} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 00e1f7ea5be7c564faf42d035aec7f53, type: 3} - m_Name: - m_EditorClassIdentifier: - Balance: 0 - IsBuildMode: 0 ---- !u!4 &1395991987 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1395991985} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.1557862, y: 2.294486, z: 1.574348} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 167310329963132665, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_Name + value: Managers + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9d875dda41d470948bbe6fd408a7e835, type: 3} --- !u!1 &1519212182 GameObject: m_ObjectHideFlags: 0 @@ -1812,6 +1874,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2d4e884ed2ba0944bfe55454353bc2d, type: 3} m_Name: m_EditorClassIdentifier: + towerCam: {fileID: 0} mainCamera: {fileID: 1970787082} layerMask: serializedVersion: 2 @@ -1909,7 +1972,7 @@ SceneRoots: - {fileID: 1797347352} - {fileID: 1732242001} - {fileID: 504816165} - - {fileID: 1395991987} - {fileID: 1519212185} - {fileID: 762567055} - {fileID: 1090335998} + - {fileID: 1231481559} diff --git a/Assets/Scripts/Tower/BeamTower.cs b/Assets/Scripts/Tower/BeamTower.cs index 5ff006e..874a020 100644 --- a/Assets/Scripts/Tower/BeamTower.cs +++ b/Assets/Scripts/Tower/BeamTower.cs @@ -53,6 +53,7 @@ public class BeamTower : AimTower beam.positionCount = hitPoints.Count; beam.SetPositions(hitPoints.ToArray()); + this.OnAttack?.Invoke(); yield return new WaitForSeconds(attackSecondsDelay); } while (true); } diff --git a/Assets/Scripts/Tower/ProjectileTower.cs b/Assets/Scripts/Tower/ProjectileTower.cs index 9cdb5ea..8004194 100644 --- a/Assets/Scripts/Tower/ProjectileTower.cs +++ b/Assets/Scripts/Tower/ProjectileTower.cs @@ -30,6 +30,7 @@ public class ProjectileTower : AimTower Debug.DrawRay(transform.position, verticalArc.ToKnobVector, Color.green, attackSecondsDelay); Debug.DrawRay(transform.position, AimDirection, Color.yellow, attackSecondsDelay); projectileSpawner.RunBulletSequence(barrel.Tip.position, transform.up, AimDirection, projectileSequence); + this.OnAttack?.Invoke(); } while (true); } } diff --git a/Assets/Scripts/Tower/Tower.cs b/Assets/Scripts/Tower/Tower.cs index d6d582b..7fae8e4 100644 --- a/Assets/Scripts/Tower/Tower.cs +++ b/Assets/Scripts/Tower/Tower.cs @@ -1,5 +1,6 @@ using System; using UnityEngine; +using UnityEngine.Events; using UnityEngine.Assertions; public abstract class Tower : MonoBehaviour @@ -13,6 +14,8 @@ public abstract class Tower : MonoBehaviour protected Camera mainCam; + [SerializeField] protected UnityEvent OnAttack; + // Getters public virtual void TowerSelected(bool selected) {