diff --git a/Assets/CoreSystems b/Assets/CoreSystems index 813d034..bee2db1 160000 --- a/Assets/CoreSystems +++ b/Assets/CoreSystems @@ -1 +1 @@ -Subproject commit 813d034fc50bd7359586deea2ba305405a794bde +Subproject commit bee2db13544c6aec8ce38c1e67a3ea76fd196542 diff --git a/Assets/Entities/Enemies/Enemy.prefab b/Assets/Entities/Enemies/Enemy.prefab index 36adeed..21dd9f2 100644 --- a/Assets/Entities/Enemies/Enemy.prefab +++ b/Assets/Entities/Enemies/Enemy.prefab @@ -145,8 +145,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _activeDamageableRuntimeSet: {fileID: 11400000, guid: 8332d81762d09114eac45ca6f3b2c4af, type: 2} - k__BackingField: 10 - k__BackingField: 10 + k__BackingField: 30 + k__BackingField: 30 k__BackingField: 0 DeathEvent: m_PersistentCalls: diff --git a/Assets/Entities/Scripts/PowerBase.cs b/Assets/Entities/Scripts/PowerBase.cs index 30f6214..1f870c1 100644 --- a/Assets/Entities/Scripts/PowerBase.cs +++ b/Assets/Entities/Scripts/PowerBase.cs @@ -10,6 +10,7 @@ namespace AsteroidGame.Entities [SerializeField] protected bool _isConsumer = true; [SerializeField] protected int _maxPower; [SerializeField] protected int _currentPower; + [field: SerializeField] public bool PowerLost { get; set; } [SerializeField] private SoPowerSystemRuntimeSet _powerBaseSet; @@ -29,7 +30,8 @@ namespace AsteroidGame.Entities #region Setters - public void SetMaxPower(int newValue) => _maxPower = newValue; + public void SetMaxPower(int newMaxPowerValue) => _maxPower = newMaxPowerValue; + public void SetCurrentPower(int newCurrentPowerValue) => _currentPower = newCurrentPowerValue; #endregion diff --git a/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab b/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab index bacfebf..01f1a4b 100644 --- a/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab +++ b/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab @@ -286,8 +286,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _activeDamageableRuntimeSet: {fileID: 11400000, guid: 8332d81762d09114eac45ca6f3b2c4af, type: 2} - k__BackingField: 10 - k__BackingField: 10 + k__BackingField: 20 + k__BackingField: 20 k__BackingField: 0 DeathEvent: m_PersistentCalls: diff --git a/Assets/Entities/Structures/Scripts/StructureBase.cs b/Assets/Entities/Structures/Scripts/StructureBase.cs index 6997663..5596d5d 100644 --- a/Assets/Entities/Structures/Scripts/StructureBase.cs +++ b/Assets/Entities/Structures/Scripts/StructureBase.cs @@ -15,11 +15,11 @@ namespace AsteroidGame.Entities [Header("Power")] [SerializeField] private SoPowerConfig _powerConfig; - [SerializeField] private IPowerSystem _power; + [SerializeField] protected IPowerSystem powerSystem; #region Publics - public IPowerSystem Power => _power; + public IPowerSystem PowerSystem => powerSystem; public bool BuildPlacementBlocked => _buildPlacementBlocked; #endregion @@ -32,8 +32,8 @@ namespace AsteroidGame.Entities private void InitializePower() { - _power ??= gameObject.AddComponent(); - _power.Initialize(_powerConfig); + powerSystem ??= gameObject.AddComponent(); + powerSystem.Initialize(_powerConfig); } protected void OnDisable() diff --git a/Assets/Entities/Structures/Turret/Turret.cs b/Assets/Entities/Structures/Turret/Turret.cs index 6d36619..540dd53 100644 --- a/Assets/Entities/Structures/Turret/Turret.cs +++ b/Assets/Entities/Structures/Turret/Turret.cs @@ -34,20 +34,39 @@ namespace AsteroidGame.Entities private void Update() { - if (Targeter.FoundTarget()) + if (!powerSystem.PowerLost) { - foreach (var weapon in Weapons) + if (Targeter.FoundTarget()) { - weapon.PivotPoint.transform.LookAt(Targeter.GetTarget().GetCenterPosition()); - weapon.FireWeapon = true; + FireWeapons(); + } + else + { + TurnOffWeapons(); } } else { - foreach (var weapon in Weapons) - { - weapon.FireWeapon = false; - } + TurnOffWeapons(); + } + } + + private void FireWeapons() + { + powerSystem.SetCurrentPower(powerSystem.GetMaxPower()); + foreach (var weapon in Weapons) + { + weapon.PivotPoint.transform.LookAt(Targeter.GetTarget().GetCenterPosition()); + weapon.FireWeapon = true; + } + } + + private void TurnOffWeapons() + { + //powerSystem.SetCurrentPower(0); + foreach (var weapon in Weapons) + { + weapon.FireWeapon = false; } } } diff --git a/Assets/Entities/Structures/Turret/Turret.prefab b/Assets/Entities/Structures/Turret/Turret.prefab index d825633..3431351 100644 --- a/Assets/Entities/Structures/Turret/Turret.prefab +++ b/Assets/Entities/Structures/Turret/Turret.prefab @@ -348,8 +348,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _activeDamageableRuntimeSet: {fileID: 11400000, guid: 8332d81762d09114eac45ca6f3b2c4af, type: 2} - k__BackingField: 50 - k__BackingField: 50 + k__BackingField: 70 + k__BackingField: 70 k__BackingField: 0 DeathEvent: m_PersistentCalls: @@ -1144,6 +1144,11 @@ 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/Handlers/PowerHandler.cs b/Assets/Handlers/PowerHandler.cs index a65afe3..2f13b5a 100644 --- a/Assets/Handlers/PowerHandler.cs +++ b/Assets/Handlers/PowerHandler.cs @@ -1,4 +1,3 @@ -using System; using GameDev.CoreSystems; using ScriptableObjectArchitecture; using UnityEngine; @@ -8,52 +7,51 @@ namespace AsteroidGame.Handlers public class PowerHandler : HandlerBase { [Header("State")] - [SerializeField] private int _powerConsumption; + [SerializeField] private IntReference _powerConsumption; [SerializeField] private int _powerConsumptionPeak; - [SerializeField] private int _powerCapacity; + [SerializeField] private IntReference _powerCapacity; [SerializeField] private float _powerFactor; + [SerializeField] private bool _powerLost; [Header("Connections")] [SerializeField] private SoPowerSystemRuntimeSet _activePowerStructures; - - + private void Update() { - _powerConsumption = 0; + _powerConsumption.Value = 0; _powerConsumptionPeak = 0; - _powerCapacity = 0; + _powerCapacity.Value = 0; foreach (var structure in _activePowerStructures) { if (structure.IsConsumer) { - _powerConsumption += structure.GetCurrentPower(); + _powerConsumption.Value += structure.GetCurrentPower(); _powerConsumptionPeak += structure.GetMaxPower(); } if (structure.IsGenerator) { - _powerCapacity += structure.GetMaxPower(); + _powerCapacity.Value += structure.GetMaxPower(); } } - if (_powerCapacity > 0) + _powerLost = _powerConsumption.Value > _powerCapacity.Value; + + foreach (IPowerSystem structure in _activePowerStructures) { - _powerFactor = (float)_powerConsumption / _powerCapacity; + if (structure.IsConsumer) + { + structure.PowerLost = _powerLost; + } } - else - { - _powerFactor = 0; - } - } - - public int GetMaxPower() - { - throw new NotImplementedException(); + + _powerFactor = _powerCapacity.Value > 0 ? (float)_powerConsumption.Value / _powerCapacity.Value : 0; } - public int GetCurrentPower() => _powerConsumption; + public int GetMaxPower() => _powerCapacity.Value; + + public int GetCurrentPower() => _powerConsumption.Value; public float GetPowerFactor() => _powerFactor; - } } \ No newline at end of file diff --git a/Assets/Handlers/PowerHandler.prefab b/Assets/Handlers/PowerHandler.prefab index cb7a2c0..f22b3d4 100644 --- a/Assets/Handlers/PowerHandler.prefab +++ b/Assets/Handlers/PowerHandler.prefab @@ -24,13 +24,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5263199550015624125} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5263199550015624127 MonoBehaviour: @@ -44,8 +44,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf720c524a2a9624099d0e4ba3d78108, type: 3} m_Name: m_EditorClassIdentifier: - _powerConsumption: 0 + _powerConsumption: + _useConstant: 0 + _constantValue: 0 + _variable: {fileID: 11400000, guid: b8e022bf187e132938350c1e22723ccd, type: 2} _powerConsumptionPeak: 0 - _powerCapacity: 0 + _powerCapacity: + _useConstant: 0 + _constantValue: 0 + _variable: {fileID: 11400000, guid: cf5a6a504f4a91bafa9d92b6c39c8527, type: 2} _powerFactor: 0 + _powerLost: 0 _activePowerStructures: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2} diff --git a/Assets/Scenes/Playground 1.unity b/Assets/Scenes/Playground 1.unity index f7351ff..d19ad13 100644 --- a/Assets/Scenes/Playground 1.unity +++ b/Assets/Scenes/Playground 1.unity @@ -230,6 +230,125 @@ Transform: m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} m_PrefabInstance: {fileID: 53965603} m_PrefabAsset: {fileID: 0} +--- !u!1001 &63909072 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 157782261} + m_Modifications: + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.x + value: -12.568716 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.z + value: 21.990889 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9160146395234108762, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_Name + value: EnemySpawner (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} +--- !u!1001 &83227189 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 157782261} + m_Modifications: + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.x + value: 6.9230213 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.y + value: 0.49999905 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.z + value: 17.109875 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9160146395234108762, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_Name + value: EnemySpawner (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} +--- !u!4 &84054709 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + m_PrefabInstance: {fileID: 83227189} + m_PrefabAsset: {fileID: 0} --- !u!1 &95533810 GameObject: m_ObjectHideFlags: 0 @@ -338,6 +457,11 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 84054709} + - {fileID: 1467125943} + - {fileID: 891379735} + - {fileID: 862425367} + - {fileID: 907194497} - {fileID: 577983772} - {fileID: 53965604} - {fileID: 282469291} @@ -489,6 +613,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} m_PrefabInstance: {fileID: 282469290} m_PrefabAsset: {fileID: 0} +--- !u!1001 &575798960 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 157782261} + m_Modifications: + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.x + value: 0.36357498 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.y + value: 0.49999905 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.z + value: 19.697609 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9160146395234108762, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_Name + value: EnemySpawner (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} --- !u!1001 &577983771 PrefabInstance: m_ObjectHideFlags: 0 @@ -568,6 +749,53 @@ Transform: m_CorrespondingSourceObject: {fileID: 5263199550015624126, guid: 2e352ad6389b4234083764d15d4e6a5f, type: 3} m_PrefabInstance: {fileID: 5263199549561108292} m_PrefabAsset: {fileID: 0} +--- !u!1 &666945018 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 666945019} + m_Layer: 0 + m_Name: Test UI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &666945019 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 666945018} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1216778791} + m_Father: {fileID: 2074073364} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &862425367 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + m_PrefabInstance: {fileID: 1796526852} + m_PrefabAsset: {fileID: 0} +--- !u!4 &891379735 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + m_PrefabInstance: {fileID: 63909072} + m_PrefabAsset: {fileID: 0} +--- !u!4 &907194497 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + m_PrefabInstance: {fileID: 8526909111847972851} + m_PrefabAsset: {fileID: 0} --- !u!4 &991542217 stripped Transform: m_CorrespondingSourceObject: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3} @@ -578,6 +806,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5200388201450229074, guid: 07826307af1971948b98dd42d1e9457a, type: 3} m_PrefabInstance: {fileID: 5200388200885062254} m_PrefabAsset: {fileID: 0} +--- !u!4 &1075734560 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3627079578080913706, guid: 1170a91b91039d6429d389468bd72c6f, type: 3} + m_PrefabInstance: {fileID: 3627079579018641133} + m_PrefabAsset: {fileID: 0} --- !u!1 &1089364665 GameObject: m_ObjectHideFlags: 0 @@ -773,6 +1006,109 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c2b4fe01faa847f4b976b5539477e1ec, type: 3} +--- !u!1 &1216778790 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1216778791} + - component: {fileID: 1216778794} + - component: {fileID: 1216778793} + - component: {fileID: 1216778792} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1216778791 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1216778790} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3324457944880652837} + - {fileID: 1789262565} + m_Father: {fileID: 666945019} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &1216778792 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1216778790} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1216778793 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1216778790} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1216778794 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1216778790} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &1402420031 GameObject: m_ObjectHideFlags: 0 @@ -899,6 +1235,11 @@ MonoBehaviour: m_IgnoreFromBuild: 0 m_ApplyToChildren: 1 m_AffectedAgents: ffffffff +--- !u!4 &1467125943 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + m_PrefabInstance: {fileID: 575798960} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1542755756 PrefabInstance: m_ObjectHideFlags: 0 @@ -996,6 +1337,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2047541737} - {fileID: 1402420032} - {fileID: 1089364666} - {fileID: 1813727660} @@ -1309,6 +1651,177 @@ MonoBehaviour: m_IgnoreFromBuild: 0 m_ApplyToChildren: 1 m_AffectedAgents: ffffffff +--- !u!1001 &1789262564 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1216778791} + m_Modifications: + - target: {fileID: 114295087115378658, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: _prefix + value: 'Power Generation: ' + objectReference: {fileID: 0} + - target: {fileID: 114295087115378658, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: _value._variable + value: + objectReference: {fileID: 11400000, guid: cf5a6a504f4a91bafa9d92b6c39c8527, type: 2} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_AnchoredPosition.x + value: 363 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_AnchoredPosition.y + value: 57 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1325881507061956646, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_Name + value: UI variable + objectReference: {fileID: 0} + - target: {fileID: 4081669352910938694, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_text + value: 'Power Generation: 99999' + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} +--- !u!224 &1789262565 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + m_PrefabInstance: {fileID: 1789262564} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1796526852 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 157782261} + m_Modifications: + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.x + value: -7.941847 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.y + value: 0.50000095 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.z + value: 18.370495 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9160146395234108762, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_Name + value: EnemySpawner + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} --- !u!1 &1813727659 GameObject: m_ObjectHideFlags: 0 @@ -1601,7 +2114,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1702078697} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &2047541738 MonoBehaviour: @@ -1725,6 +2238,39 @@ MonoBehaviour: m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 +--- !u!1 &2074073363 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2074073364} + m_Layer: 0 + m_Name: UI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2074073364 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2074073363} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1075734560} + - {fileID: 666945019} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &664620741625697858 PrefabInstance: m_ObjectHideFlags: 0 @@ -1798,13 +2344,119 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3a89f87af6ee84a459d98a4c296dd1be, type: 3} +--- !u!1001 &3324457944880652836 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1216778791} + m_Modifications: + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_AnchoredPosition.x + value: 361 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_AnchoredPosition.y + value: 107 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1325881507061956646, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_Name + value: UI variable + objectReference: {fileID: 0} + - target: {fileID: 4081669352910938694, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + propertyPath: m_text + value: 'Power Consumption: 99999' + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} +--- !u!224 &3324457944880652837 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 787341944119392040, guid: 2a64b22a5f2cd34d4a6ccec9164b0043, type: 3} + m_PrefabInstance: {fileID: 3324457944880652836} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3627079579018641133 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 2074073364} m_Modifications: - target: {fileID: 3627079578080913704, guid: 1170a91b91039d6429d389468bd72c6f, type: 3} propertyPath: m_Name @@ -1832,15 +2484,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3627079578080913706, guid: 1170a91b91039d6429d389468bd72c6f, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3627079578080913706, guid: 1170a91b91039d6429d389468bd72c6f, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3627079578080913706, guid: 1170a91b91039d6429d389468bd72c6f, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3627079578080913706, guid: 1170a91b91039d6429d389468bd72c6f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2042,14 +2694,70 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 57a75520298c47140a928041b05d7f3c, type: 3} +--- !u!1001 &8526909111847972851 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 157782261} + m_Modifications: + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8204127268198470007, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9160146395234108762, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} + propertyPath: m_Name + value: EnemySpawner + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 184c749bb378419bfbe29fdbb6ae0743, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 2047541737} + - {fileID: 2074073364} - {fileID: 38176946} - {fileID: 1191794244} - - {fileID: 3627079579018641133} - {fileID: 95533813} - {fileID: 157782261} - {fileID: 1702078697} diff --git a/Assets/UI/Prefabs.meta b/Assets/UI/Prefabs.meta new file mode 100644 index 0000000..5538c1a --- /dev/null +++ b/Assets/UI/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2ed696126fac13114936fe1f95b5a329 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI/Prefabs/UI variable.prefab b/Assets/UI/Prefabs/UI variable.prefab new file mode 100644 index 0000000..23b7f2e --- /dev/null +++ b/Assets/UI/Prefabs/UI variable.prefab @@ -0,0 +1,191 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1325881507061956646 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 787341944119392040} + - component: {fileID: 114295087115378658} + m_Layer: 5 + m_Name: UI variable + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &787341944119392040 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325881507061956646} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4812678927392668872} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &114295087115378658 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325881507061956646} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2bc1e7048c0f6d7fd93dfb07b674c9b6, type: 3} + m_Name: + m_EditorClassIdentifier: + _textMeshPro: {fileID: 4081669352910938694} + _prefix: 'Power Consumption: ' + _value: + _useConstant: 0 + _constantValue: 0 + _variable: {fileID: 11400000, guid: b8e022bf187e132938350c1e22723ccd, type: 2} +--- !u!1 &5764982973826580839 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4812678927392668872} + - component: {fileID: 526719405329134069} + - component: {fileID: 4081669352910938694} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4812678927392668872 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5764982973826580839} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 787341944119392040} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 600, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &526719405329134069 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5764982973826580839} + m_CullTransparentMesh: 1 +--- !u!114 &4081669352910938694 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5764982973826580839} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/UI/Prefabs/UI variable.prefab.meta b/Assets/UI/Prefabs/UI variable.prefab.meta new file mode 100644 index 0000000..c188f76 --- /dev/null +++ b/Assets/UI/Prefabs/UI variable.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2a64b22a5f2cd34d4a6ccec9164b0043 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI/UserInterface.prefab b/Assets/UI/Prefabs/UserInterface.prefab similarity index 100% rename from Assets/UI/UserInterface.prefab rename to Assets/UI/Prefabs/UserInterface.prefab diff --git a/Assets/UI/UserInterface.prefab.meta b/Assets/UI/Prefabs/UserInterface.prefab.meta similarity index 100% rename from Assets/UI/UserInterface.prefab.meta rename to Assets/UI/Prefabs/UserInterface.prefab.meta diff --git a/Assets/UI/Scripts.meta b/Assets/UI/Scripts.meta new file mode 100644 index 0000000..1fe6ebf --- /dev/null +++ b/Assets/UI/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 54c280a51c9d33cd092b6c35517dd06d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI/BuildMenuUiController.cs b/Assets/UI/Scripts/BuildMenuUiController.cs similarity index 100% rename from Assets/UI/BuildMenuUiController.cs rename to Assets/UI/Scripts/BuildMenuUiController.cs diff --git a/Assets/UI/BuildMenuUiController.cs.meta b/Assets/UI/Scripts/BuildMenuUiController.cs.meta similarity index 100% rename from Assets/UI/BuildMenuUiController.cs.meta rename to Assets/UI/Scripts/BuildMenuUiController.cs.meta diff --git a/Assets/UI/BuildingButton.cs b/Assets/UI/Scripts/BuildingButton.cs similarity index 100% rename from Assets/UI/BuildingButton.cs rename to Assets/UI/Scripts/BuildingButton.cs diff --git a/Assets/UI/BuildingButton.cs.meta b/Assets/UI/Scripts/BuildingButton.cs.meta similarity index 100% rename from Assets/UI/BuildingButton.cs.meta rename to Assets/UI/Scripts/BuildingButton.cs.meta diff --git a/Assets/UI/Scripts/SimpleUiVariable.cs b/Assets/UI/Scripts/SimpleUiVariable.cs new file mode 100644 index 0000000..8f7e0af --- /dev/null +++ b/Assets/UI/Scripts/SimpleUiVariable.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using ScriptableObjectArchitecture; +using TMPro; +using UnityEngine; + +namespace AsteroidGame +{ + public class SimpleUiVariable : MonoBehaviour + { + [SerializeField] private TMP_Text _textMeshPro; + + [SerializeField] private string _prefix; + [SerializeField] private IntReference _value; + + private void Update() + { + _textMeshPro.text = _prefix + _value.Value; + } + } +} \ No newline at end of file diff --git a/Assets/UI/Scripts/SimpleUiVariable.cs.meta b/Assets/UI/Scripts/SimpleUiVariable.cs.meta new file mode 100644 index 0000000..4e825df --- /dev/null +++ b/Assets/UI/Scripts/SimpleUiVariable.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2bc1e7048c0f6d7fd93dfb07b674c9b6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Variables.meta b/Assets/Variables.meta new file mode 100644 index 0000000..3eb50be --- /dev/null +++ b/Assets/Variables.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 92703eb41abf85545a776b853e35c03f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Variables/Handlers.meta b/Assets/Variables/Handlers.meta new file mode 100644 index 0000000..f290863 --- /dev/null +++ b/Assets/Variables/Handlers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 488dfbaf0e28a83e49e40de5ee5d1237 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Variables/Handlers/PowerHandler.meta b/Assets/Variables/Handlers/PowerHandler.meta new file mode 100644 index 0000000..42b5fd4 --- /dev/null +++ b/Assets/Variables/Handlers/PowerHandler.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fd2536104e4aa96ba9f6ad9ee5bd5af3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Variables/Handlers/PowerHandler/PowerHandler.PowerConsumption.asset b/Assets/Variables/Handlers/PowerHandler/PowerHandler.PowerConsumption.asset new file mode 100644 index 0000000..6ab3b90 --- /dev/null +++ b/Assets/Variables/Handlers/PowerHandler/PowerHandler.PowerConsumption.asset @@ -0,0 +1,23 @@ +%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: a56a9b97a78f01f4b97f217c74f00246, type: 3} + m_Name: PowerHandler.PowerConsumption + m_EditorClassIdentifier: + _value: 0 + _readOnly: 0 + _raiseWarning: 1 + _isClamped: 0 + _minClampedValue: 0 + _maxClampedValue: 0 + _event: + m_PersistentCalls: + m_Calls: [] diff --git a/Assets/Variables/Handlers/PowerHandler/PowerHandler.PowerConsumption.asset.meta b/Assets/Variables/Handlers/PowerHandler/PowerHandler.PowerConsumption.asset.meta new file mode 100644 index 0000000..8bfb957 --- /dev/null +++ b/Assets/Variables/Handlers/PowerHandler/PowerHandler.PowerConsumption.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b8e022bf187e132938350c1e22723ccd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Variables/Handlers/PowerHandler/PowerHandler.PowerGeneration.asset b/Assets/Variables/Handlers/PowerHandler/PowerHandler.PowerGeneration.asset new file mode 100644 index 0000000..d269058 --- /dev/null +++ b/Assets/Variables/Handlers/PowerHandler/PowerHandler.PowerGeneration.asset @@ -0,0 +1,23 @@ +%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: a56a9b97a78f01f4b97f217c74f00246, type: 3} + m_Name: PowerHandler.PowerGeneration + m_EditorClassIdentifier: + _value: 0 + _readOnly: 0 + _raiseWarning: 1 + _isClamped: 0 + _minClampedValue: 0 + _maxClampedValue: 0 + _event: + m_PersistentCalls: + m_Calls: [] diff --git a/Assets/Variables/Handlers/PowerHandler/PowerHandler.PowerGeneration.asset.meta b/Assets/Variables/Handlers/PowerHandler/PowerHandler.PowerGeneration.asset.meta new file mode 100644 index 0000000..d2e48ce --- /dev/null +++ b/Assets/Variables/Handlers/PowerHandler/PowerHandler.PowerGeneration.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cf5a6a504f4a91bafa9d92b6c39c8527 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: