diff --git a/Assets/CoreSystems b/Assets/CoreSystems index 87e4558..510aaf1 160000 --- a/Assets/CoreSystems +++ b/Assets/CoreSystems @@ -1 +1 @@ -Subproject commit 87e455827c0c563da6dcd74ab2afdbd1fc725f27 +Subproject commit 510aaf1b6755c4fe76ecac137cdefc1564c8a086 diff --git a/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab b/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab index 01f1a4b..5821e21 100644 --- a/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab +++ b/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab @@ -286,8 +286,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _activeDamageableRuntimeSet: {fileID: 11400000, guid: 8332d81762d09114eac45ca6f3b2c4af, type: 2} - k__BackingField: 20 - k__BackingField: 20 + k__BackingField: 250 + k__BackingField: 250 k__BackingField: 0 DeathEvent: m_PersistentCalls: diff --git a/Assets/Entities/Structures/Turret/Turret.cs b/Assets/Entities/Structures/Turret/Turret.cs index 540dd53..dace8fc 100644 --- a/Assets/Entities/Structures/Turret/Turret.cs +++ b/Assets/Entities/Structures/Turret/Turret.cs @@ -11,9 +11,10 @@ namespace AsteroidGame.Entities [SerializeField] private float _fireRate = 1; [SerializeField] private float _projectileSpeed = 5; - [Header("Stats")] - [SerializeField] private float _kills = 0f; - [SerializeField] private float _damageDealt = 0f; + [field: Header("Stats")] + [field: SerializeField] public float Kills { get; set; } + + [field: SerializeField] public float DamageDealt { get; set; } [field: Header("Weapon")] [field: SerializeField] public List Weapons { get; set; } @@ -33,6 +34,15 @@ namespace AsteroidGame.Entities } private void Update() + { + HandleWeapon(); + + HandleStats(); + } + + #region Weapon + + private void HandleWeapon() { if (!powerSystem.PowerLost) { @@ -69,5 +79,22 @@ namespace AsteroidGame.Entities weapon.FireWeapon = false; } } + + #endregion + + #region Stats + + private void HandleStats() + { + Kills = 0; + DamageDealt = 0; + foreach (var weapon in Weapons) + { + Kills += weapon.NumberOfKills; + DamageDealt += weapon.DamageDealt; + } + } + + #endregion } } \ No newline at end of file diff --git a/Assets/Entities/Structures/Turret/Turret.prefab b/Assets/Entities/Structures/Turret/Turret.prefab index 3431351..18052c9 100644 --- a/Assets/Entities/Structures/Turret/Turret.prefab +++ b/Assets/Entities/Structures/Turret/Turret.prefab @@ -348,8 +348,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _activeDamageableRuntimeSet: {fileID: 11400000, guid: 8332d81762d09114eac45ca6f3b2c4af, type: 2} - k__BackingField: 70 - k__BackingField: 70 + k__BackingField: 700 + k__BackingField: 700 k__BackingField: 0 DeathEvent: m_PersistentCalls: @@ -536,6 +536,8 @@ MonoBehaviour: k__BackingField: 5 k__BackingField: 0 _timeUntilFire: 0 + k__BackingField: 0 + k__BackingField: 0 --- !u!1 &5357542139584026431 GameObject: m_ObjectHideFlags: 0 @@ -1147,8 +1149,8 @@ MonoBehaviour: _damage: 1 _fireRate: 1 _projectileSpeed: 5 - _kills: 0 - _damageDealt: 0 + k__BackingField: 0 + k__BackingField: 0 k__BackingField: - {fileID: 5825155873221046368} k__BackingField: {fileID: 310569669314672228} diff --git a/Assets/Scenes/Playground 1.unity b/Assets/Scenes/Playground 1.unity index d19ad13..9a6ce82 100644 --- a/Assets/Scenes/Playground 1.unity +++ b/Assets/Scenes/Playground 1.unity @@ -164,17 +164,9 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 157782261} m_Modifications: - - target: {fileID: 5825155873221046368, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} - propertyPath: k__BackingField - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5825155873221046368, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} - propertyPath: k__BackingField - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_LocalPosition.x - value: 5.03 + value: 10.21 objectReference: {fileID: 0} - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_LocalPosition.y @@ -182,7 +174,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_LocalPosition.z - value: -6.06 + value: -8.08 objectReference: {fileID: 0} - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_LocalRotation.w @@ -230,6 +222,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} m_PrefabInstance: {fileID: 53965603} m_PrefabAsset: {fileID: 0} +--- !u!1001 &61887451 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 157782261} + m_Modifications: + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalPosition.x + value: 20.11 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalPosition.z + value: -0.82 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_Name + value: Turret (7) + objectReference: {fileID: 0} + - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} +--- !u!4 &61887452 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + m_PrefabInstance: {fileID: 61887451} + m_PrefabAsset: {fileID: 0} --- !u!1001 &63909072 PrefabInstance: m_ObjectHideFlags: 0 @@ -240,7 +298,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalPosition.x - value: -12.568716 + value: -5.55 objectReference: {fileID: 0} - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalPosition.y @@ -248,7 +306,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalPosition.z - value: 21.990889 + value: 9.36 objectReference: {fileID: 0} - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalRotation.w @@ -297,7 +355,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalPosition.x - value: 6.9230213 + value: -0.08 objectReference: {fileID: 0} - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalPosition.y @@ -305,7 +363,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalPosition.z - value: 17.109875 + value: 9.72 objectReference: {fileID: 0} - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalRotation.w @@ -428,6 +486,72 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &98887981 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 157782261} + m_Modifications: + - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} + propertyPath: m_LocalPosition.x + value: 13.89 + objectReference: {fileID: 0} + - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} + propertyPath: m_LocalPosition.z + value: -12.08 + objectReference: {fileID: 0} + - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1134055636167264334, guid: 57a75520298c47140a928041b05d7f3c, type: 3} + propertyPath: m_Name + value: PowerPlant (1) + objectReference: {fileID: 0} + - target: {fileID: 1134055636167264334, guid: 57a75520298c47140a928041b05d7f3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 57a75520298c47140a928041b05d7f3c, type: 3} +--- !u!4 &98887982 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} + m_PrefabInstance: {fileID: 98887981} + m_PrefabAsset: {fileID: 0} --- !u!1 &157782260 GameObject: m_ObjectHideFlags: 0 @@ -458,6 +582,8 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 84054709} + - {fileID: 1259247873} + - {fileID: 1252074757} - {fileID: 1467125943} - {fileID: 891379735} - {fileID: 862425367} @@ -466,11 +592,17 @@ Transform: - {fileID: 53965604} - {fileID: 282469291} - {fileID: 1878032910} + - {fileID: 832654326} + - {fileID: 557809410} + - {fileID: 61887452} + - {fileID: 1927357271} + - {fileID: 2117981806} - {fileID: 1715656626} - {fileID: 1762630463} - {fileID: 171128884} - {fileID: 1542755757} - {fileID: 991542217} + - {fileID: 98887982} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &171128883 @@ -547,17 +679,9 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 157782261} m_Modifications: - - target: {fileID: 5825155873221046368, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} - propertyPath: k__BackingField - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5825155873221046368, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} - propertyPath: k__BackingField - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_LocalPosition.x - value: 10.2 + value: 12.24 objectReference: {fileID: 0} - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_LocalPosition.y @@ -565,7 +689,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_LocalPosition.z - value: -5.45 + value: -6.23 objectReference: {fileID: 0} - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_LocalRotation.w @@ -613,6 +737,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} m_PrefabInstance: {fileID: 282469290} m_PrefabAsset: {fileID: 0} +--- !u!1001 &557809409 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 157782261} + m_Modifications: + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalPosition.x + value: 14.39 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalPosition.z + value: -4.63 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_Name + value: Turret (6) + objectReference: {fileID: 0} + - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} +--- !u!4 &557809410 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + m_PrefabInstance: {fileID: 557809409} + m_PrefabAsset: {fileID: 0} --- !u!1001 &575798960 PrefabInstance: m_ObjectHideFlags: 0 @@ -623,7 +813,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalPosition.x - value: 0.36357498 + value: -2.98 objectReference: {fileID: 0} - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalPosition.y @@ -631,7 +821,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalPosition.z - value: 19.697609 + value: 10.12 objectReference: {fileID: 0} - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalRotation.w @@ -678,17 +868,9 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 157782261} m_Modifications: - - target: {fileID: 5825155873221046368, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} - propertyPath: k__BackingField - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5825155873221046368, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} - propertyPath: k__BackingField - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_LocalPosition.x - value: 4.91 + value: 21.53 objectReference: {fileID: 0} - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_LocalPosition.y @@ -696,7 +878,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_LocalPosition.z - value: 1.13 + value: 0.18 objectReference: {fileID: 0} - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_LocalRotation.w @@ -781,6 +963,72 @@ Transform: - {fileID: 1216778791} m_Father: {fileID: 2074073364} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &832654325 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 157782261} + m_Modifications: + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalPosition.x + value: 17.25 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalPosition.z + value: -3.25 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_Name + value: Turret (5) + objectReference: {fileID: 0} + - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} +--- !u!4 &832654326 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + m_PrefabInstance: {fileID: 832654325} + m_PrefabAsset: {fileID: 0} --- !u!4 &862425367 stripped Transform: m_CorrespondingSourceObject: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} @@ -1109,6 +1357,130 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!1001 &1252074756 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 157782261} + m_Modifications: + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.x + value: -8.02 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.y + value: 0.49999905 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.z + value: 11.36 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9160146395234108762, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_Name + value: EnemySpawner (5) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} +--- !u!4 &1252074757 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + m_PrefabInstance: {fileID: 1252074756} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1259247872 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 157782261} + m_Modifications: + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.x + value: -12.96 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.y + value: 0.49999905 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.z + value: 10.89 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9160146395234108762, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_Name + value: EnemySpawner (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} +--- !u!4 &1259247873 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + m_PrefabInstance: {fileID: 1259247872} + m_PrefabAsset: {fileID: 0} --- !u!1 &1402420031 GameObject: m_ObjectHideFlags: 0 @@ -1775,7 +2147,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalPosition.x - value: -7.941847 + value: -10.3 objectReference: {fileID: 0} - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalPosition.y @@ -1783,7 +2155,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalPosition.z - value: 18.370495 + value: 8.97 objectReference: {fileID: 0} - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalRotation.w @@ -1955,14 +2327,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 157782261} m_Modifications: - - target: {fileID: 5825155873221046368, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} - propertyPath: k__BackingField - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5825155873221046368, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} - propertyPath: k__BackingField - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_LocalPosition.x value: 8.44 @@ -2021,6 +2385,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} m_PrefabInstance: {fileID: 1878032909} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1927357270 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 157782261} + m_Modifications: + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalPosition.x + value: 5.81 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalPosition.z + value: -12.31 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_Name + value: Turret (8) + objectReference: {fileID: 0} + - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} +--- !u!4 &1927357271 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + m_PrefabInstance: {fileID: 1927357270} + m_PrefabAsset: {fileID: 0} --- !u!1 &2047541735 GameObject: m_ObjectHideFlags: 0 @@ -2271,6 +2701,72 @@ Transform: - {fileID: 666945019} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &2117981805 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 157782261} + m_Modifications: + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalPosition.x + value: 23.6 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalPosition.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_Name + value: Turret (9) + objectReference: {fileID: 0} + - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} +--- !u!4 &2117981806 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + m_PrefabInstance: {fileID: 2117981805} + m_PrefabAsset: {fileID: 0} --- !u!1001 &664620741625697858 PrefabInstance: m_ObjectHideFlags: 0 @@ -2643,7 +3139,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} propertyPath: m_LocalPosition.x - value: 14.6 + value: 20.18 objectReference: {fileID: 0} - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} propertyPath: m_LocalPosition.y @@ -2651,7 +3147,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} propertyPath: m_LocalPosition.z - value: -11.24 + value: -9.05 objectReference: {fileID: 0} - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} propertyPath: m_LocalRotation.w @@ -2704,7 +3200,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -14.88 objectReference: {fileID: 0} - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalPosition.y @@ -2712,7 +3208,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 9.66 objectReference: {fileID: 0} - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} propertyPath: m_LocalRotation.w