From fabec89267e484c40c7ff954e689a3e4adc27b67 Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 5 Oct 2024 17:09:24 +0200 Subject: [PATCH] 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: []