From 73b1f51979f73f3125add63cb74282e58bdbe8f1 Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 17 Sep 2022 17:42:56 +0200 Subject: [PATCH] Turret build animation --- Assets/Entities/Structures/Tower/Turret.cs | 12 ++-- .../Entities/Structures/Tower/Turret.prefab | 23 +++++-- Assets/Scenes/test_turret.unity | 63 ++++++++++++++++--- 3 files changed, 77 insertions(+), 21 deletions(-) diff --git a/Assets/Entities/Structures/Tower/Turret.cs b/Assets/Entities/Structures/Tower/Turret.cs index e1ea5f4..21400fb 100644 --- a/Assets/Entities/Structures/Tower/Turret.cs +++ b/Assets/Entities/Structures/Tower/Turret.cs @@ -51,7 +51,7 @@ namespace AsteroidGame.Entities.Structures.Tower private void Awake() { - buildingParts = GetComponentsInChildren(); + //buildingParts = GetComponentsInChildren(); } void Start() @@ -59,10 +59,9 @@ namespace AsteroidGame.Entities.Structures.Tower // enemyHandler = FindObjectOfType(); // scoreHandler = FindObjectOfType(); UpdateWeaponParameters(fireRate, projectileSpeed); - - for (int i = 1; i < buildingParts.Length; i++) + foreach (var buildingPart in buildingParts) { - buildingParts[i].gameObject.SetActive(false); + buildingPart.gameObject.SetActive(false); } StartCoroutine(Build()); @@ -70,11 +69,12 @@ namespace AsteroidGame.Entities.Structures.Tower IEnumerator Build() { - for (int i = 1; i < buildingParts.Length; i++) + foreach (var buildingPart in buildingParts) { - buildingParts[i].gameObject.SetActive(true); + buildingPart.gameObject.SetActive(true); yield return new WaitForSeconds(buildTimer); } + } private void UpdateWeaponParameters(float _fireRate, float _projectileSpeed) diff --git a/Assets/Entities/Structures/Tower/Turret.prefab b/Assets/Entities/Structures/Tower/Turret.prefab index 437c12e..03845e8 100644 --- a/Assets/Entities/Structures/Tower/Turret.prefab +++ b/Assets/Entities/Structures/Tower/Turret.prefab @@ -100,7 +100,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &8338452631907263897 Transform: m_ObjectHideFlags: 0 @@ -640,7 +640,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8324879816836607384} - - component: {fileID: 8495214050117718739} + - component: {fileID: 8787361557661825162} m_Layer: 0 m_Name: Turret m_TagString: Untagged @@ -664,7 +664,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8495214050117718739 +--- !u!114 &8787361557661825162 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -673,8 +673,19 @@ MonoBehaviour: m_GameObject: {fileID: 8704396752535238434} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 752e7a6f0c0d77846a67bd62b427b7be, type: 3} + m_Script: {fileID: 11500000, guid: d3a16cf44e28f02409c23498ed14acf5, type: 3} m_Name: m_EditorClassIdentifier: - _name: - _health: 0 + name: + health: 0 + cost: 0 + buildTimer: 0 + weaponRange: 40 + damage: 1 + fireRate: 1 + projectileSpeed: 5 + targetStrategy: 1 + score: 0 + _turretHead: {fileID: 5103935544653627402} + _barrel: {fileID: 5103935545559248087} + buildingParts: [] diff --git a/Assets/Scenes/test_turret.unity b/Assets/Scenes/test_turret.unity index 4f17762..1c68031 100644 --- a/Assets/Scenes/test_turret.unity +++ b/Assets/Scenes/test_turret.unity @@ -123,6 +123,11 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!4 &253734516 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5103935545559248087, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + m_PrefabInstance: {fileID: 5103935545375179427} + m_PrefabAsset: {fileID: 0} --- !u!1 &403044192 GameObject: m_ObjectHideFlags: 0 @@ -152,22 +157,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d3a16cf44e28f02409c23498ed14acf5, type: 3} m_Name: m_EditorClassIdentifier: - enemyHandler: {fileID: 0} - scoreHandler: {fileID: 0} - _projectile: {fileID: 0} - weapon: {fileID: 0} + name: + health: 0 + cost: 30 + buildTimer: 1 weaponRange: 40 damage: 1 fireRate: 1 projectileSpeed: 5 targetStrategy: 1 - cost: 30 - buildTimer: 1 score: 0 - targetEnemy: {fileID: 0} + _turretHead: {fileID: 0} + _barrel: {fileID: 0} buildingParts: [] - k__BackingField: 0 - k__BackingField: 0 --- !u!4 &403044194 Transform: m_ObjectHideFlags: 0 @@ -267,6 +269,11 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &889324201 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5103935544653627402, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + m_PrefabInstance: {fileID: 5103935545375179427} + m_PrefabAsset: {fileID: 0} --- !u!1 &912496748 GameObject: m_ObjectHideFlags: 0 @@ -361,6 +368,11 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!4 &3849715850845300538 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8338452631907263897, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + m_PrefabInstance: {fileID: 5103935545375179427} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5103935545375179427 PrefabInstance: m_ObjectHideFlags: 0 @@ -368,6 +380,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4124039516271301344, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_RootOrder value: 1 @@ -416,5 +432,34 @@ PrefabInstance: propertyPath: m_Name value: Turret objectReference: {fileID: 0} + - target: {fileID: 8787361557661825162, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: buildTimer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8787361557661825162, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: buildingParts.Array.size + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8787361557661825162, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: buildingParts.Array.data[0] + value: + objectReference: {fileID: 3849715850845300538} + - target: {fileID: 8787361557661825162, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: buildingParts.Array.data[1] + value: + objectReference: {fileID: 8335348641034863851} + - target: {fileID: 8787361557661825162, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: buildingParts.Array.data[2] + value: + objectReference: {fileID: 889324201} + - target: {fileID: 8787361557661825162, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: buildingParts.Array.data[3] + value: + objectReference: {fileID: 253734516} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} +--- !u!4 &8335348641034863851 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3853332211859768904, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + m_PrefabInstance: {fileID: 5103935545375179427} + m_PrefabAsset: {fileID: 0}