From 979e631eac6b516827df682256af3c7c4f2d4401 Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 28 Oct 2023 18:09:02 +0200 Subject: [PATCH 01/16] WIP ScriptableObjects Refactor --- Assets/AsteroidGame.asmdef | 5 ++-- Assets/CoreSystems | 2 +- Assets/Entities/Enemies/Enemy.prefab | 8 +++---- .../Enemies/EnemyTargeterConfiguration.asset | 2 +- Assets/Entities/Entities.asmdef | 3 ++- .../RuntimeSet/ActiveEnemyEntities.asset | 15 ------------ .../RuntimeSet/ActiveEnemyEntities.asset.meta | 8 ------- .../Entities/RuntimeSet/ActiveEntities.asset | 15 ------------ .../RuntimeSet/ActiveEntities.asset.meta | 8 ------- .../RuntimeSet/ActivePowerStructures.asset | 3 +-- .../RuntimeSet/ActiveStructureEntities.asset | 3 +-- .../ActiveTargetableBuildings.asset | 4 ++-- .../ActiveTargetableBuildings.asset.meta | 2 +- .../RuntimeSet/ActiveTargetableEnemies.asset | 4 ++-- .../ActiveTargetableEnemies.asset.meta | 2 +- .../SoEnemyBaseRuntimeSet.cs | 11 --------- .../SoEnemyBaseRuntimeSet.cs.meta | 11 --------- .../SoEntityBaseRuntimeSet.cs | 11 --------- .../SoEntityBaseRuntimeSet.cs.meta | 11 --------- .../SoPowerBaseRuntimeSet.cs | 11 --------- .../SoPowerBaseRuntimeSet.cs.meta | 3 --- .../ScriptableObjects/SoPowerConfig.cs | 13 ----------- .../ScriptableObjects/SoPowerConfig.cs.meta | 11 --------- .../SoStructureBaseRuntimeSet.cs | 11 --------- .../SoStructureBaseRuntimeSet.cs.meta | 11 --------- .../ScriptableObjects/SoTargeterConfig.cs | 22 ------------------ .../SoTargeterConfig.cs.meta | 11 --------- .../ScriptableObjects/SoWeaponConfig.cs | 23 ------------------- .../ScriptableObjects/SoWeaponConfig.cs.meta | 11 --------- Assets/Entities/Scripts/EnemyBase.cs | 14 +---------- Assets/Entities/Scripts/EntityBase.cs | 14 +---------- Assets/Entities/Scripts/PowerBase.cs | 17 ++++++++++++++ Assets/Entities/Scripts/Targeter.cs | 3 +-- .../Structures/PowerPlant/PowerPlant.prefab | 5 +--- .../PowerplantPowerConfiguration.asset | 2 +- .../Entities/Structures/Scripts/Disabler.cs | 12 +++++----- .../Structures/Scripts/StructureBase.cs | 17 ++++---------- Assets/Entities/Structures/Turret/Turret.cs | 2 +- .../Entities/Structures/Turret/Turret.prefab | 9 +++----- .../Turret/TurretPowerConfiguration.asset | 2 +- .../TurretStandardTargeterConfiguration.asset | 2 +- Assets/Handlers/EnemyHandler.cs | 3 ++- Assets/Handlers/PowerHandler.cs | 7 +++--- 43 files changed, 62 insertions(+), 302 deletions(-) delete mode 100644 Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset delete mode 100644 Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset.meta delete mode 100644 Assets/Entities/RuntimeSet/ActiveEntities.asset delete mode 100644 Assets/Entities/RuntimeSet/ActiveEntities.asset.meta delete mode 100644 Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs delete mode 100644 Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs.meta delete mode 100644 Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs delete mode 100644 Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs.meta delete mode 100644 Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs delete mode 100644 Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs.meta delete mode 100644 Assets/Entities/ScriptableObjects/SoPowerConfig.cs delete mode 100644 Assets/Entities/ScriptableObjects/SoPowerConfig.cs.meta delete mode 100644 Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs delete mode 100644 Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs.meta delete mode 100644 Assets/Entities/ScriptableObjects/SoTargeterConfig.cs delete mode 100644 Assets/Entities/ScriptableObjects/SoTargeterConfig.cs.meta delete mode 100644 Assets/Entities/ScriptableObjects/SoWeaponConfig.cs delete mode 100644 Assets/Entities/ScriptableObjects/SoWeaponConfig.cs.meta diff --git a/Assets/AsteroidGame.asmdef b/Assets/AsteroidGame.asmdef index 8bf3aa0..6657db9 100644 --- a/Assets/AsteroidGame.asmdef +++ b/Assets/AsteroidGame.asmdef @@ -5,10 +5,9 @@ "GUID:6055be8ebefd69e48b49212b09b47b2f", "GUID:75469ad4d38634e559750d17036d5f7c", "GUID:f008ecc6829887e478aeb5eb004eb01b", - "GUID:17a5862fcd6383b4b97bad4dcb1e2e5d", "GUID:f26d68a0bdefa1043b120b820f55e190", - "GUID:eb3099ff524d60545a136315a154d67b", - "GUID:5d38ea13ae8f69a4395d425d401a557a" + "GUID:5d38ea13ae8f69a4395d425d401a557a", + "GUID:63ebd60d5c68886498ecfee04b5d6a12" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/CoreSystems b/Assets/CoreSystems index da88241..b031ed3 160000 --- a/Assets/CoreSystems +++ b/Assets/CoreSystems @@ -1 +1 @@ -Subproject commit da8824120466499158fc1765333175b865aa0f82 +Subproject commit b031ed3db7b4a08253cf5fcf25059ad299fddaa0 diff --git a/Assets/Entities/Enemies/Enemy.prefab b/Assets/Entities/Enemies/Enemy.prefab index fd689bc..7538ad8 100644 --- a/Assets/Entities/Enemies/Enemy.prefab +++ b/Assets/Entities/Enemies/Enemy.prefab @@ -541,8 +541,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8410932d22e18624787af61d3a4cd191, type: 3} m_Name: m_EditorClassIdentifier: - _activeTargetableRuntimeSet: {fileID: 11400000, guid: 85e03587d1a940f438ceac70a3d544d5, type: 2} - k__BackingField: {fileID: 0} + _activeTargetableRuntimeSet: {fileID: 11400000, guid: ab93dbcc7e973184b896173796edc5ac, type: 2} + k__BackingField: {fileID: 4299120351774448665} _centerPosition: {fileID: 2513054780709503419} _basePosition: {fileID: 561887346552595101} k__BackingField: {fileID: 2425760649276150986} @@ -617,8 +617,6 @@ MonoBehaviour: k__BackingField: {fileID: 4299120351774448665} k__BackingField: {fileID: 4816616723634589559} _uiFriendlyName: Enemy - _entityBaseSet: {fileID: 11400000, guid: c5542e77624472441a67b1f34e19a116, type: 2} - _enemyBaseSet: {fileID: 11400000, guid: e5f25127d92be074aac6e7b745fae107, type: 2} k__BackingField: - {fileID: 5154912354327310122} - {fileID: 5217425462754499093} @@ -935,7 +933,7 @@ MonoBehaviour: _targeterConfig: {fileID: 11400000, guid: d5813a38da3962d4498fc71ef33361b6, type: 2} _range: 0 _targetStrategy: 0 - _activeTargetable: {fileID: 0} + _activeTargetable: {fileID: 11400000, guid: 2f4ea1ba11a5a3740a0c828fd2fa47d4, type: 2} _targeterParent: {fileID: 4816616723634589559} k__BackingField: {fileID: 0} --- !u!1 &7670619634857166053 diff --git a/Assets/Entities/Enemies/EnemyTargeterConfiguration.asset b/Assets/Entities/Enemies/EnemyTargeterConfiguration.asset index 8f3bd7d..f7f65e4 100644 --- a/Assets/Entities/Enemies/EnemyTargeterConfiguration.asset +++ b/Assets/Entities/Enemies/EnemyTargeterConfiguration.asset @@ -15,4 +15,4 @@ MonoBehaviour: _maxRange: 30 _minRange: 0.5 _selectedTargetStrategy: 0 - _activeEntities: {fileID: 11400000, guid: dda2fd5e970bbd642a5ceead1e82783c, type: 2} + _activeEntities: {fileID: 11400000, guid: 2f4ea1ba11a5a3740a0c828fd2fa47d4, type: 2} diff --git a/Assets/Entities/Entities.asmdef b/Assets/Entities/Entities.asmdef index 1414387..a38d77f 100644 --- a/Assets/Entities/Entities.asmdef +++ b/Assets/Entities/Entities.asmdef @@ -2,7 +2,8 @@ "name": "Entities", "rootNamespace": "AsteroidGame", "references": [ - "GUID:5d38ea13ae8f69a4395d425d401a557a" + "GUID:5d38ea13ae8f69a4395d425d401a557a", + "GUID:63ebd60d5c68886498ecfee04b5d6a12" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset b/Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset deleted file mode 100644 index 4a341a8..0000000 --- a/Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset +++ /dev/null @@ -1,15 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9da2d6a0206101c47a22881a0ba2ece2, type: 3} - m_Name: ActiveEnemyEntities - m_EditorClassIdentifier: - _list: [] diff --git a/Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset.meta b/Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset.meta deleted file mode 100644 index 05f995a..0000000 --- a/Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e5f25127d92be074aac6e7b745fae107 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/RuntimeSet/ActiveEntities.asset b/Assets/Entities/RuntimeSet/ActiveEntities.asset deleted file mode 100644 index 4d2f144..0000000 --- a/Assets/Entities/RuntimeSet/ActiveEntities.asset +++ /dev/null @@ -1,15 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9da2d6a0206101c47a22881a0ba2ece2, type: 3} - m_Name: ActiveEntities - m_EditorClassIdentifier: - _list: [] diff --git a/Assets/Entities/RuntimeSet/ActiveEntities.asset.meta b/Assets/Entities/RuntimeSet/ActiveEntities.asset.meta deleted file mode 100644 index f76b7df..0000000 --- a/Assets/Entities/RuntimeSet/ActiveEntities.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c5542e77624472441a67b1f34e19a116 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/RuntimeSet/ActivePowerStructures.asset b/Assets/Entities/RuntimeSet/ActivePowerStructures.asset index f01ab89..a5a61ec 100644 --- a/Assets/Entities/RuntimeSet/ActivePowerStructures.asset +++ b/Assets/Entities/RuntimeSet/ActivePowerStructures.asset @@ -9,7 +9,6 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3c46c7dedba14f3da958a2e6a3d3feaa, type: 3} + m_Script: {fileID: 11500000, guid: 1e1a04865d154864c97344bae176e489, type: 3} m_Name: ActivePowerStructures m_EditorClassIdentifier: - _list: [] diff --git a/Assets/Entities/RuntimeSet/ActiveStructureEntities.asset b/Assets/Entities/RuntimeSet/ActiveStructureEntities.asset index 7ef2ebd..95aabd4 100644 --- a/Assets/Entities/RuntimeSet/ActiveStructureEntities.asset +++ b/Assets/Entities/RuntimeSet/ActiveStructureEntities.asset @@ -9,7 +9,6 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9da2d6a0206101c47a22881a0ba2ece2, type: 3} + m_Script: {fileID: 11500000, guid: b73ccf581b4b8ca4fa9c4e0a61cdd6be, type: 3} m_Name: ActiveStructureEntities m_EditorClassIdentifier: - _list: [] diff --git a/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset b/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset index 45c4446..26b49b3 100644 --- a/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset +++ b/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7d76ef79c960c1845a914468e30d036b, type: 3} + m_Script: {fileID: 0} m_Name: ActiveTargetableBuildings - m_EditorClassIdentifier: + m_EditorClassIdentifier: CoreSystems:GameDev.CoreSystems:SoTargetableRuntimeSet _list: [] diff --git a/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset.meta b/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset.meta index a1284c1..ea8ec98 100644 --- a/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset.meta +++ b/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dda2fd5e970bbd642a5ceead1e82783c +guid: 2f4ea1ba11a5a3740a0c828fd2fa47d4 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset b/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset index 6c761ad..a876800 100644 --- a/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset +++ b/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7d76ef79c960c1845a914468e30d036b, type: 3} + m_Script: {fileID: 0} m_Name: ActiveTargetableEnemies - m_EditorClassIdentifier: + m_EditorClassIdentifier: CoreSystems:GameDev.CoreSystems:SoTargetableRuntimeSet _list: [] diff --git a/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset.meta b/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset.meta index bc95ae3..47faae4 100644 --- a/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset.meta +++ b/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 85e03587d1a940f438ceac70a3d544d5 +guid: ab93dbcc7e973184b896173796edc5ac NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs b/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs deleted file mode 100644 index 1d778cb..0000000 --- a/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs +++ /dev/null @@ -1,11 +0,0 @@ -using AsteroidGame.Entities; -using GameDev.CoreSystems; -using UnityEngine; - -namespace AsteroidGame.ScriptableObjects -{ - [CreateAssetMenu(fileName = "newEnemyBaseRuntimeSet", menuName = "RuntimeSet/EnemyBase")] - public class SoEnemyBaseRuntimeSet : SoRuntimeSet - { - } -} \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs.meta b/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs.meta deleted file mode 100644 index 2e05c60..0000000 --- a/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 33f48df2d03212c4986fe2c47c5de796 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs b/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs deleted file mode 100644 index 8b76909..0000000 --- a/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs +++ /dev/null @@ -1,11 +0,0 @@ -using AsteroidGame.Entities; -using GameDev.CoreSystems; -using UnityEngine; - -namespace AsteroidGame.ScriptableObjects -{ - [CreateAssetMenu(fileName = "newEntityBaseRuntimeSet", menuName = "RuntimeSet/EntityBase")] - public class SoEntityBaseRuntimeSet : SoRuntimeSet - { - } -} \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs.meta b/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs.meta deleted file mode 100644 index ce92792..0000000 --- a/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9da2d6a0206101c47a22881a0ba2ece2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs b/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs deleted file mode 100644 index dab8630..0000000 --- a/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs +++ /dev/null @@ -1,11 +0,0 @@ -using AsteroidGame.Entities; -using GameDev.CoreSystems; -using UnityEngine; - -namespace AsteroidGame.ScriptableObjects -{ - [CreateAssetMenu(fileName = "newPowerBaseRuntimeSet", menuName = "RuntimeSet/PowerBase")] - public class SoPowerBaseRuntimeSet : SoRuntimeSet - { - } -} \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs.meta b/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs.meta deleted file mode 100644 index c05d2f4..0000000 --- a/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 3c46c7dedba14f3da958a2e6a3d3feaa -timeCreated: 1665006553 \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoPowerConfig.cs b/Assets/Entities/ScriptableObjects/SoPowerConfig.cs deleted file mode 100644 index 03dacd5..0000000 --- a/Assets/Entities/ScriptableObjects/SoPowerConfig.cs +++ /dev/null @@ -1,13 +0,0 @@ -using UnityEngine; - -namespace AsteroidGame.ScriptableObjects -{ - [CreateAssetMenu(fileName = "newPowerConfiguration", menuName = "Configuration/Power")] - public class SoPowerConfig : ScriptableObject - { - public SoPowerBaseRuntimeSet _activePowerStructures; - public bool isGenerator; - public bool isConsumer; - public int maxPower; - } -} \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoPowerConfig.cs.meta b/Assets/Entities/ScriptableObjects/SoPowerConfig.cs.meta deleted file mode 100644 index ceb8c6e..0000000 --- a/Assets/Entities/ScriptableObjects/SoPowerConfig.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 87159085b5778b14482ec38673729d95 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs b/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs deleted file mode 100644 index 0d01258..0000000 --- a/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs +++ /dev/null @@ -1,11 +0,0 @@ -using AsteroidGame.Entities; -using GameDev.CoreSystems; -using UnityEngine; - -namespace AsteroidGame.ScriptableObjects -{ - [CreateAssetMenu(fileName = "newStructureBaseRuntimeSet", menuName = "RuntimeSet/StructureBase")] - public class SoStructureBaseRuntimeSet : SoRuntimeSet - { - } -} \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs.meta b/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs.meta deleted file mode 100644 index c009ffc..0000000 --- a/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fbc6f67c9903cc8448f793da64d840cf -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs b/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs deleted file mode 100644 index 8951174..0000000 --- a/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs +++ /dev/null @@ -1,22 +0,0 @@ -using GameDev.CoreSystems; -using UnityEngine; -using UnityEngine.Serialization; - -namespace AsteroidGame.ScriptableObjects -{ - [CreateAssetMenu(fileName = "newTargeterConfiguration", menuName = "Configuration/Targeter")] - public class SoTargeterConfig : ScriptableObject - { - [FormerlySerializedAs("_range")] - public float _maxRange; - public float _minRange; - public TargetStrategy _selectedTargetStrategy; - public SoTargetableRuntimeSet _activeEntities; - - public enum TargetStrategy - { - LowestRange, - LowestHealth - }; - } -} \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs.meta b/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs.meta deleted file mode 100644 index 5c2f0bb..0000000 --- a/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 02781660543c12d4ebddaf334eb0d730 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs b/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs deleted file mode 100644 index 2b656d3..0000000 --- a/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs +++ /dev/null @@ -1,23 +0,0 @@ -using GameDev.CoreSystems; -using UnityEngine; - -namespace AsteroidGame.ScriptableObjects -{ - public class SoWeaponConfig : ScriptableObject, IWeapon - { - [SerializeField] private float _fireRate; - [SerializeField] private float _damage; - - public float FireRate - { - get => _fireRate; - set => _fireRate = value; - } - - public float Damage - { - get => _damage; - set => _damage = value; - } - } -} \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs.meta b/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs.meta deleted file mode 100644 index f7217fb..0000000 --- a/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 19bf3f6dd184a48499aff1db728edfcd -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/Scripts/EnemyBase.cs b/Assets/Entities/Scripts/EnemyBase.cs index 9715f03..045e599 100644 --- a/Assets/Entities/Scripts/EnemyBase.cs +++ b/Assets/Entities/Scripts/EnemyBase.cs @@ -8,8 +8,6 @@ namespace AsteroidGame.Entities { public class EnemyBase : EntityBase { - [SerializeField] private SoEntityBaseRuntimeSet _enemyBaseSet; - [field: Header("Weapon")] [field: SerializeField] public List Weapons { get; set; } @@ -19,12 +17,8 @@ namespace AsteroidGame.Entities [field: Header("NavMeshAgent")] [SerializeField] private NavMeshAgent _navMeshAgent; - protected override void OnEnable() + protected void OnEnable() { - base.OnEnable(); - - _enemyBaseSet.Add(this); - InitializeTargeter(); InitializeNavMeshAgent(); @@ -50,12 +44,6 @@ namespace AsteroidGame.Entities //_navMeshAgent.speed = 0.1f; } - protected override void OnDisable() - { - base.OnDisable(); - _enemyBaseSet.Remove(this); - } - private void Update() { if (Targeter.FindTarget()) diff --git a/Assets/Entities/Scripts/EntityBase.cs b/Assets/Entities/Scripts/EntityBase.cs index ba9f087..8ae35ba 100644 --- a/Assets/Entities/Scripts/EntityBase.cs +++ b/Assets/Entities/Scripts/EntityBase.cs @@ -15,8 +15,6 @@ namespace AsteroidGame.Entities [Header("UI")] [SerializeField] protected string _uiFriendlyName; - [Space] - [SerializeField] private SoEntityBaseRuntimeSet _entityBaseSet; #region Props @@ -32,17 +30,7 @@ namespace AsteroidGame.Entities AssignDamageable(); } - - protected virtual void OnEnable() - { - _entityBaseSet.Add(this); - } - - protected virtual void OnDisable() - { - _entityBaseSet.Remove(this); - } - + private void InitializeDamageable() { if (Damageable != null) return; diff --git a/Assets/Entities/Scripts/PowerBase.cs b/Assets/Entities/Scripts/PowerBase.cs index 8feaa01..fe223fe 100644 --- a/Assets/Entities/Scripts/PowerBase.cs +++ b/Assets/Entities/Scripts/PowerBase.cs @@ -1,3 +1,6 @@ +//using AsteroidGame.ScriptableObjects; + +using System; using AsteroidGame.ScriptableObjects; using GameDev.CoreSystems; using UnityEngine; @@ -12,11 +15,25 @@ namespace AsteroidGame.Entities [SerializeField] protected int _maxPower; [SerializeField] protected int _currentPower; + [SerializeField] private SoPowerSystemRuntimeSet _powerBaseSet; + public void SetConfig(SoPowerConfig config) { _isGenerator = config.isGenerator; _isConsumer = config.isConsumer; _maxPower = config.maxPower; + _powerBaseSet = config._runtimeSet; + _powerBaseSet.Add(this); + } + + private void OnEnable() + { + _powerBaseSet.Add(this); + } + + private void OnDisable() + { + _powerBaseSet.Remove(this); } #region Setters diff --git a/Assets/Entities/Scripts/Targeter.cs b/Assets/Entities/Scripts/Targeter.cs index 9fc1d20..5d62f06 100644 --- a/Assets/Entities/Scripts/Targeter.cs +++ b/Assets/Entities/Scripts/Targeter.cs @@ -1,4 +1,3 @@ -using AsteroidGame.ScriptableObjects; using GameDev.CoreSystems; using UnityEngine; using UnityEngine.Serialization; @@ -40,7 +39,7 @@ namespace AsteroidGame.Entities var currentBestValue = Mathf.Infinity; var targetFound = false; - foreach (var targetEntity in _activeTargetable._list) + foreach (var targetEntity in _activeTargetable) { var distanceToTarget = Vector3.Magnitude(targetEntity.GetCenterPosition() - _targeterParent.GetCenterPosition()); diff --git a/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab b/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab index d6e963c..7758022 100644 --- a/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab +++ b/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab @@ -49,14 +49,11 @@ MonoBehaviour: k__BackingField: {fileID: 4803755810606958043} k__BackingField: {fileID: 4098794156838288170} _uiFriendlyName: Power\nPlant - _entityBaseSet: {fileID: 11400000, guid: c5542e77624472441a67b1f34e19a116, type: 2} _cost: 100 _buildPlacementBlocked: 0 _buildTimer: 0 _structureBaseSet: {fileID: 11400000, guid: 1925957d2bc2f0c4a9210131f2d2c4e5, type: 2} - _powerBaseSet: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2} _powerConfig: {fileID: 11400000, guid: 742a00ce6f6a8e04cae160bc40f09e24, type: 2} - _power: {fileID: 0} --- !u!1 &1139200854042314162 GameObject: m_ObjectHideFlags: 0 @@ -102,7 +99,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8410932d22e18624787af61d3a4cd191, type: 3} m_Name: m_EditorClassIdentifier: - _activeTargetableRuntimeSet: {fileID: 11400000, guid: dda2fd5e970bbd642a5ceead1e82783c, type: 2} + _activeTargetableRuntimeSet: {fileID: 11400000, guid: 2f4ea1ba11a5a3740a0c828fd2fa47d4, type: 2} k__BackingField: {fileID: 0} _centerPosition: {fileID: 4810890945869411434} _basePosition: {fileID: 4377705888661834325} diff --git a/Assets/Entities/Structures/PowerPlant/PowerplantPowerConfiguration.asset b/Assets/Entities/Structures/PowerPlant/PowerplantPowerConfiguration.asset index 341585f..7f1a015 100644 --- a/Assets/Entities/Structures/PowerPlant/PowerplantPowerConfiguration.asset +++ b/Assets/Entities/Structures/PowerPlant/PowerplantPowerConfiguration.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 87159085b5778b14482ec38673729d95, type: 3} m_Name: PowerplantPowerConfiguration m_EditorClassIdentifier: - _activePowerStructures: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2} isGenerator: 1 isConsumer: 0 maxPower: 100 + _runtimeSet: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2} diff --git a/Assets/Entities/Structures/Scripts/Disabler.cs b/Assets/Entities/Structures/Scripts/Disabler.cs index 504c63c..9678f5e 100644 --- a/Assets/Entities/Structures/Scripts/Disabler.cs +++ b/Assets/Entities/Structures/Scripts/Disabler.cs @@ -1,29 +1,29 @@ -using AsteroidGame.ScriptableObjects; using UnityEngine; using UnityEngine.Serialization; +using ScriptableObjectArchitecture; namespace AsteroidGame.Entities { public class Disabler : MonoBehaviour { [FormerlySerializedAs("Set")] - [SerializeField] private SoStructureBaseRuntimeSet _set; + [SerializeField] private GameObjectCollection _set; [ContextMenu("Disable All")] public void DisableAll() { // Loop backwards since the list may change when disabling - for (int i = _set._list.Count - 1; i >= 0; i--) + for (int i = _set.Count - 1; i >= 0; i--) { - _set._list[i].gameObject.SetActive(false); + _set[i].gameObject.SetActive(false); } } [ContextMenu("Disable Random")] public void DisableRandom() { - int index = Random.Range(0, _set._list.Count); - _set._list[index].gameObject.SetActive(false); + int index = Random.Range(0, _set.Count); + _set[index].gameObject.gameObject.SetActive(false); } } } \ No newline at end of file diff --git a/Assets/Entities/Structures/Scripts/StructureBase.cs b/Assets/Entities/Structures/Scripts/StructureBase.cs index 17c2143..6bcdc7d 100644 --- a/Assets/Entities/Structures/Scripts/StructureBase.cs +++ b/Assets/Entities/Structures/Scripts/StructureBase.cs @@ -1,4 +1,3 @@ -using AsteroidGame.ScriptableObjects; using GameDev.CoreSystems; using UnityEngine; @@ -12,23 +11,21 @@ namespace AsteroidGame.Entities [SerializeField] protected float _buildTimer; [Header("Configuration")] - [SerializeField] private SoEntityBaseRuntimeSet _structureBaseSet; - [SerializeField] private SoPowerBaseRuntimeSet _powerBaseSet; + [SerializeField] private SoBuildableRuntimeSet _structureBaseSet; [Header("Power")] [SerializeField] private SoPowerConfig _powerConfig; - [SerializeField] private PowerBase _power; + [SerializeField] private IPowerSystem _power; #region Publics - public PowerBase Power => _power; + public IPowerSystem Power => _power; public bool BuildPlacementBlocked => _buildPlacementBlocked; #endregion - protected override void OnEnable() + protected void OnEnable() { - base.OnEnable(); _structureBaseSet.Add(this); InitializePower(); } @@ -37,15 +34,11 @@ namespace AsteroidGame.Entities { _power = gameObject.AddComponent(); _power.SetConfig(_powerConfig); - _powerBaseSet.Add(_power); - } - protected override void OnDisable() + protected void OnDisable() { - base.OnDisable(); _structureBaseSet.Remove(this); - _powerBaseSet.Remove(_power); } private void OnTriggerStay(Collider other) diff --git a/Assets/Entities/Structures/Turret/Turret.cs b/Assets/Entities/Structures/Turret/Turret.cs index ccf05d3..28e9117 100644 --- a/Assets/Entities/Structures/Turret/Turret.cs +++ b/Assets/Entities/Structures/Turret/Turret.cs @@ -21,7 +21,7 @@ namespace AsteroidGame.Entities [field: Header("Targeter")] [field: SerializeField] public Targeter Targeter { get; set; } - protected override void OnEnable() + protected void OnEnable() { base.OnEnable(); InitializeTargeter(); diff --git a/Assets/Entities/Structures/Turret/Turret.prefab b/Assets/Entities/Structures/Turret/Turret.prefab index b507970..c19d0af 100644 --- a/Assets/Entities/Structures/Turret/Turret.prefab +++ b/Assets/Entities/Structures/Turret/Turret.prefab @@ -80,8 +80,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8410932d22e18624787af61d3a4cd191, type: 3} m_Name: m_EditorClassIdentifier: - _activeTargetableRuntimeSet: {fileID: 11400000, guid: dda2fd5e970bbd642a5ceead1e82783c, type: 2} - k__BackingField: {fileID: 0} + _activeTargetableRuntimeSet: {fileID: 11400000, guid: 2f4ea1ba11a5a3740a0c828fd2fa47d4, type: 2} + k__BackingField: {fileID: 3620345197547817675} _centerPosition: {fileID: 6894291031605712785} _basePosition: {fileID: 9116849480152445015} k__BackingField: {fileID: 6912639667868447711} @@ -943,7 +943,7 @@ MonoBehaviour: _targeterConfig: {fileID: 11400000, guid: 9df40bc219ab8f04cb4e86558bc0df86, type: 2} _range: 0 _targetStrategy: 0 - _activeTargetable: {fileID: 0} + _activeTargetable: {fileID: 11400000, guid: ab93dbcc7e973184b896173796edc5ac, type: 2} _targeterParent: {fileID: 0} k__BackingField: {fileID: 0} --- !u!1 &8385032484663529878 @@ -1136,14 +1136,11 @@ MonoBehaviour: k__BackingField: {fileID: 3620345197547817675} k__BackingField: {fileID: 3738931345656042189} _uiFriendlyName: Turret - _entityBaseSet: {fileID: 11400000, guid: c5542e77624472441a67b1f34e19a116, type: 2} _cost: 10 _buildPlacementBlocked: 0 _buildTimer: 0 _structureBaseSet: {fileID: 11400000, guid: 1925957d2bc2f0c4a9210131f2d2c4e5, type: 2} - _powerBaseSet: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2} _powerConfig: {fileID: 11400000, guid: 9dc2a0f5f29a11a4d9cabe19e18bdd42, type: 2} - _power: {fileID: 0} _damage: 1 _fireRate: 1 _projectileSpeed: 5 diff --git a/Assets/Entities/Structures/Turret/TurretPowerConfiguration.asset b/Assets/Entities/Structures/Turret/TurretPowerConfiguration.asset index 25e6019..f415e55 100644 --- a/Assets/Entities/Structures/Turret/TurretPowerConfiguration.asset +++ b/Assets/Entities/Structures/Turret/TurretPowerConfiguration.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 87159085b5778b14482ec38673729d95, type: 3} m_Name: TurretPowerConfiguration m_EditorClassIdentifier: - _activePowerStructures: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2} isGenerator: 0 isConsumer: 1 maxPower: 10 + _runtimeSet: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2} diff --git a/Assets/Entities/Structures/Turret/TurretStandardTargeterConfiguration.asset b/Assets/Entities/Structures/Turret/TurretStandardTargeterConfiguration.asset index 1148d54..d1bf002 100644 --- a/Assets/Entities/Structures/Turret/TurretStandardTargeterConfiguration.asset +++ b/Assets/Entities/Structures/Turret/TurretStandardTargeterConfiguration.asset @@ -15,4 +15,4 @@ MonoBehaviour: _maxRange: 15 _minRange: 0.5 _selectedTargetStrategy: 0 - _activeEntities: {fileID: 11400000, guid: 85e03587d1a940f438ceac70a3d544d5, type: 2} + _activeEntities: {fileID: 11400000, guid: ab93dbcc7e973184b896173796edc5ac, type: 2} diff --git a/Assets/Handlers/EnemyHandler.cs b/Assets/Handlers/EnemyHandler.cs index 2f77c78..7d8b723 100644 --- a/Assets/Handlers/EnemyHandler.cs +++ b/Assets/Handlers/EnemyHandler.cs @@ -1,4 +1,5 @@ using AsteroidGame.ScriptableObjects; +using ScriptableObjectArchitecture; using UnityEngine; namespace AsteroidGame.Handlers @@ -13,6 +14,6 @@ namespace AsteroidGame.Handlers [SerializeField] private SoEnemyBaseList _availableEnemies; [Header("Lists")] - [SerializeField] private SoEntityBaseRuntimeSet _activeEnemies; + [SerializeField] private GameObjectCollection _activeEnemies; } } \ No newline at end of file diff --git a/Assets/Handlers/PowerHandler.cs b/Assets/Handlers/PowerHandler.cs index 5fcf96a..a65afe3 100644 --- a/Assets/Handlers/PowerHandler.cs +++ b/Assets/Handlers/PowerHandler.cs @@ -1,5 +1,6 @@ using System; -using AsteroidGame.ScriptableObjects; +using GameDev.CoreSystems; +using ScriptableObjectArchitecture; using UnityEngine; namespace AsteroidGame.Handlers @@ -13,7 +14,7 @@ namespace AsteroidGame.Handlers [SerializeField] private float _powerFactor; [Header("Connections")] - [SerializeField] private SoPowerBaseRuntimeSet _activePowerStructures; + [SerializeField] private SoPowerSystemRuntimeSet _activePowerStructures; private void Update() @@ -21,7 +22,7 @@ namespace AsteroidGame.Handlers _powerConsumption = 0; _powerConsumptionPeak = 0; _powerCapacity = 0; - foreach (var structure in _activePowerStructures._list) + foreach (var structure in _activePowerStructures) { if (structure.IsConsumer) { From 37d0e023689d9572b0b5b3e69cb6634408849e9b Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 28 Oct 2023 18:09:02 +0200 Subject: [PATCH 02/16] Updated unity --- Assets/AsteroidGame.asmdef | 5 +- Assets/CoreSystems | 2 +- Assets/Entities/Enemies/Enemy.prefab | 8 +- .../Enemies/EnemyTargeterConfiguration.asset | 2 +- Assets/Entities/Entities.asmdef | 3 +- .../RuntimeSet/ActiveEnemyEntities.asset | 15 ---- .../RuntimeSet/ActiveEnemyEntities.asset.meta | 8 -- .../Entities/RuntimeSet/ActiveEntities.asset | 15 ---- .../RuntimeSet/ActiveEntities.asset.meta | 8 -- .../RuntimeSet/ActivePowerStructures.asset | 3 +- .../RuntimeSet/ActiveStructureEntities.asset | 3 +- .../ActiveTargetableBuildings.asset | 4 +- .../ActiveTargetableBuildings.asset.meta | 2 +- .../RuntimeSet/ActiveTargetableEnemies.asset | 4 +- .../ActiveTargetableEnemies.asset.meta | 2 +- .../SoEnemyBaseRuntimeSet.cs | 11 --- .../SoEnemyBaseRuntimeSet.cs.meta | 11 --- .../SoEntityBaseRuntimeSet.cs | 11 --- .../SoEntityBaseRuntimeSet.cs.meta | 11 --- .../SoPowerBaseRuntimeSet.cs | 11 --- .../SoPowerBaseRuntimeSet.cs.meta | 3 - .../ScriptableObjects/SoPowerConfig.cs | 13 ---- .../ScriptableObjects/SoPowerConfig.cs.meta | 11 --- .../SoStructureBaseRuntimeSet.cs | 11 --- .../SoStructureBaseRuntimeSet.cs.meta | 11 --- .../ScriptableObjects/SoTargeterConfig.cs | 22 ------ .../SoTargeterConfig.cs.meta | 11 --- .../ScriptableObjects/SoWeaponConfig.cs | 23 ------ .../ScriptableObjects/SoWeaponConfig.cs.meta | 11 --- Assets/Entities/Scripts/EnemyBase.cs | 14 +--- Assets/Entities/Scripts/EntityBase.cs | 14 +--- Assets/Entities/Scripts/PowerBase.cs | 17 +++++ Assets/Entities/Scripts/Targeter.cs | 3 +- .../Structures/PowerPlant/PowerPlant.prefab | 5 +- .../PowerplantPowerConfiguration.asset | 2 +- .../Entities/Structures/Scripts/Disabler.cs | 12 +-- .../Structures/Scripts/StructureBase.cs | 17 ++--- Assets/Entities/Structures/Turret/Turret.cs | 2 +- .../Entities/Structures/Turret/Turret.prefab | 9 +-- .../Turret/TurretPowerConfiguration.asset | 2 +- .../TurretStandardTargeterConfiguration.asset | 2 +- Assets/Handlers/EnemyHandler.cs | 3 +- Assets/Handlers/PowerHandler.cs | 7 +- Packages/manifest.json | 1 + Packages/packages-lock.json | 75 +++++++++++++------ ProjectSettings/VFXManager.asset | 1 + 46 files changed, 115 insertions(+), 326 deletions(-) delete mode 100644 Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset delete mode 100644 Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset.meta delete mode 100644 Assets/Entities/RuntimeSet/ActiveEntities.asset delete mode 100644 Assets/Entities/RuntimeSet/ActiveEntities.asset.meta delete mode 100644 Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs delete mode 100644 Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs.meta delete mode 100644 Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs delete mode 100644 Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs.meta delete mode 100644 Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs delete mode 100644 Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs.meta delete mode 100644 Assets/Entities/ScriptableObjects/SoPowerConfig.cs delete mode 100644 Assets/Entities/ScriptableObjects/SoPowerConfig.cs.meta delete mode 100644 Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs delete mode 100644 Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs.meta delete mode 100644 Assets/Entities/ScriptableObjects/SoTargeterConfig.cs delete mode 100644 Assets/Entities/ScriptableObjects/SoTargeterConfig.cs.meta delete mode 100644 Assets/Entities/ScriptableObjects/SoWeaponConfig.cs delete mode 100644 Assets/Entities/ScriptableObjects/SoWeaponConfig.cs.meta diff --git a/Assets/AsteroidGame.asmdef b/Assets/AsteroidGame.asmdef index 8bf3aa0..6657db9 100644 --- a/Assets/AsteroidGame.asmdef +++ b/Assets/AsteroidGame.asmdef @@ -5,10 +5,9 @@ "GUID:6055be8ebefd69e48b49212b09b47b2f", "GUID:75469ad4d38634e559750d17036d5f7c", "GUID:f008ecc6829887e478aeb5eb004eb01b", - "GUID:17a5862fcd6383b4b97bad4dcb1e2e5d", "GUID:f26d68a0bdefa1043b120b820f55e190", - "GUID:eb3099ff524d60545a136315a154d67b", - "GUID:5d38ea13ae8f69a4395d425d401a557a" + "GUID:5d38ea13ae8f69a4395d425d401a557a", + "GUID:63ebd60d5c68886498ecfee04b5d6a12" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/CoreSystems b/Assets/CoreSystems index da88241..b031ed3 160000 --- a/Assets/CoreSystems +++ b/Assets/CoreSystems @@ -1 +1 @@ -Subproject commit da8824120466499158fc1765333175b865aa0f82 +Subproject commit b031ed3db7b4a08253cf5fcf25059ad299fddaa0 diff --git a/Assets/Entities/Enemies/Enemy.prefab b/Assets/Entities/Enemies/Enemy.prefab index fd689bc..7538ad8 100644 --- a/Assets/Entities/Enemies/Enemy.prefab +++ b/Assets/Entities/Enemies/Enemy.prefab @@ -541,8 +541,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8410932d22e18624787af61d3a4cd191, type: 3} m_Name: m_EditorClassIdentifier: - _activeTargetableRuntimeSet: {fileID: 11400000, guid: 85e03587d1a940f438ceac70a3d544d5, type: 2} - k__BackingField: {fileID: 0} + _activeTargetableRuntimeSet: {fileID: 11400000, guid: ab93dbcc7e973184b896173796edc5ac, type: 2} + k__BackingField: {fileID: 4299120351774448665} _centerPosition: {fileID: 2513054780709503419} _basePosition: {fileID: 561887346552595101} k__BackingField: {fileID: 2425760649276150986} @@ -617,8 +617,6 @@ MonoBehaviour: k__BackingField: {fileID: 4299120351774448665} k__BackingField: {fileID: 4816616723634589559} _uiFriendlyName: Enemy - _entityBaseSet: {fileID: 11400000, guid: c5542e77624472441a67b1f34e19a116, type: 2} - _enemyBaseSet: {fileID: 11400000, guid: e5f25127d92be074aac6e7b745fae107, type: 2} k__BackingField: - {fileID: 5154912354327310122} - {fileID: 5217425462754499093} @@ -935,7 +933,7 @@ MonoBehaviour: _targeterConfig: {fileID: 11400000, guid: d5813a38da3962d4498fc71ef33361b6, type: 2} _range: 0 _targetStrategy: 0 - _activeTargetable: {fileID: 0} + _activeTargetable: {fileID: 11400000, guid: 2f4ea1ba11a5a3740a0c828fd2fa47d4, type: 2} _targeterParent: {fileID: 4816616723634589559} k__BackingField: {fileID: 0} --- !u!1 &7670619634857166053 diff --git a/Assets/Entities/Enemies/EnemyTargeterConfiguration.asset b/Assets/Entities/Enemies/EnemyTargeterConfiguration.asset index 8f3bd7d..f7f65e4 100644 --- a/Assets/Entities/Enemies/EnemyTargeterConfiguration.asset +++ b/Assets/Entities/Enemies/EnemyTargeterConfiguration.asset @@ -15,4 +15,4 @@ MonoBehaviour: _maxRange: 30 _minRange: 0.5 _selectedTargetStrategy: 0 - _activeEntities: {fileID: 11400000, guid: dda2fd5e970bbd642a5ceead1e82783c, type: 2} + _activeEntities: {fileID: 11400000, guid: 2f4ea1ba11a5a3740a0c828fd2fa47d4, type: 2} diff --git a/Assets/Entities/Entities.asmdef b/Assets/Entities/Entities.asmdef index 1414387..a38d77f 100644 --- a/Assets/Entities/Entities.asmdef +++ b/Assets/Entities/Entities.asmdef @@ -2,7 +2,8 @@ "name": "Entities", "rootNamespace": "AsteroidGame", "references": [ - "GUID:5d38ea13ae8f69a4395d425d401a557a" + "GUID:5d38ea13ae8f69a4395d425d401a557a", + "GUID:63ebd60d5c68886498ecfee04b5d6a12" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset b/Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset deleted file mode 100644 index 4a341a8..0000000 --- a/Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset +++ /dev/null @@ -1,15 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9da2d6a0206101c47a22881a0ba2ece2, type: 3} - m_Name: ActiveEnemyEntities - m_EditorClassIdentifier: - _list: [] diff --git a/Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset.meta b/Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset.meta deleted file mode 100644 index 05f995a..0000000 --- a/Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e5f25127d92be074aac6e7b745fae107 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/RuntimeSet/ActiveEntities.asset b/Assets/Entities/RuntimeSet/ActiveEntities.asset deleted file mode 100644 index 4d2f144..0000000 --- a/Assets/Entities/RuntimeSet/ActiveEntities.asset +++ /dev/null @@ -1,15 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9da2d6a0206101c47a22881a0ba2ece2, type: 3} - m_Name: ActiveEntities - m_EditorClassIdentifier: - _list: [] diff --git a/Assets/Entities/RuntimeSet/ActiveEntities.asset.meta b/Assets/Entities/RuntimeSet/ActiveEntities.asset.meta deleted file mode 100644 index f76b7df..0000000 --- a/Assets/Entities/RuntimeSet/ActiveEntities.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c5542e77624472441a67b1f34e19a116 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/RuntimeSet/ActivePowerStructures.asset b/Assets/Entities/RuntimeSet/ActivePowerStructures.asset index f01ab89..a5a61ec 100644 --- a/Assets/Entities/RuntimeSet/ActivePowerStructures.asset +++ b/Assets/Entities/RuntimeSet/ActivePowerStructures.asset @@ -9,7 +9,6 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3c46c7dedba14f3da958a2e6a3d3feaa, type: 3} + m_Script: {fileID: 11500000, guid: 1e1a04865d154864c97344bae176e489, type: 3} m_Name: ActivePowerStructures m_EditorClassIdentifier: - _list: [] diff --git a/Assets/Entities/RuntimeSet/ActiveStructureEntities.asset b/Assets/Entities/RuntimeSet/ActiveStructureEntities.asset index 7ef2ebd..95aabd4 100644 --- a/Assets/Entities/RuntimeSet/ActiveStructureEntities.asset +++ b/Assets/Entities/RuntimeSet/ActiveStructureEntities.asset @@ -9,7 +9,6 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9da2d6a0206101c47a22881a0ba2ece2, type: 3} + m_Script: {fileID: 11500000, guid: b73ccf581b4b8ca4fa9c4e0a61cdd6be, type: 3} m_Name: ActiveStructureEntities m_EditorClassIdentifier: - _list: [] diff --git a/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset b/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset index 45c4446..26b49b3 100644 --- a/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset +++ b/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7d76ef79c960c1845a914468e30d036b, type: 3} + m_Script: {fileID: 0} m_Name: ActiveTargetableBuildings - m_EditorClassIdentifier: + m_EditorClassIdentifier: CoreSystems:GameDev.CoreSystems:SoTargetableRuntimeSet _list: [] diff --git a/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset.meta b/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset.meta index a1284c1..ea8ec98 100644 --- a/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset.meta +++ b/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dda2fd5e970bbd642a5ceead1e82783c +guid: 2f4ea1ba11a5a3740a0c828fd2fa47d4 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset b/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset index 6c761ad..a876800 100644 --- a/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset +++ b/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7d76ef79c960c1845a914468e30d036b, type: 3} + m_Script: {fileID: 0} m_Name: ActiveTargetableEnemies - m_EditorClassIdentifier: + m_EditorClassIdentifier: CoreSystems:GameDev.CoreSystems:SoTargetableRuntimeSet _list: [] diff --git a/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset.meta b/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset.meta index bc95ae3..47faae4 100644 --- a/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset.meta +++ b/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 85e03587d1a940f438ceac70a3d544d5 +guid: ab93dbcc7e973184b896173796edc5ac NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs b/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs deleted file mode 100644 index 1d778cb..0000000 --- a/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs +++ /dev/null @@ -1,11 +0,0 @@ -using AsteroidGame.Entities; -using GameDev.CoreSystems; -using UnityEngine; - -namespace AsteroidGame.ScriptableObjects -{ - [CreateAssetMenu(fileName = "newEnemyBaseRuntimeSet", menuName = "RuntimeSet/EnemyBase")] - public class SoEnemyBaseRuntimeSet : SoRuntimeSet - { - } -} \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs.meta b/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs.meta deleted file mode 100644 index 2e05c60..0000000 --- a/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 33f48df2d03212c4986fe2c47c5de796 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs b/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs deleted file mode 100644 index 8b76909..0000000 --- a/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs +++ /dev/null @@ -1,11 +0,0 @@ -using AsteroidGame.Entities; -using GameDev.CoreSystems; -using UnityEngine; - -namespace AsteroidGame.ScriptableObjects -{ - [CreateAssetMenu(fileName = "newEntityBaseRuntimeSet", menuName = "RuntimeSet/EntityBase")] - public class SoEntityBaseRuntimeSet : SoRuntimeSet - { - } -} \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs.meta b/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs.meta deleted file mode 100644 index ce92792..0000000 --- a/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9da2d6a0206101c47a22881a0ba2ece2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs b/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs deleted file mode 100644 index dab8630..0000000 --- a/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs +++ /dev/null @@ -1,11 +0,0 @@ -using AsteroidGame.Entities; -using GameDev.CoreSystems; -using UnityEngine; - -namespace AsteroidGame.ScriptableObjects -{ - [CreateAssetMenu(fileName = "newPowerBaseRuntimeSet", menuName = "RuntimeSet/PowerBase")] - public class SoPowerBaseRuntimeSet : SoRuntimeSet - { - } -} \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs.meta b/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs.meta deleted file mode 100644 index c05d2f4..0000000 --- a/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 3c46c7dedba14f3da958a2e6a3d3feaa -timeCreated: 1665006553 \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoPowerConfig.cs b/Assets/Entities/ScriptableObjects/SoPowerConfig.cs deleted file mode 100644 index 03dacd5..0000000 --- a/Assets/Entities/ScriptableObjects/SoPowerConfig.cs +++ /dev/null @@ -1,13 +0,0 @@ -using UnityEngine; - -namespace AsteroidGame.ScriptableObjects -{ - [CreateAssetMenu(fileName = "newPowerConfiguration", menuName = "Configuration/Power")] - public class SoPowerConfig : ScriptableObject - { - public SoPowerBaseRuntimeSet _activePowerStructures; - public bool isGenerator; - public bool isConsumer; - public int maxPower; - } -} \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoPowerConfig.cs.meta b/Assets/Entities/ScriptableObjects/SoPowerConfig.cs.meta deleted file mode 100644 index ceb8c6e..0000000 --- a/Assets/Entities/ScriptableObjects/SoPowerConfig.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 87159085b5778b14482ec38673729d95 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs b/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs deleted file mode 100644 index 0d01258..0000000 --- a/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs +++ /dev/null @@ -1,11 +0,0 @@ -using AsteroidGame.Entities; -using GameDev.CoreSystems; -using UnityEngine; - -namespace AsteroidGame.ScriptableObjects -{ - [CreateAssetMenu(fileName = "newStructureBaseRuntimeSet", menuName = "RuntimeSet/StructureBase")] - public class SoStructureBaseRuntimeSet : SoRuntimeSet - { - } -} \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs.meta b/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs.meta deleted file mode 100644 index c009ffc..0000000 --- a/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fbc6f67c9903cc8448f793da64d840cf -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs b/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs deleted file mode 100644 index 8951174..0000000 --- a/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs +++ /dev/null @@ -1,22 +0,0 @@ -using GameDev.CoreSystems; -using UnityEngine; -using UnityEngine.Serialization; - -namespace AsteroidGame.ScriptableObjects -{ - [CreateAssetMenu(fileName = "newTargeterConfiguration", menuName = "Configuration/Targeter")] - public class SoTargeterConfig : ScriptableObject - { - [FormerlySerializedAs("_range")] - public float _maxRange; - public float _minRange; - public TargetStrategy _selectedTargetStrategy; - public SoTargetableRuntimeSet _activeEntities; - - public enum TargetStrategy - { - LowestRange, - LowestHealth - }; - } -} \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs.meta b/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs.meta deleted file mode 100644 index 5c2f0bb..0000000 --- a/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 02781660543c12d4ebddaf334eb0d730 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs b/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs deleted file mode 100644 index 2b656d3..0000000 --- a/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs +++ /dev/null @@ -1,23 +0,0 @@ -using GameDev.CoreSystems; -using UnityEngine; - -namespace AsteroidGame.ScriptableObjects -{ - public class SoWeaponConfig : ScriptableObject, IWeapon - { - [SerializeField] private float _fireRate; - [SerializeField] private float _damage; - - public float FireRate - { - get => _fireRate; - set => _fireRate = value; - } - - public float Damage - { - get => _damage; - set => _damage = value; - } - } -} \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs.meta b/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs.meta deleted file mode 100644 index f7217fb..0000000 --- a/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 19bf3f6dd184a48499aff1db728edfcd -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/Scripts/EnemyBase.cs b/Assets/Entities/Scripts/EnemyBase.cs index 9715f03..045e599 100644 --- a/Assets/Entities/Scripts/EnemyBase.cs +++ b/Assets/Entities/Scripts/EnemyBase.cs @@ -8,8 +8,6 @@ namespace AsteroidGame.Entities { public class EnemyBase : EntityBase { - [SerializeField] private SoEntityBaseRuntimeSet _enemyBaseSet; - [field: Header("Weapon")] [field: SerializeField] public List Weapons { get; set; } @@ -19,12 +17,8 @@ namespace AsteroidGame.Entities [field: Header("NavMeshAgent")] [SerializeField] private NavMeshAgent _navMeshAgent; - protected override void OnEnable() + protected void OnEnable() { - base.OnEnable(); - - _enemyBaseSet.Add(this); - InitializeTargeter(); InitializeNavMeshAgent(); @@ -50,12 +44,6 @@ namespace AsteroidGame.Entities //_navMeshAgent.speed = 0.1f; } - protected override void OnDisable() - { - base.OnDisable(); - _enemyBaseSet.Remove(this); - } - private void Update() { if (Targeter.FindTarget()) diff --git a/Assets/Entities/Scripts/EntityBase.cs b/Assets/Entities/Scripts/EntityBase.cs index ba9f087..8ae35ba 100644 --- a/Assets/Entities/Scripts/EntityBase.cs +++ b/Assets/Entities/Scripts/EntityBase.cs @@ -15,8 +15,6 @@ namespace AsteroidGame.Entities [Header("UI")] [SerializeField] protected string _uiFriendlyName; - [Space] - [SerializeField] private SoEntityBaseRuntimeSet _entityBaseSet; #region Props @@ -32,17 +30,7 @@ namespace AsteroidGame.Entities AssignDamageable(); } - - protected virtual void OnEnable() - { - _entityBaseSet.Add(this); - } - - protected virtual void OnDisable() - { - _entityBaseSet.Remove(this); - } - + private void InitializeDamageable() { if (Damageable != null) return; diff --git a/Assets/Entities/Scripts/PowerBase.cs b/Assets/Entities/Scripts/PowerBase.cs index 8feaa01..fe223fe 100644 --- a/Assets/Entities/Scripts/PowerBase.cs +++ b/Assets/Entities/Scripts/PowerBase.cs @@ -1,3 +1,6 @@ +//using AsteroidGame.ScriptableObjects; + +using System; using AsteroidGame.ScriptableObjects; using GameDev.CoreSystems; using UnityEngine; @@ -12,11 +15,25 @@ namespace AsteroidGame.Entities [SerializeField] protected int _maxPower; [SerializeField] protected int _currentPower; + [SerializeField] private SoPowerSystemRuntimeSet _powerBaseSet; + public void SetConfig(SoPowerConfig config) { _isGenerator = config.isGenerator; _isConsumer = config.isConsumer; _maxPower = config.maxPower; + _powerBaseSet = config._runtimeSet; + _powerBaseSet.Add(this); + } + + private void OnEnable() + { + _powerBaseSet.Add(this); + } + + private void OnDisable() + { + _powerBaseSet.Remove(this); } #region Setters diff --git a/Assets/Entities/Scripts/Targeter.cs b/Assets/Entities/Scripts/Targeter.cs index 9fc1d20..5d62f06 100644 --- a/Assets/Entities/Scripts/Targeter.cs +++ b/Assets/Entities/Scripts/Targeter.cs @@ -1,4 +1,3 @@ -using AsteroidGame.ScriptableObjects; using GameDev.CoreSystems; using UnityEngine; using UnityEngine.Serialization; @@ -40,7 +39,7 @@ namespace AsteroidGame.Entities var currentBestValue = Mathf.Infinity; var targetFound = false; - foreach (var targetEntity in _activeTargetable._list) + foreach (var targetEntity in _activeTargetable) { var distanceToTarget = Vector3.Magnitude(targetEntity.GetCenterPosition() - _targeterParent.GetCenterPosition()); diff --git a/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab b/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab index d6e963c..7758022 100644 --- a/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab +++ b/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab @@ -49,14 +49,11 @@ MonoBehaviour: k__BackingField: {fileID: 4803755810606958043} k__BackingField: {fileID: 4098794156838288170} _uiFriendlyName: Power\nPlant - _entityBaseSet: {fileID: 11400000, guid: c5542e77624472441a67b1f34e19a116, type: 2} _cost: 100 _buildPlacementBlocked: 0 _buildTimer: 0 _structureBaseSet: {fileID: 11400000, guid: 1925957d2bc2f0c4a9210131f2d2c4e5, type: 2} - _powerBaseSet: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2} _powerConfig: {fileID: 11400000, guid: 742a00ce6f6a8e04cae160bc40f09e24, type: 2} - _power: {fileID: 0} --- !u!1 &1139200854042314162 GameObject: m_ObjectHideFlags: 0 @@ -102,7 +99,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8410932d22e18624787af61d3a4cd191, type: 3} m_Name: m_EditorClassIdentifier: - _activeTargetableRuntimeSet: {fileID: 11400000, guid: dda2fd5e970bbd642a5ceead1e82783c, type: 2} + _activeTargetableRuntimeSet: {fileID: 11400000, guid: 2f4ea1ba11a5a3740a0c828fd2fa47d4, type: 2} k__BackingField: {fileID: 0} _centerPosition: {fileID: 4810890945869411434} _basePosition: {fileID: 4377705888661834325} diff --git a/Assets/Entities/Structures/PowerPlant/PowerplantPowerConfiguration.asset b/Assets/Entities/Structures/PowerPlant/PowerplantPowerConfiguration.asset index 341585f..7f1a015 100644 --- a/Assets/Entities/Structures/PowerPlant/PowerplantPowerConfiguration.asset +++ b/Assets/Entities/Structures/PowerPlant/PowerplantPowerConfiguration.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 87159085b5778b14482ec38673729d95, type: 3} m_Name: PowerplantPowerConfiguration m_EditorClassIdentifier: - _activePowerStructures: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2} isGenerator: 1 isConsumer: 0 maxPower: 100 + _runtimeSet: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2} diff --git a/Assets/Entities/Structures/Scripts/Disabler.cs b/Assets/Entities/Structures/Scripts/Disabler.cs index 504c63c..9678f5e 100644 --- a/Assets/Entities/Structures/Scripts/Disabler.cs +++ b/Assets/Entities/Structures/Scripts/Disabler.cs @@ -1,29 +1,29 @@ -using AsteroidGame.ScriptableObjects; using UnityEngine; using UnityEngine.Serialization; +using ScriptableObjectArchitecture; namespace AsteroidGame.Entities { public class Disabler : MonoBehaviour { [FormerlySerializedAs("Set")] - [SerializeField] private SoStructureBaseRuntimeSet _set; + [SerializeField] private GameObjectCollection _set; [ContextMenu("Disable All")] public void DisableAll() { // Loop backwards since the list may change when disabling - for (int i = _set._list.Count - 1; i >= 0; i--) + for (int i = _set.Count - 1; i >= 0; i--) { - _set._list[i].gameObject.SetActive(false); + _set[i].gameObject.SetActive(false); } } [ContextMenu("Disable Random")] public void DisableRandom() { - int index = Random.Range(0, _set._list.Count); - _set._list[index].gameObject.SetActive(false); + int index = Random.Range(0, _set.Count); + _set[index].gameObject.gameObject.SetActive(false); } } } \ No newline at end of file diff --git a/Assets/Entities/Structures/Scripts/StructureBase.cs b/Assets/Entities/Structures/Scripts/StructureBase.cs index 17c2143..6bcdc7d 100644 --- a/Assets/Entities/Structures/Scripts/StructureBase.cs +++ b/Assets/Entities/Structures/Scripts/StructureBase.cs @@ -1,4 +1,3 @@ -using AsteroidGame.ScriptableObjects; using GameDev.CoreSystems; using UnityEngine; @@ -12,23 +11,21 @@ namespace AsteroidGame.Entities [SerializeField] protected float _buildTimer; [Header("Configuration")] - [SerializeField] private SoEntityBaseRuntimeSet _structureBaseSet; - [SerializeField] private SoPowerBaseRuntimeSet _powerBaseSet; + [SerializeField] private SoBuildableRuntimeSet _structureBaseSet; [Header("Power")] [SerializeField] private SoPowerConfig _powerConfig; - [SerializeField] private PowerBase _power; + [SerializeField] private IPowerSystem _power; #region Publics - public PowerBase Power => _power; + public IPowerSystem Power => _power; public bool BuildPlacementBlocked => _buildPlacementBlocked; #endregion - protected override void OnEnable() + protected void OnEnable() { - base.OnEnable(); _structureBaseSet.Add(this); InitializePower(); } @@ -37,15 +34,11 @@ namespace AsteroidGame.Entities { _power = gameObject.AddComponent(); _power.SetConfig(_powerConfig); - _powerBaseSet.Add(_power); - } - protected override void OnDisable() + protected void OnDisable() { - base.OnDisable(); _structureBaseSet.Remove(this); - _powerBaseSet.Remove(_power); } private void OnTriggerStay(Collider other) diff --git a/Assets/Entities/Structures/Turret/Turret.cs b/Assets/Entities/Structures/Turret/Turret.cs index ccf05d3..28e9117 100644 --- a/Assets/Entities/Structures/Turret/Turret.cs +++ b/Assets/Entities/Structures/Turret/Turret.cs @@ -21,7 +21,7 @@ namespace AsteroidGame.Entities [field: Header("Targeter")] [field: SerializeField] public Targeter Targeter { get; set; } - protected override void OnEnable() + protected void OnEnable() { base.OnEnable(); InitializeTargeter(); diff --git a/Assets/Entities/Structures/Turret/Turret.prefab b/Assets/Entities/Structures/Turret/Turret.prefab index b507970..c19d0af 100644 --- a/Assets/Entities/Structures/Turret/Turret.prefab +++ b/Assets/Entities/Structures/Turret/Turret.prefab @@ -80,8 +80,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8410932d22e18624787af61d3a4cd191, type: 3} m_Name: m_EditorClassIdentifier: - _activeTargetableRuntimeSet: {fileID: 11400000, guid: dda2fd5e970bbd642a5ceead1e82783c, type: 2} - k__BackingField: {fileID: 0} + _activeTargetableRuntimeSet: {fileID: 11400000, guid: 2f4ea1ba11a5a3740a0c828fd2fa47d4, type: 2} + k__BackingField: {fileID: 3620345197547817675} _centerPosition: {fileID: 6894291031605712785} _basePosition: {fileID: 9116849480152445015} k__BackingField: {fileID: 6912639667868447711} @@ -943,7 +943,7 @@ MonoBehaviour: _targeterConfig: {fileID: 11400000, guid: 9df40bc219ab8f04cb4e86558bc0df86, type: 2} _range: 0 _targetStrategy: 0 - _activeTargetable: {fileID: 0} + _activeTargetable: {fileID: 11400000, guid: ab93dbcc7e973184b896173796edc5ac, type: 2} _targeterParent: {fileID: 0} k__BackingField: {fileID: 0} --- !u!1 &8385032484663529878 @@ -1136,14 +1136,11 @@ MonoBehaviour: k__BackingField: {fileID: 3620345197547817675} k__BackingField: {fileID: 3738931345656042189} _uiFriendlyName: Turret - _entityBaseSet: {fileID: 11400000, guid: c5542e77624472441a67b1f34e19a116, type: 2} _cost: 10 _buildPlacementBlocked: 0 _buildTimer: 0 _structureBaseSet: {fileID: 11400000, guid: 1925957d2bc2f0c4a9210131f2d2c4e5, type: 2} - _powerBaseSet: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2} _powerConfig: {fileID: 11400000, guid: 9dc2a0f5f29a11a4d9cabe19e18bdd42, type: 2} - _power: {fileID: 0} _damage: 1 _fireRate: 1 _projectileSpeed: 5 diff --git a/Assets/Entities/Structures/Turret/TurretPowerConfiguration.asset b/Assets/Entities/Structures/Turret/TurretPowerConfiguration.asset index 25e6019..f415e55 100644 --- a/Assets/Entities/Structures/Turret/TurretPowerConfiguration.asset +++ b/Assets/Entities/Structures/Turret/TurretPowerConfiguration.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 87159085b5778b14482ec38673729d95, type: 3} m_Name: TurretPowerConfiguration m_EditorClassIdentifier: - _activePowerStructures: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2} isGenerator: 0 isConsumer: 1 maxPower: 10 + _runtimeSet: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2} diff --git a/Assets/Entities/Structures/Turret/TurretStandardTargeterConfiguration.asset b/Assets/Entities/Structures/Turret/TurretStandardTargeterConfiguration.asset index 1148d54..d1bf002 100644 --- a/Assets/Entities/Structures/Turret/TurretStandardTargeterConfiguration.asset +++ b/Assets/Entities/Structures/Turret/TurretStandardTargeterConfiguration.asset @@ -15,4 +15,4 @@ MonoBehaviour: _maxRange: 15 _minRange: 0.5 _selectedTargetStrategy: 0 - _activeEntities: {fileID: 11400000, guid: 85e03587d1a940f438ceac70a3d544d5, type: 2} + _activeEntities: {fileID: 11400000, guid: ab93dbcc7e973184b896173796edc5ac, type: 2} diff --git a/Assets/Handlers/EnemyHandler.cs b/Assets/Handlers/EnemyHandler.cs index 2f77c78..7d8b723 100644 --- a/Assets/Handlers/EnemyHandler.cs +++ b/Assets/Handlers/EnemyHandler.cs @@ -1,4 +1,5 @@ using AsteroidGame.ScriptableObjects; +using ScriptableObjectArchitecture; using UnityEngine; namespace AsteroidGame.Handlers @@ -13,6 +14,6 @@ namespace AsteroidGame.Handlers [SerializeField] private SoEnemyBaseList _availableEnemies; [Header("Lists")] - [SerializeField] private SoEntityBaseRuntimeSet _activeEnemies; + [SerializeField] private GameObjectCollection _activeEnemies; } } \ No newline at end of file diff --git a/Assets/Handlers/PowerHandler.cs b/Assets/Handlers/PowerHandler.cs index 5fcf96a..a65afe3 100644 --- a/Assets/Handlers/PowerHandler.cs +++ b/Assets/Handlers/PowerHandler.cs @@ -1,5 +1,6 @@ using System; -using AsteroidGame.ScriptableObjects; +using GameDev.CoreSystems; +using ScriptableObjectArchitecture; using UnityEngine; namespace AsteroidGame.Handlers @@ -13,7 +14,7 @@ namespace AsteroidGame.Handlers [SerializeField] private float _powerFactor; [Header("Connections")] - [SerializeField] private SoPowerBaseRuntimeSet _activePowerStructures; + [SerializeField] private SoPowerSystemRuntimeSet _activePowerStructures; private void Update() @@ -21,7 +22,7 @@ namespace AsteroidGame.Handlers _powerConsumption = 0; _powerConsumptionPeak = 0; _powerCapacity = 0; - foreach (var structure in _activePowerStructures._list) + foreach (var structure in _activePowerStructures) { if (structure.IsConsumer) { diff --git a/Packages/manifest.json b/Packages/manifest.json index 3e245bd..600c2ad 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -10,6 +10,7 @@ "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.7.5", + "com.unity.toolchain.linux-x86_64": "2.0.9", "com.unity.ugui": "1.0.0", "com.unity.ui": "2.0.0", "com.unity.ui.builder": "2.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index dd8058e..845c3cb 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -10,11 +10,12 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.8", + "version": "1.8.18", "depth": 1, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1" + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -37,18 +38,18 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.ide.visualstudio": "2.0.18", - "com.unity.ide.rider": "3.0.24", + "com.unity.ide.visualstudio": "2.0.22", + "com.unity.ide.rider": "3.0.31", "com.unity.ide.vscode": "1.2.5", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.2.2", "com.unity.test-framework": "1.1.33", - "com.unity.testtools.codecoverage": "1.2.4" + "com.unity.testtools.codecoverage": "1.2.6" } }, "com.unity.ide.rider": { - "version": "3.0.25", - "depth": 0, + "version": "3.0.31", + "depth": 1, "source": "registry", "dependencies": { "com.unity.ext.nunit": "1.0.6" @@ -56,8 +57,8 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.21", - "depth": 0, + "version": "2.0.22", + "depth": 1, "source": "registry", "dependencies": { "com.unity.test-framework": "1.1.9" @@ -95,7 +96,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "14.0.8", + "version": "14.0.11", "depth": 1, "source": "builtin", "dependencies": { @@ -111,23 +112,23 @@ "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.4", - "com.unity.burst": "1.8.4", + "com.unity.burst": "1.8.9", "com.unity.modules.video": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.terrain": "1.0.0", - "com.unity.render-pipelines.core": "14.0.8", - "com.unity.shadergraph": "14.0.8", - "com.unity.visualeffectgraph": "14.0.8", - "com.unity.render-pipelines.high-definition-config": "14.0.8" + "com.unity.render-pipelines.core": "14.0.11", + "com.unity.shadergraph": "14.0.11", + "com.unity.visualeffectgraph": "14.0.11", + "com.unity.render-pipelines.high-definition-config": "14.0.11" } }, "com.unity.render-pipelines.high-definition-config": { - "version": "14.0.8", + "version": "14.0.11", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.8" + "com.unity.render-pipelines.core": "14.0.11" } }, "com.unity.searcher": { @@ -145,14 +146,30 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "14.0.8", + "version": "14.0.11", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.8", + "com.unity.render-pipelines.core": "14.0.11", "com.unity.searcher": "4.9.2" } }, + "com.unity.sysroot": { + "version": "2.0.10", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.sysroot.linux-x86_64": { + "version": "2.0.9", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.10" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.1.33", "depth": 0, @@ -165,7 +182,7 @@ "url": "https://packages.unity.com" }, "com.unity.testtools.codecoverage": { - "version": "1.2.4", + "version": "1.2.6", "depth": 1, "source": "registry", "dependencies": { @@ -188,13 +205,23 @@ "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.linux-x86_64": { + "version": "2.0.9", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.10", + "com.unity.sysroot.linux-x86_64": "2.0.9" + }, + "url": "https://packages.unity.com" + }, "com.unity.ugui": { "version": "1.0.0", "depth": 0, @@ -217,12 +244,12 @@ "dependencies": {} }, "com.unity.visualeffectgraph": { - "version": "14.0.8", + "version": "14.0.11", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.shadergraph": "14.0.8", - "com.unity.render-pipelines.core": "14.0.8" + "com.unity.shadergraph": "14.0.11", + "com.unity.render-pipelines.core": "14.0.11" } }, "com.unity.modules.ai": { diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset index 87823a9..93cb30a 100644 --- a/ProjectSettings/VFXManager.asset +++ b/ProjectSettings/VFXManager.asset @@ -7,6 +7,7 @@ VFXManager: m_CopyBufferShader: {fileID: 7200000, guid: 23c51f21a3503f6428b527b01f8a2f4e, type: 3} m_SortShader: {fileID: 7200000, guid: ea257ca3cfb12a642a5025e612af6b2a, type: 3} m_StripUpdateShader: {fileID: 7200000, guid: 8fa6c4009fe2a4d4486c62736fc30ad8, type: 3} + m_EmptyShader: {fileID: 4800000, guid: 33a2079f6a2db4c4eb2e44b33f4ddf6b, type: 3} m_RenderPipeSettingsPath: m_FixedTimeStep: 0.016666668 m_MaxDeltaTime: 0.05 From b9d9e52c49cbc2973e53bcec7424c08c062537d6 Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 5 Oct 2024 15:31:57 +0200 Subject: [PATCH 03/16] Disabled OpenGL for linux --- ProjectSettings/ProjectSettings.asset | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 2c71d59..6c3c199 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -48,6 +48,7 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 + unsupportedMSAAFallback: 0 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 @@ -75,6 +76,7 @@ PlayerSettings: androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -82,6 +84,7 @@ PlayerSettings: muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 @@ -135,6 +138,8 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 bundleVersion: 0.1 preloadedAssets: - {fileID: 11400000, guid: 2f27ffbbbd54d9c4b9435071982af520, type: 2} @@ -148,6 +153,7 @@ PlayerSettings: isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 hdrBitDepth: 0 m_ColorGamuts: 00000000 @@ -156,7 +162,8 @@ PlayerSettings: resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} + applicationIdentifier: + Standalone: com.DefaultCompany.AsteroidGame buildNumber: Standalone: 0 VisionOS: 0 @@ -228,6 +235,7 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 + metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: @@ -341,6 +349,9 @@ PlayerSettings: - m_BuildTarget: WebGLSupport m_APIs: 0b000000 m_Automatic: 1 + - m_BuildTarget: LinuxStandaloneSupport + m_APIs: 1100000015000000 + m_Automatic: 0 m_BuildTargetVRSettings: - m_BuildTarget: Standalone m_Enabled: 0 @@ -414,7 +425,6 @@ PlayerSettings: switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 switchEnableFileSystemTrace: 0 - switchUseGOLDLinker: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: @@ -544,7 +554,6 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 @@ -707,6 +716,7 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: From 53560fcc6bddfb098cb60ea9d6290d5d05c1c589 Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 5 Oct 2024 15:34:39 +0200 Subject: [PATCH 04/16] Nicer syntax for adding components if null --- Assets/Entities/Scripts/EntityBase.cs | 9 +++------ Assets/Entities/Structures/Scripts/StructureBase.cs | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Assets/Entities/Scripts/EntityBase.cs b/Assets/Entities/Scripts/EntityBase.cs index 8ae35ba..51c0d44 100644 --- a/Assets/Entities/Scripts/EntityBase.cs +++ b/Assets/Entities/Scripts/EntityBase.cs @@ -15,7 +15,6 @@ namespace AsteroidGame.Entities [Header("UI")] [SerializeField] protected string _uiFriendlyName; - #region Props public string UiFriendlyName => _uiFriendlyName; @@ -30,17 +29,15 @@ namespace AsteroidGame.Entities AssignDamageable(); } - + private void InitializeDamageable() { - if (Damageable != null) return; - Damageable = gameObject.AddComponent(); + Damageable ??= gameObject.AddComponent(); } private void InitializeTargetable() { - if (Targetable != null) return; - Targetable = gameObject.AddComponent(); + Targetable ??= gameObject.AddComponent(); } private void AssignDamageable() diff --git a/Assets/Entities/Structures/Scripts/StructureBase.cs b/Assets/Entities/Structures/Scripts/StructureBase.cs index 6bcdc7d..fca19c0 100644 --- a/Assets/Entities/Structures/Scripts/StructureBase.cs +++ b/Assets/Entities/Structures/Scripts/StructureBase.cs @@ -32,8 +32,8 @@ namespace AsteroidGame.Entities private void InitializePower() { - _power = gameObject.AddComponent(); - _power.SetConfig(_powerConfig); + _power ??= gameObject.AddComponent(); + _power.Initialize(_powerConfig); } protected void OnDisable() From 9e0304fe93e52a49308ef1a9b8207ea8c97450c9 Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 5 Oct 2024 15:35:58 +0200 Subject: [PATCH 05/16] Fixed bug in PowerBase initialization --- Assets/CoreSystems | 2 +- Assets/Entities/Scripts/PowerBase.cs | 7 +------ Assets/Scenes/Playground 1.unity | 29 +++++++++++++++++----------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Assets/CoreSystems b/Assets/CoreSystems index b031ed3..4005878 160000 --- a/Assets/CoreSystems +++ b/Assets/CoreSystems @@ -1 +1 @@ -Subproject commit b031ed3db7b4a08253cf5fcf25059ad299fddaa0 +Subproject commit 4005878930047e686a5efbd876ebee4cb3d97442 diff --git a/Assets/Entities/Scripts/PowerBase.cs b/Assets/Entities/Scripts/PowerBase.cs index fe223fe..0b6cc54 100644 --- a/Assets/Entities/Scripts/PowerBase.cs +++ b/Assets/Entities/Scripts/PowerBase.cs @@ -17,7 +17,7 @@ namespace AsteroidGame.Entities [SerializeField] private SoPowerSystemRuntimeSet _powerBaseSet; - public void SetConfig(SoPowerConfig config) + public void Initialize(SoPowerConfig config) { _isGenerator = config.isGenerator; _isConsumer = config.isConsumer; @@ -26,11 +26,6 @@ namespace AsteroidGame.Entities _powerBaseSet.Add(this); } - private void OnEnable() - { - _powerBaseSet.Add(this); - } - private void OnDisable() { _powerBaseSet.Remove(this); diff --git a/Assets/Scenes/Playground 1.unity b/Assets/Scenes/Playground 1.unity index 6d4715d..50f6eeb 100644 --- a/Assets/Scenes/Playground 1.unity +++ b/Assets/Scenes/Playground 1.unity @@ -38,7 +38,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 262.33694, g: 325.04984, b: 430.2193, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -336,7 +335,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -1043,7 +1042,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -1486,6 +1485,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 100000 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 @@ -1588,14 +1595,6 @@ MonoBehaviour: m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 --- !u!4 &2079460687 stripped Transform: m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} @@ -1653,6 +1652,10 @@ PrefabInstance: propertyPath: m_Name value: Turret objectReference: {fileID: 0} + - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1966,6 +1969,10 @@ PrefabInstance: propertyPath: m_Name value: PowerPlant objectReference: {fileID: 0} + - target: {fileID: 1134055636167264334, guid: 57a75520298c47140a928041b05d7f3c, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] From 369c32fe7191998c433ff0e28519cf73f47da8ef Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 5 Oct 2024 15:58:23 +0200 Subject: [PATCH 06/16] A bunch of settings was reverted after the last commit. --- Assets/InputSystem/CameraControllActions.cs | 7 ++++++- Assets/InputSystem/HandlerControls.cs | 8 +++++++- Packages/manifest.json | 12 ++++++------ Packages/packages-lock.json | 12 ++++++------ ProjectSettings/GraphicsSettings.asset | 9 +++++---- ProjectSettings/ProjectSettings.asset | 2 +- ProjectSettings/ProjectVersion.txt | 4 ++-- 7 files changed, 33 insertions(+), 21 deletions(-) diff --git a/Assets/InputSystem/CameraControllActions.cs b/Assets/InputSystem/CameraControllActions.cs index dfcb260..100d393 100644 --- a/Assets/InputSystem/CameraControllActions.cs +++ b/Assets/InputSystem/CameraControllActions.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.7.0 +// version 1.11.0 // from Assets/InputSystem/CameraControllActions.inputactions // // Changes to this file may cause incorrect behavior and will be lost if @@ -145,6 +145,11 @@ public partial class @CameraControllActions: IInputActionCollection2, IDisposabl m_Camera_ZoomCamera = m_Camera.FindAction("ZoomCamera", throwIfNotFound: true); } + ~@CameraControllActions() + { + UnityEngine.Debug.Assert(!m_Camera.enabled, "This will cause a leak and performance issues, CameraControllActions.Camera.Disable() has not been called."); + } + public void Dispose() { UnityEngine.Object.Destroy(asset); diff --git a/Assets/InputSystem/HandlerControls.cs b/Assets/InputSystem/HandlerControls.cs index 12a6697..0740078 100644 --- a/Assets/InputSystem/HandlerControls.cs +++ b/Assets/InputSystem/HandlerControls.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.7.0 +// version 1.11.0 // from Assets/InputSystem/HandlerControls.inputactions // // Changes to this file may cause incorrect behavior and will be lost if @@ -921,6 +921,12 @@ namespace AsteroidGame m_UI_TrackedDeviceOrientation = m_UI.FindAction("TrackedDeviceOrientation", throwIfNotFound: true); } + ~@HandlerControls() + { + UnityEngine.Debug.Assert(!m_Player.enabled, "This will cause a leak and performance issues, HandlerControls.Player.Disable() has not been called."); + UnityEngine.Debug.Assert(!m_UI.enabled, "This will cause a leak and performance issues, HandlerControls.UI.Disable() has not been called."); + } + public void Dispose() { UnityEngine.Object.Destroy(asset); diff --git a/Packages/manifest.json b/Packages/manifest.json index 600c2ad..3e7786f 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,14 +2,14 @@ "dependencies": { "com.unity.ai.navigation": "1.1.5", "com.unity.feature.development": "1.0.1", - "com.unity.ide.rider": "3.0.25", - "com.unity.ide.visualstudio": "2.0.21", + "com.unity.ide.rider": "3.0.31", + "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", - "com.unity.inputsystem": "1.7.0", - "com.unity.render-pipelines.high-definition": "14.0.8", + "com.unity.inputsystem": "1.11.0", + "com.unity.render-pipelines.high-definition": "14.0.11", "com.unity.test-framework": "1.1.33", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.5", + "com.unity.textmeshpro": "3.0.7", + "com.unity.timeline": "1.7.6", "com.unity.toolchain.linux-x86_64": "2.0.9", "com.unity.ugui": "1.0.0", "com.unity.ui": "2.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 845c3cb..93ebb4a 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -49,7 +49,7 @@ }, "com.unity.ide.rider": { "version": "3.0.31", - "depth": 1, + "depth": 0, "source": "registry", "dependencies": { "com.unity.ext.nunit": "1.0.6" @@ -58,7 +58,7 @@ }, "com.unity.ide.visualstudio": { "version": "2.0.22", - "depth": 1, + "depth": 0, "source": "registry", "dependencies": { "com.unity.test-framework": "1.1.9" @@ -73,7 +73,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.7.0", + "version": "1.11.0", "depth": 0, "source": "registry", "dependencies": { @@ -107,7 +107,7 @@ } }, "com.unity.render-pipelines.high-definition": { - "version": "14.0.8", + "version": "14.0.11", "depth": 0, "source": "builtin", "dependencies": { @@ -192,7 +192,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.6", + "version": "3.0.7", "depth": 0, "source": "registry", "dependencies": { @@ -201,7 +201,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.7.5", + "version": "1.7.6", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 96101d8..26bfb6d 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 14 + serializedVersion: 15 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -13,9 +13,6 @@ GraphicsSettings: m_ScreenSpaceShadows: m_Mode: 1 m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} - m_LegacyDeferred: - m_Mode: 1 - m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} m_DepthNormals: m_Mode: 1 m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} @@ -48,6 +45,7 @@ GraphicsSettings: m_LightmapStripping: 0 m_FogStripping: 0 m_InstancingStripping: 0 + m_BrgStripping: 0 m_LightmapKeepPlain: 1 m_LightmapKeepDirCombined: 1 m_LightmapKeepDynamicPlain: 1 @@ -64,3 +62,6 @@ GraphicsSettings: m_LogWhenShaderIsCompiled: 0 m_SRPDefaultSettings: UnityEngine.Rendering.HighDefinition.HDRenderPipeline: {fileID: 11400000, guid: f586bf21bdc18374fa13455942bba5cc, type: 2} + m_LightProbeOutsideHullStrategy: 0 + m_CameraRelativeLightCulling: 0 + m_CameraRelativeShadowCulling: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 6c3c199..cda41a7 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -350,7 +350,7 @@ PlayerSettings: m_APIs: 0b000000 m_Automatic: 1 - m_BuildTarget: LinuxStandaloneSupport - m_APIs: 1100000015000000 + m_APIs: 15000000 m_Automatic: 0 m_BuildTargetVRSettings: - m_BuildTarget: Standalone diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 88bb9cf..ca0a679 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.10f1 -m_EditorVersionWithRevision: 2022.3.10f1 (ff3792e53c62) +m_EditorVersion: 2022.3.49f1 +m_EditorVersionWithRevision: 2022.3.49f1 (4dae1bb8668d) From bb894318072af533f342d5eacb8797297c52b885 Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 5 Oct 2024 16:45:27 +0200 Subject: [PATCH 07/16] Added simple death mechanic --- Assets/CoreSystems | 2 +- Assets/Entities/Scripts/EntityBase.cs | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Assets/CoreSystems b/Assets/CoreSystems index 4005878..c81a750 160000 --- a/Assets/CoreSystems +++ b/Assets/CoreSystems @@ -1 +1 @@ -Subproject commit 4005878930047e686a5efbd876ebee4cb3d97442 +Subproject commit c81a750f2fd89f8ba79c098c353f100e0925637f diff --git a/Assets/Entities/Scripts/EntityBase.cs b/Assets/Entities/Scripts/EntityBase.cs index 51c0d44..933c7ea 100644 --- a/Assets/Entities/Scripts/EntityBase.cs +++ b/Assets/Entities/Scripts/EntityBase.cs @@ -1,4 +1,3 @@ -using AsteroidGame.ScriptableObjects; using GameDev.CoreSystems; using UnityEngine; @@ -33,6 +32,12 @@ namespace AsteroidGame.Entities private void InitializeDamageable() { Damageable ??= gameObject.AddComponent(); + Damageable.DeathEvent.AddListener(HandleDeath); + } + + private void HandleDeath() + { + Destroy(gameObject); } private void InitializeTargetable() From 1719b56d8a4a08d75879716e12110c8e63485b36 Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 5 Oct 2024 17:07:22 +0200 Subject: [PATCH 08/16] Fixed null error if there are no targets --- Assets/Entities/Scripts/Targeter.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Assets/Entities/Scripts/Targeter.cs b/Assets/Entities/Scripts/Targeter.cs index 5d62f06..91c088d 100644 --- a/Assets/Entities/Scripts/Targeter.cs +++ b/Assets/Entities/Scripts/Targeter.cs @@ -36,6 +36,8 @@ namespace AsteroidGame.Entities public bool FindTarget() { + if (_activeTargetable == null || _activeTargetable.Count == 0) return false; + var currentBestValue = Mathf.Infinity; var targetFound = false; From d4e9bde59d96ed66009301b70ac0e9f60cf7510d Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 5 Oct 2024 17:07:38 +0200 Subject: [PATCH 09/16] Renamed TargetFinder function --- Assets/Entities/Scripts/EnemyBase.cs | 2 +- Assets/Entities/Scripts/Targeter.cs | 2 +- Assets/Entities/Structures/Turret/Turret.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/Entities/Scripts/EnemyBase.cs b/Assets/Entities/Scripts/EnemyBase.cs index 045e599..b132134 100644 --- a/Assets/Entities/Scripts/EnemyBase.cs +++ b/Assets/Entities/Scripts/EnemyBase.cs @@ -46,7 +46,7 @@ namespace AsteroidGame.Entities private void Update() { - if (Targeter.FindTarget()) + if (Targeter.FoundTarget()) { foreach (var weapon in Weapons) { diff --git a/Assets/Entities/Scripts/Targeter.cs b/Assets/Entities/Scripts/Targeter.cs index 91c088d..66b8c0a 100644 --- a/Assets/Entities/Scripts/Targeter.cs +++ b/Assets/Entities/Scripts/Targeter.cs @@ -34,7 +34,7 @@ namespace AsteroidGame.Entities return TargetEntity; } - public bool FindTarget() + public bool FoundTarget() { if (_activeTargetable == null || _activeTargetable.Count == 0) return false; diff --git a/Assets/Entities/Structures/Turret/Turret.cs b/Assets/Entities/Structures/Turret/Turret.cs index 28e9117..291945a 100644 --- a/Assets/Entities/Structures/Turret/Turret.cs +++ b/Assets/Entities/Structures/Turret/Turret.cs @@ -34,7 +34,7 @@ namespace AsteroidGame.Entities private void Update() { - if (Targeter.FindTarget()) + if (Targeter.FoundTarget()) { foreach (var weapon in Weapons) { From 253f7b78d1080771e61f3dd6021dec5228f6e58c Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 5 Oct 2024 17:08:01 +0200 Subject: [PATCH 10/16] Fixed a mistake in Turret OnEnable method --- Assets/Entities/Structures/Scripts/StructureBase.cs | 2 +- Assets/Entities/Structures/Turret/Turret.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Entities/Structures/Scripts/StructureBase.cs b/Assets/Entities/Structures/Scripts/StructureBase.cs index 4fd0a0e..f54614f 100644 --- a/Assets/Entities/Structures/Scripts/StructureBase.cs +++ b/Assets/Entities/Structures/Scripts/StructureBase.cs @@ -25,7 +25,7 @@ namespace AsteroidGame.Entities #endregion - protected void OnEnable() + protected virtual void OnEnable() { _structureBaseSet.Add(this); InitializePower(); diff --git a/Assets/Entities/Structures/Turret/Turret.cs b/Assets/Entities/Structures/Turret/Turret.cs index 291945a..6d36619 100644 --- a/Assets/Entities/Structures/Turret/Turret.cs +++ b/Assets/Entities/Structures/Turret/Turret.cs @@ -21,7 +21,7 @@ namespace AsteroidGame.Entities [field: Header("Targeter")] [field: SerializeField] public Targeter Targeter { get; set; } - protected void OnEnable() + protected override void OnEnable() { base.OnEnable(); InitializeTargeter(); From fabec89267e484c40c7ff954e689a3e4adc27b67 Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 5 Oct 2024 17:09:24 +0200 Subject: [PATCH 11/16] Fixed error in target RuntimeSets --- Assets/Entities/Enemies/Enemy.prefab | 9 ++++++--- .../Enemies/EnemyTargeterConfiguration.asset | 2 +- .../RuntimeSet/ActiveTargetableBuildings.asset | 4 ++-- .../RuntimeSet/ActiveTargetableBuildings.asset.meta | 2 +- .../RuntimeSet/ActiveTargetableEnemies.asset | 4 ++-- .../RuntimeSet/ActiveTargetableEnemies.asset.meta | 2 +- .../Entities/Structures/PowerPlant/PowerPlant.prefab | 7 +++++-- Assets/Entities/Structures/Turret/Turret.prefab | 12 +++++------- .../Turret/TurretStandardTargeterConfiguration.asset | 2 +- Assets/Scenes/Playground 1.unity | 7 ++++--- 10 files changed, 28 insertions(+), 23 deletions(-) diff --git a/Assets/Entities/Enemies/Enemy.prefab b/Assets/Entities/Enemies/Enemy.prefab index 7538ad8..a8e72bc 100644 --- a/Assets/Entities/Enemies/Enemy.prefab +++ b/Assets/Entities/Enemies/Enemy.prefab @@ -148,6 +148,9 @@ MonoBehaviour: k__BackingField: 10 k__BackingField: 10 k__BackingField: 0 + DeathEvent: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1768817052950042673 GameObject: m_ObjectHideFlags: 0 @@ -541,7 +544,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8410932d22e18624787af61d3a4cd191, type: 3} m_Name: m_EditorClassIdentifier: - _activeTargetableRuntimeSet: {fileID: 11400000, guid: ab93dbcc7e973184b896173796edc5ac, type: 2} + _activeTargetableRuntimeSet: {fileID: 11400000, guid: 7eab5444b4ac7f28badf814659475b35, type: 2} k__BackingField: {fileID: 4299120351774448665} _centerPosition: {fileID: 2513054780709503419} _basePosition: {fileID: 561887346552595101} @@ -933,8 +936,8 @@ MonoBehaviour: _targeterConfig: {fileID: 11400000, guid: d5813a38da3962d4498fc71ef33361b6, type: 2} _range: 0 _targetStrategy: 0 - _activeTargetable: {fileID: 11400000, guid: 2f4ea1ba11a5a3740a0c828fd2fa47d4, type: 2} - _targeterParent: {fileID: 4816616723634589559} + _activeTargetable: {fileID: 0} + _targeterParent: {fileID: 0} k__BackingField: {fileID: 0} --- !u!1 &7670619634857166053 GameObject: diff --git a/Assets/Entities/Enemies/EnemyTargeterConfiguration.asset b/Assets/Entities/Enemies/EnemyTargeterConfiguration.asset index f7f65e4..5d726de 100644 --- a/Assets/Entities/Enemies/EnemyTargeterConfiguration.asset +++ b/Assets/Entities/Enemies/EnemyTargeterConfiguration.asset @@ -15,4 +15,4 @@ MonoBehaviour: _maxRange: 30 _minRange: 0.5 _selectedTargetStrategy: 0 - _activeEntities: {fileID: 11400000, guid: 2f4ea1ba11a5a3740a0c828fd2fa47d4, type: 2} + _activeEntities: {fileID: 11400000, guid: e4a169ae23d295ff2b9b2a3d4213a0ee, type: 2} diff --git a/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset b/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset index 26b49b3..45c4446 100644 --- a/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset +++ b/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 0} + m_Script: {fileID: 11500000, guid: 7d76ef79c960c1845a914468e30d036b, type: 3} m_Name: ActiveTargetableBuildings - m_EditorClassIdentifier: CoreSystems:GameDev.CoreSystems:SoTargetableRuntimeSet + m_EditorClassIdentifier: _list: [] diff --git a/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset.meta b/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset.meta index ea8ec98..2af7c8e 100644 --- a/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset.meta +++ b/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2f4ea1ba11a5a3740a0c828fd2fa47d4 +guid: e4a169ae23d295ff2b9b2a3d4213a0ee NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset b/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset index a876800..6c761ad 100644 --- a/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset +++ b/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 0} + m_Script: {fileID: 11500000, guid: 7d76ef79c960c1845a914468e30d036b, type: 3} m_Name: ActiveTargetableEnemies - m_EditorClassIdentifier: CoreSystems:GameDev.CoreSystems:SoTargetableRuntimeSet + m_EditorClassIdentifier: _list: [] diff --git a/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset.meta b/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset.meta index 47faae4..f14bcba 100644 --- a/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset.meta +++ b/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ab93dbcc7e973184b896173796edc5ac +guid: 7eab5444b4ac7f28badf814659475b35 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab b/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab index 7758022..bacfebf 100644 --- a/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab +++ b/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab @@ -99,8 +99,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8410932d22e18624787af61d3a4cd191, type: 3} m_Name: m_EditorClassIdentifier: - _activeTargetableRuntimeSet: {fileID: 11400000, guid: 2f4ea1ba11a5a3740a0c828fd2fa47d4, type: 2} - k__BackingField: {fileID: 0} + _activeTargetableRuntimeSet: {fileID: 11400000, guid: e4a169ae23d295ff2b9b2a3d4213a0ee, type: 2} + k__BackingField: {fileID: 4803755810606958043} _centerPosition: {fileID: 4810890945869411434} _basePosition: {fileID: 4377705888661834325} k__BackingField: {fileID: 4863520569015429884} @@ -289,6 +289,9 @@ MonoBehaviour: k__BackingField: 10 k__BackingField: 10 k__BackingField: 0 + DeathEvent: + m_PersistentCalls: + m_Calls: [] --- !u!1 &5696605131341260023 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Entities/Structures/Turret/Turret.prefab b/Assets/Entities/Structures/Turret/Turret.prefab index c19d0af..d825633 100644 --- a/Assets/Entities/Structures/Turret/Turret.prefab +++ b/Assets/Entities/Structures/Turret/Turret.prefab @@ -80,7 +80,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8410932d22e18624787af61d3a4cd191, type: 3} m_Name: m_EditorClassIdentifier: - _activeTargetableRuntimeSet: {fileID: 11400000, guid: 2f4ea1ba11a5a3740a0c828fd2fa47d4, type: 2} + _activeTargetableRuntimeSet: {fileID: 11400000, guid: e4a169ae23d295ff2b9b2a3d4213a0ee, type: 2} k__BackingField: {fileID: 3620345197547817675} _centerPosition: {fileID: 6894291031605712785} _basePosition: {fileID: 9116849480152445015} @@ -351,6 +351,9 @@ MonoBehaviour: k__BackingField: 50 k__BackingField: 50 k__BackingField: 0 + DeathEvent: + m_PersistentCalls: + m_Calls: [] --- !u!1 &4685821586660635131 GameObject: m_ObjectHideFlags: 0 @@ -943,7 +946,7 @@ MonoBehaviour: _targeterConfig: {fileID: 11400000, guid: 9df40bc219ab8f04cb4e86558bc0df86, type: 2} _range: 0 _targetStrategy: 0 - _activeTargetable: {fileID: 11400000, guid: ab93dbcc7e973184b896173796edc5ac, type: 2} + _activeTargetable: {fileID: 0} _targeterParent: {fileID: 0} k__BackingField: {fileID: 0} --- !u!1 &8385032484663529878 @@ -1141,11 +1144,6 @@ MonoBehaviour: _buildTimer: 0 _structureBaseSet: {fileID: 11400000, guid: 1925957d2bc2f0c4a9210131f2d2c4e5, type: 2} _powerConfig: {fileID: 11400000, guid: 9dc2a0f5f29a11a4d9cabe19e18bdd42, type: 2} - _damage: 1 - _fireRate: 1 - _projectileSpeed: 5 - _kills: 0 - _damageDealt: 0 k__BackingField: - {fileID: 5825155873221046368} k__BackingField: {fileID: 310569669314672228} diff --git a/Assets/Entities/Structures/Turret/TurretStandardTargeterConfiguration.asset b/Assets/Entities/Structures/Turret/TurretStandardTargeterConfiguration.asset index d1bf002..9be294d 100644 --- a/Assets/Entities/Structures/Turret/TurretStandardTargeterConfiguration.asset +++ b/Assets/Entities/Structures/Turret/TurretStandardTargeterConfiguration.asset @@ -15,4 +15,4 @@ MonoBehaviour: _maxRange: 15 _minRange: 0.5 _selectedTargetStrategy: 0 - _activeEntities: {fileID: 11400000, guid: ab93dbcc7e973184b896173796edc5ac, type: 2} + _activeEntities: {fileID: 11400000, guid: 7eab5444b4ac7f28badf814659475b35, type: 2} diff --git a/Assets/Scenes/Playground 1.unity b/Assets/Scenes/Playground 1.unity index 50f6eeb..86d576e 100644 --- a/Assets/Scenes/Playground 1.unity +++ b/Assets/Scenes/Playground 1.unity @@ -204,6 +204,7 @@ MonoBehaviour: m_DeselectOnBackgroundClick: 1 m_PointerBehavior: 0 m_CursorLockBehavior: 0 + m_ScrollDeltaPerTick: 6 --- !u!114 &95533812 MonoBehaviour: m_ObjectHideFlags: 0 @@ -265,9 +266,9 @@ Transform: m_Children: - {fileID: 2079460687} - {fileID: 577983772} - - {fileID: 2037644595} - {fileID: 1715656626} - {fileID: 991542217} + - {fileID: 2037644595} - {fileID: 1495762292} - {fileID: 1421503444} - {fileID: 1494435109} @@ -1042,7 +1043,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -1971,7 +1972,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1134055636167264334, guid: 57a75520298c47140a928041b05d7f3c, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] From a43d9f354a47f5b96f4dd10c4088b509504bda7e Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 5 Oct 2024 17:10:03 +0200 Subject: [PATCH 12/16] using cleanup --- Assets/Entities/Scripts/EnemyBase.cs | 1 - Assets/Entities/Structures/Scripts/StructureBase.cs | 1 - 2 files changed, 2 deletions(-) diff --git a/Assets/Entities/Scripts/EnemyBase.cs b/Assets/Entities/Scripts/EnemyBase.cs index b132134..6d1ef7d 100644 --- a/Assets/Entities/Scripts/EnemyBase.cs +++ b/Assets/Entities/Scripts/EnemyBase.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using AsteroidGame.ScriptableObjects; using GameDev.CoreSystems; using UnityEngine; using UnityEngine.AI; diff --git a/Assets/Entities/Structures/Scripts/StructureBase.cs b/Assets/Entities/Structures/Scripts/StructureBase.cs index f54614f..6997663 100644 --- a/Assets/Entities/Structures/Scripts/StructureBase.cs +++ b/Assets/Entities/Structures/Scripts/StructureBase.cs @@ -1,4 +1,3 @@ -using AsteroidGame.ScriptableObjects; using GameDev.CoreSystems; using UnityEngine; From 2cfa1da8a7b0c228d504eaee98b399ef10536e18 Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 5 Oct 2024 17:18:29 +0200 Subject: [PATCH 13/16] Added debug functions --- Assets/CoreSystems | 2 +- Assets/Entities/Scripts/Targeter.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/CoreSystems b/Assets/CoreSystems index c81a750..813d034 160000 --- a/Assets/CoreSystems +++ b/Assets/CoreSystems @@ -1 +1 @@ -Subproject commit c81a750f2fd89f8ba79c098c353f100e0925637f +Subproject commit 813d034fc50bd7359586deea2ba305405a794bde diff --git a/Assets/Entities/Scripts/Targeter.cs b/Assets/Entities/Scripts/Targeter.cs index 66b8c0a..355ba47 100644 --- a/Assets/Entities/Scripts/Targeter.cs +++ b/Assets/Entities/Scripts/Targeter.cs @@ -9,8 +9,9 @@ namespace AsteroidGame.Entities [SerializeField] private SoTargeterConfig _targeterConfig; [SerializeField] private float _range; + + [Header("Config Debug")] [SerializeField] private SoTargeterConfig.TargetStrategy _targetStrategy; - [FormerlySerializedAs("_activeEntities")] [SerializeField] private SoTargetableRuntimeSet _activeTargetable; [SerializeField] private Targetable _targeterParent; [field: SerializeField] public Targetable TargetEntity { get; set; } From d762ad79857fbdfb9583f28a0f070db993fbeb1e Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 5 Oct 2024 17:19:35 +0200 Subject: [PATCH 14/16] Build settings --- ProjectSettings/EditorBuildSettings.asset | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 1c6d10b..76edd51 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -4,6 +4,9 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] + m_Scenes: + - enabled: 1 + path: Assets/Scenes/Playground 1.unity + guid: ed03459d41048d048963e74a69bba0e0 m_configObjects: com.unity.input.settings: {fileID: 11400000, guid: 2f27ffbbbd54d9c4b9435071982af520, type: 2} From 7ae77b4357d196039e59e5ef350b9f026fd2212e Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 5 Oct 2024 17:29:27 +0200 Subject: [PATCH 15/16] Reduced speed of enemies --- Assets/Entities/Enemies/Enemy.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Entities/Enemies/Enemy.prefab b/Assets/Entities/Enemies/Enemy.prefab index a8e72bc..36adeed 100644 --- a/Assets/Entities/Enemies/Enemy.prefab +++ b/Assets/Entities/Enemies/Enemy.prefab @@ -635,7 +635,7 @@ NavMeshAgent: m_Enabled: 1 m_AgentTypeID: 0 m_Radius: 0.5 - m_Speed: 3.5 + m_Speed: 1 m_Acceleration: 8 avoidancePriority: 50 m_AngularSpeed: 120 From f42899649cea20856355d1532df61dbafb3cf13f Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 5 Oct 2024 17:29:45 +0200 Subject: [PATCH 16/16] Added some some more turrets and enemies --- Assets/Scenes/Playground 1.unity | 541 +++++++++++++++++-------------- 1 file changed, 302 insertions(+), 239 deletions(-) diff --git a/Assets/Scenes/Playground 1.unity b/Assets/Scenes/Playground 1.unity index 86d576e..f7351ff 100644 --- a/Assets/Scenes/Playground 1.unity +++ b/Assets/Scenes/Playground 1.unity @@ -156,6 +156,80 @@ Transform: - {fileID: 624469242} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &53965603 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + 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 + 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: -6.06 + 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 (2) + 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 &53965604 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + m_PrefabInstance: {fileID: 53965603} + m_PrefabAsset: {fileID: 0} --- !u!1 &95533810 GameObject: m_ObjectHideFlags: 0 @@ -264,16 +338,157 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2079460687} - {fileID: 577983772} + - {fileID: 53965604} + - {fileID: 282469291} + - {fileID: 1878032910} - {fileID: 1715656626} + - {fileID: 1762630463} + - {fileID: 171128884} + - {fileID: 1542755757} - {fileID: 991542217} - - {fileID: 2037644595} - - {fileID: 1495762292} - - {fileID: 1421503444} - - {fileID: 1494435109} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &171128883 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 157782261} + m_Modifications: + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalPosition.x + value: -17.4 + objectReference: {fileID: 0} + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalPosition.z + value: 5.69 + objectReference: {fileID: 0} + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_Name + value: Enemy (2) + objectReference: {fileID: 0} + - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} +--- !u!4 &171128884 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + m_PrefabInstance: {fileID: 171128883} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &282469290 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + 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 + 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: -5.45 + 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 (3) + 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 &282469291 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} + m_PrefabInstance: {fileID: 282469290} + m_PrefabAsset: {fileID: 0} --- !u!1001 &577983771 PrefabInstance: m_ObjectHideFlags: 0 @@ -684,7 +899,7 @@ MonoBehaviour: m_IgnoreFromBuild: 0 m_ApplyToChildren: 1 m_AffectedAgents: ffffffff ---- !u!1001 &1421503443 +--- !u!1001 &1542755756 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -692,13 +907,9 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 157782261} m_Modifications: - - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} propertyPath: m_LocalPosition.x - value: 7.64 + value: -16.43 objectReference: {fileID: 0} - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} propertyPath: m_LocalPosition.y @@ -706,7 +917,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} propertyPath: m_LocalPosition.z - value: 7.63 + value: 11.38 objectReference: {fileID: 0} - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} propertyPath: m_LocalRotation.w @@ -738,165 +949,21 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} propertyPath: m_Name - value: Enemy (1) + value: Enemy (3) objectReference: {fileID: 0} - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} ---- !u!4 &1421503444 stripped +--- !u!4 &1542755757 stripped Transform: m_CorrespondingSourceObject: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - m_PrefabInstance: {fileID: 1421503443} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1494435108 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 157782261} - m_Modifications: - - target: {fileID: 191376514769192977, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 1411216412654489461, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - propertyPath: _health - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - propertyPath: m_LocalPosition.x - value: 0.3400004 - objectReference: {fileID: 0} - - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - propertyPath: m_LocalPosition.z - value: 9.68 - objectReference: {fileID: 0} - - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - propertyPath: m_Name - value: Enemy (2) - objectReference: {fileID: 0} - - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} ---- !u!4 &1494435109 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - m_PrefabInstance: {fileID: 1494435108} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1495762291 -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: -8.19 - 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: -3.67 - 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: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 57a75520298c47140a928041b05d7f3c, type: 3} ---- !u!4 &1495762292 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} - m_PrefabInstance: {fileID: 1495762291} + m_PrefabInstance: {fileID: 1542755756} m_PrefabAsset: {fileID: 0} --- !u!1 &1702078696 GameObject: @@ -993,10 +1060,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 157782261} m_Modifications: - - target: {fileID: 103375416814990516, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - propertyPath: m_Speed - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} propertyPath: m_LocalPosition.x value: -18.15 @@ -1055,6 +1118,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} m_PrefabInstance: {fileID: 1715656625} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1762630462 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 157782261} + m_Modifications: + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalPosition.x + value: -16.24 + objectReference: {fileID: 0} + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalPosition.z + value: 7.5 + objectReference: {fileID: 0} + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_Name + value: Enemy (1) + objectReference: {fileID: 0} + - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} +--- !u!4 &1762630463 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} + m_PrefabInstance: {fileID: 1762630462} + m_PrefabAsset: {fileID: 0} --- !u!1 &1779908010 GameObject: m_ObjectHideFlags: 0 @@ -1305,7 +1434,7 @@ MonoBehaviour: m_IgnoreFromBuild: 0 m_ApplyToChildren: 1 m_AffectedAgents: ffffffff ---- !u!1001 &2037644594 +--- !u!1001 &1878032909 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -1323,7 +1452,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_LocalPosition.x - value: -11.32 + value: 8.44 objectReference: {fileID: 0} - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_LocalPosition.y @@ -1331,7 +1460,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_LocalPosition.z - value: -2.18 + value: -9.48 objectReference: {fileID: 0} - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_LocalRotation.w @@ -1363,21 +1492,21 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_Name - value: Turret (2) + value: Turret (4) objectReference: {fileID: 0} - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} ---- !u!4 &2037644595 stripped +--- !u!4 &1878032910 stripped Transform: m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} - m_PrefabInstance: {fileID: 2037644594} + m_PrefabInstance: {fileID: 1878032909} m_PrefabAsset: {fileID: 0} --- !u!1 &2047541735 GameObject: @@ -1596,72 +1725,6 @@ MonoBehaviour: m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 ---- !u!4 &2079460687 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} - m_PrefabInstance: {fileID: 2134547390} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &2134547390 -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: -3.33 - 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.21 - 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 - objectReference: {fileID: 0} - - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} --- !u!1001 &664620741625697858 PrefabInstance: m_ObjectHideFlags: 0 @@ -1928,7 +1991,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} propertyPath: m_LocalPosition.x - value: 2.05 + value: 14.6 objectReference: {fileID: 0} - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} propertyPath: m_LocalPosition.y @@ -1936,7 +1999,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} propertyPath: m_LocalPosition.z - value: 2.96 + value: -11.24 objectReference: {fileID: 0} - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} propertyPath: m_LocalRotation.w