diff --git a/Assets/Scripts/Presentation/UI/SimulationUI.cs b/Assets/Scripts/Presentation/UI/SimulationUI.cs index b1e5ae50017fa9709cb1d6604f734f7d65503688..99e26eae1d5cca4e8d5632993f5bf36cb1bb34e4 100644 --- a/Assets/Scripts/Presentation/UI/SimulationUI.cs +++ b/Assets/Scripts/Presentation/UI/SimulationUI.cs @@ -35,7 +35,7 @@ public class SimulationUI : MonoBehaviour { private UIState _lastUiState; private PauseOverlay _pauseOverlay; private Barrack _selectedBarrack; - private TowerTypeData _selectedTowerType; + private ITowerData _selectedTowerType; private SimulationManager _simulationManager; private TowerPlacingUI _towerPlacing; @@ -203,7 +203,7 @@ public class SimulationUI : MonoBehaviour { } } - private void OnUnitPurchased(UnitTypeData unitType) { + private void OnUnitPurchased(IUnitData unitType) { var command = new PurchaseUnitCommand(GameOverview.GetTeam(_activePlayer), unitType); if (GameOverview.Commands.Issue(command)) _unitDeployment.UpdateBoughtUnitCount(unitType); } @@ -233,7 +233,7 @@ public class SimulationUI : MonoBehaviour { UpdateUiState(UIState.UnitDeployment); } - private void OnTowerTypeSelected(TowerTypeData towerType) { + private void OnTowerTypeSelected(ITowerData towerType) { _selectedTowerType = towerType; _towerPlacing.ShowTowerTypeStats(towerType); OnTowerSelected?.Invoke(null); diff --git a/Assets/Scripts/Presentation/UI/TowerPlacingUI.cs b/Assets/Scripts/Presentation/UI/TowerPlacingUI.cs index c4b7c051ca6770b7cf9b54ec976ba70410a930b7..23db44127046c53151585cdfd5e420da8eeac803 100644 --- a/Assets/Scripts/Presentation/UI/TowerPlacingUI.cs +++ b/Assets/Scripts/Presentation/UI/TowerPlacingUI.cs @@ -42,7 +42,7 @@ public class TowerPlacingUI : MonoBehaviour { private VisualTreeAsset cardComponent; [SerializeField] - private List<TowerTypeData> towersToPlace; + private List<TowerData> towersToPlace; private readonly List<VisualElement> _tabs = new List<VisualElement>(); @@ -136,7 +136,7 @@ public class TowerPlacingUI : MonoBehaviour { var cardList = RootElement.Q<VisualElement>(BottomPanel); cardList.Clear(); - foreach (TowerTypeData towerType in towersToPlace) { + foreach (ITowerData towerType in towersToPlace) { TemplateContainer card = cardComponent.Instantiate(); var content = card.Q<VisualElement>(CardContent); @@ -157,7 +157,7 @@ public class TowerPlacingUI : MonoBehaviour { /// <summary> /// Displays the stats of a tower type /// </summary> - public void ShowTowerTypeStats(TowerTypeData towerType) { + public void ShowTowerTypeStats(ITowerData towerType) { HideTabs(); VisualElement tab = RootElement.Q(TowerTypeStats); tab.style.display = DisplayStyle.Flex; @@ -165,7 +165,7 @@ public class TowerPlacingUI : MonoBehaviour { ShowTowerTypeStats(towerType, tab.Q<VisualElement>(TowerStats)); } - private void ShowTowerTypeStats(TowerTypeData towerType, VisualElement statsContainer) { + private void ShowTowerTypeStats(ITowerData towerType, VisualElement statsContainer) { statsContainer.Clear(); if (towerType != null) { string[] stats = new[] { @@ -224,11 +224,11 @@ public class TowerPlacingUI : MonoBehaviour { if (_showDeployedStats) { manageContainer.style.display = DisplayStyle.None; statsContainer.style.display = DisplayStyle.Flex; - ShowTowerTypeStats(tower.Type as TowerTypeData, statsContainer); + ShowTowerTypeStats(tower.Type as ITowerData, statsContainer); } else { manageContainer.style.display = DisplayStyle.Flex; statsContainer.style.display = DisplayStyle.None; - var afterUpgrade = tower.Type.AfterUpgradeType as TowerTypeData; + var afterUpgrade = tower.Type.AfterUpgradeType as ITowerData; VisualElement container = manageContainer.Q(UpgradeContainer); if (afterUpgrade != null) { @@ -262,6 +262,6 @@ public class TowerPlacingUI : MonoBehaviour { /// <summary> /// Invoked when a tower type is selected /// </summary> - public event Action<TowerTypeData> OnTowerTypeSelected; + public event Action<ITowerData> OnTowerTypeSelected; } } diff --git a/Assets/Scripts/Presentation/UI/UnitDeploymentUI.cs b/Assets/Scripts/Presentation/UI/UnitDeploymentUI.cs index 1e849669dee57cef0ab22cc5f4022eeb6b2495dd..0f94ce05ddcf5cd3ec531634dad44db7b37d9595 100644 --- a/Assets/Scripts/Presentation/UI/UnitDeploymentUI.cs +++ b/Assets/Scripts/Presentation/UI/UnitDeploymentUI.cs @@ -26,9 +26,9 @@ public class UnitDeploymentUI : MonoBehaviour { private UIDocument ui; [SerializeField] - private List<UnitTypeData> unitTypes; + private List<UnitData> unitTypes; - private readonly Dictionary<UnitTypeData, VisualElement> _unitCards = new Dictionary<UnitTypeData, VisualElement>(); + private readonly Dictionary<IUnitData, VisualElement> _unitCards = new Dictionary<IUnitData, VisualElement>(); private Color _activePlayer = Color.Red; private UnityEngine.Color _teamBlueColor = UnityEngine.Color.magenta; @@ -54,8 +54,8 @@ public class UnitDeploymentUI : MonoBehaviour { var cardList = RootElement.Q<VisualElement>(BottomPanel); cardList.Clear(); - foreach (UnitTypeData unitType in unitTypes) { - UnitTypeData unit = unitType; + foreach (IUnitData unitType in unitTypes) { + IUnitData unit = unitType; TemplateContainer card = cardComponent.Instantiate(); var content = card.Q<VisualElement>(CardContent); content.style.backgroundImage = new StyleBackground(unitType.PreviewSprite); @@ -78,7 +78,7 @@ public class UnitDeploymentUI : MonoBehaviour { /// <summary> /// Increments the bought unit count of a given type /// </summary> - public void UpdateBoughtUnitCount(UnitTypeData unit) { + public void UpdateBoughtUnitCount(IUnitData unit) { if (_unitCards.TryGetValue(unit, out VisualElement card)) UpdateCardUnitCount(card, 1); else @@ -139,14 +139,14 @@ public class UnitDeploymentUI : MonoBehaviour { VisualElement container = RootElement.Q(DeployedUnitsContainer); container.Clear(); - foreach (UnitTypeData type in unitTypes) + foreach (IUnitData type in unitTypes) container.Add(new Label { text = $"{type.Name}: {team.GetDeployedUnitTypeCount(type)}" }); } /// <summary> /// Invoked when a unit purchase card is clicked /// </summary> - public event Action<UnitTypeData> OnUnitPurchased; + public event Action<IUnitData> OnUnitPurchased; /// <summary> /// Invoked when the next button is clicked diff --git a/Assets/Scripts/Presentation/World/ITowerData.cs b/Assets/Scripts/Presentation/World/ITowerData.cs new file mode 100644 index 0000000000000000000000000000000000000000..4305b678c360abacac675412d2dd7cc660fc5332 --- /dev/null +++ b/Assets/Scripts/Presentation/World/ITowerData.cs @@ -0,0 +1,16 @@ +using Logic.Data.World; +using UnityEngine; + +namespace Presentation.World { +/// <summary> +/// Extends the <see cref="ITowerTypeData"/> interface with visualization-related properties. +/// </summary> +public interface ITowerData : ITowerTypeData { + public Sprite PreviewSprite { get; } + public Sprite SpriteColored { get; } + public Sprite SpriteConstant { get; } + public Sprite SpriteBackground { get; } + public Color BlueColor { get; } + public Color RedColor { get; } +} +} diff --git a/Assets/Scripts/Presentation/World/TowerTypeData.cs.meta b/Assets/Scripts/Presentation/World/ITowerData.cs.meta similarity index 100% rename from Assets/Scripts/Presentation/World/TowerTypeData.cs.meta rename to Assets/Scripts/Presentation/World/ITowerData.cs.meta diff --git a/Assets/Scripts/Presentation/World/IUnitData.cs b/Assets/Scripts/Presentation/World/IUnitData.cs new file mode 100644 index 0000000000000000000000000000000000000000..0aa6ae47859ed8711c8f85eab0742af2a9856d87 --- /dev/null +++ b/Assets/Scripts/Presentation/World/IUnitData.cs @@ -0,0 +1,16 @@ +using Logic.Data.World; +using UnityEngine; + +namespace Presentation.World { +/// <summary> +/// Extends the <see cref="IUnitTypeData"/> interface with visualization-related properties. +/// </summary> +public interface IUnitData : IUnitTypeData { + public Color BlueColor { get; } + public Color RedColor { get; } + public Sprite PreviewSprite { get; } + public Sprite AliveSpriteConstant { get; } + public Sprite AliveSpriteColored { get; } + public bool Airborne { get; } +} +} diff --git a/Assets/Scripts/Presentation/World/UnitTypeData.cs.meta b/Assets/Scripts/Presentation/World/IUnitData.cs.meta similarity index 100% rename from Assets/Scripts/Presentation/World/UnitTypeData.cs.meta rename to Assets/Scripts/Presentation/World/IUnitData.cs.meta diff --git a/Assets/Scripts/Presentation/World/MainMenuSimulationSupervisor.cs b/Assets/Scripts/Presentation/World/MainMenuSimulationSupervisor.cs index 9ba6b12744d243d72c4547700ba1b161264e4f1d..f331301e4e3007a311bf002270204dcc786a7eb8 100644 --- a/Assets/Scripts/Presentation/World/MainMenuSimulationSupervisor.cs +++ b/Assets/Scripts/Presentation/World/MainMenuSimulationSupervisor.cs @@ -2,7 +2,6 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; -using System.Reflection; using Logic.Command; using Logic.Command.Tower; using Logic.Command.Unit; @@ -12,6 +11,7 @@ using Logic.Event; using Presentation.UI; using UnityEngine; using UnityEngine.SceneManagement; +using Color = UnityEngine.Color; using Random = UnityEngine.Random; namespace Presentation.World { @@ -53,26 +53,19 @@ public class MainMenuSimulationSupervisor : MonoBehaviour { private float towerPlacingDelay = .125f; [SerializeField] - private List<TowerTypeData> towerTypes; + private List<TowerData> towerTypes; [SerializeField] - private List<UnitTypeData> unitTypes; + private List<UnitData> unitTypes; - private readonly List<UnitTypeData> _modifiedUnitTypes = new List<UnitTypeData>(); + private readonly List<IUnitData> _modifiedUnitTypes = new List<IUnitData>(); private IEnumerator _simulationCoroutine; private void Start() { _simulationCoroutine = null; + // we don't want to destroy castles - foreach (UnitTypeData unitType in unitTypes) { - UnitTypeData modifiedUnitType = Instantiate(unitType); - FieldInfo prop = modifiedUnitType.GetType().GetField("damage", - BindingFlags.NonPublic | BindingFlags.Instance); - - Debug.Assert(prop != null); - prop.SetValue(modifiedUnitType, 0.0f); - _modifiedUnitTypes.Add(modifiedUnitType); - } + _modifiedUnitTypes.AddRange(unitTypes.Select(unit => new NoDamageUnitDataProxy(unit))); SceneManager.sceneLoaded += OnSceneLoaded; SceneManager.LoadScene(SimulationScenePath, LoadSceneMode.Additive); @@ -192,5 +185,25 @@ public class MainMenuSimulationSupervisor : MonoBehaviour { _simulationCoroutine = StartSimulation(scene); StartCoroutine(_simulationCoroutine); } + + private class NoDamageUnitDataProxy : IUnitData { + private readonly IUnitData source; + + public NoDamageUnitDataProxy(IUnitData source) { + this.source = source; + } + + public float Damage => 0; //Only this property is changed + public string Name => source.Name; + public float Health => source.Health; + public float Speed => source.Speed; + public int Cost => source.Cost; + public Color BlueColor => source.BlueColor; + public Color RedColor => source.RedColor; + public Sprite PreviewSprite => source.PreviewSprite; + public Sprite AliveSpriteConstant => source.AliveSpriteConstant; + public Sprite AliveSpriteColored => source.AliveSpriteColored; + public bool Airborne => source.Airborne; + } } } diff --git a/Assets/Scripts/Presentation/World/Tower.cs b/Assets/Scripts/Presentation/World/Tower.cs index 6209d84a15d256bc8e761aab8baed9c33f0fa177..17d791a09d2aac9746a51dfd19e3b5ccfd633617 100644 --- a/Assets/Scripts/Presentation/World/Tower.cs +++ b/Assets/Scripts/Presentation/World/Tower.cs @@ -45,7 +45,7 @@ public class Tower : Structure { /// </summary> public void SetData(Logic.Data.World.Tower data) { _data = data; - var type = (TowerTypeData) data.Type; + var type = (ITowerData) data.Type; Color color = _data.OwnerColor == Logic.Data.Color.Blue ? type.BlueColor : type.RedColor; backgroundSprite.sprite = type.SpriteBackground; diff --git a/Assets/Scripts/Presentation/World/TowerTypeData.cs b/Assets/Scripts/Presentation/World/TowerData.cs similarity index 87% rename from Assets/Scripts/Presentation/World/TowerTypeData.cs rename to Assets/Scripts/Presentation/World/TowerData.cs index fea73bcf0096c5de0a1f6a06ebd559740a07d367..f38210806e05861bbb156f2583aa838c873f1755 100644 --- a/Assets/Scripts/Presentation/World/TowerTypeData.cs +++ b/Assets/Scripts/Presentation/World/TowerData.cs @@ -1,12 +1,12 @@ -using Logic.Data.World; +ďťżusing Logic.Data.World; using UnityEngine; namespace Presentation.World { /// <summary> -/// Enables the tower visualization settings to be configured in the Unity Editor +/// Enables the tower settings to be configured in the Unity Editor /// </summary> [CreateAssetMenu(fileName = "New Tower Type", menuName = "World/Structures/Tower Type", order = 1)] -public class TowerTypeData : ScriptableObject, ITowerTypeData { +public class TowerData : ScriptableObject, ITowerData { [Header("Presentation-specific values")] [SerializeField] private Sprite previewSprite; @@ -55,7 +55,7 @@ public class TowerTypeData : ScriptableObject, ITowerTypeData { private int upgradeCost; [SerializeField] - private TowerTypeData afterUpgradeType; + private TowerData afterUpgradeType; public Sprite PreviewSprite => previewSprite; public Sprite SpriteColored => spriteColored; diff --git a/Assets/Scripts/Presentation/World/TowerData.cs.meta b/Assets/Scripts/Presentation/World/TowerData.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..54ea2c879dedf337d142f54dae556ffc0616c209 --- /dev/null +++ b/Assets/Scripts/Presentation/World/TowerData.cs.meta @@ -0,0 +1,3 @@ +ďťżfileFormatVersion: 2 +guid: 951ce2d6e2af48e4999c3cc2f9ad6fab +timeCreated: 1651325101 \ No newline at end of file diff --git a/Assets/Scripts/Presentation/World/Unit.cs b/Assets/Scripts/Presentation/World/Unit.cs index 3e53e9a0bdb81333ccb2550673f29f0406d9d54e..57245fdfd5868e8183fa258b2312b02a84a02992 100644 --- a/Assets/Scripts/Presentation/World/Unit.cs +++ b/Assets/Scripts/Presentation/World/Unit.cs @@ -41,7 +41,7 @@ public class Unit : MonoBehaviour { /// </summary> public void SetData(Logic.Data.World.Unit data) { _data = data; - var unitData = (UnitTypeData) _data.Type; + var unitData = (IUnitData) _data.Type; if (unitData.Airborne) { constantSprite.sortingLayerName = "UnitAirborne"; coloredSprite.sortingLayerName = "UnitAirborne"; diff --git a/Assets/Scripts/Presentation/World/UnitTypeData.cs b/Assets/Scripts/Presentation/World/UnitData.cs similarity index 86% rename from Assets/Scripts/Presentation/World/UnitTypeData.cs rename to Assets/Scripts/Presentation/World/UnitData.cs index fa2dfcc62cc804779d26ab440ea99e1446ea3cd3..8bf1a456f1a04e19791425bfd4c61f3afa42f38a 100644 --- a/Assets/Scripts/Presentation/World/UnitTypeData.cs +++ b/Assets/Scripts/Presentation/World/UnitData.cs @@ -1,12 +1,11 @@ -using Logic.Data.World; -using UnityEngine; +ďťżusing UnityEngine; namespace Presentation.World { /// <summary> -/// Enables the unit visualization settings to be configured in the Unity Editor +/// Enables the unit settings to be configured in the Unity Editor /// </summary> [CreateAssetMenu(fileName = "New Unit Type", menuName = "World/Unit Type", order = 1)] -public class UnitTypeData : ScriptableObject, IUnitTypeData { +public class UnitData : ScriptableObject, IUnitData { [Header("Presentation-specific values")] [SerializeField] private Color blueColor; diff --git a/Assets/Scripts/Presentation/World/UnitData.cs.meta b/Assets/Scripts/Presentation/World/UnitData.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..5923d94425a743c14a6b0bcdc4f360cf77070214 --- /dev/null +++ b/Assets/Scripts/Presentation/World/UnitData.cs.meta @@ -0,0 +1,3 @@ +ďťżfileFormatVersion: 2 +guid: d13d174e95cf442aaef0e6a1c6beaa30 +timeCreated: 1651325338 \ No newline at end of file diff --git a/Assets/World/Structures/Towers/DmgTowerLvl1Type.asset b/Assets/World/Structures/Towers/DmgTowerLvl1Type.asset index 25ecb976bb71d70a6d42d4ed6a89274eb2b4ea19..c18468eb62eb9ca3f0a54c5a7832bca69af80be7 100644 --- a/Assets/World/Structures/Towers/DmgTowerLvl1Type.asset +++ b/Assets/World/Structures/Towers/DmgTowerLvl1Type.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a046f9e3c8344bada9e6404adcc932c1, type: 3} + m_Script: {fileID: 11500000, guid: 951ce2d6e2af48e4999c3cc2f9ad6fab, type: 3} m_Name: DmgTowerLvl1Type m_EditorClassIdentifier: previewSprite: {fileID: 21300000, guid: 7d101f63fc97f4d4d9e0c136b2ea179c, type: 3} diff --git a/Assets/World/Structures/Towers/DmgTowerLvl2Type.asset b/Assets/World/Structures/Towers/DmgTowerLvl2Type.asset index f19508742653d74fc42030a50a030b4e5a230893..08bc7f39aee1f4212bb049f4951653dff6460fc8 100644 --- a/Assets/World/Structures/Towers/DmgTowerLvl2Type.asset +++ b/Assets/World/Structures/Towers/DmgTowerLvl2Type.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a046f9e3c8344bada9e6404adcc932c1, type: 3} + m_Script: {fileID: 11500000, guid: 951ce2d6e2af48e4999c3cc2f9ad6fab, type: 3} m_Name: DmgTowerLvl2Type m_EditorClassIdentifier: previewSprite: {fileID: 21300000, guid: 7d101f63fc97f4d4d9e0c136b2ea179c, type: 3} diff --git a/Assets/World/Structures/Towers/DmgTowerLvl3Type.asset b/Assets/World/Structures/Towers/DmgTowerLvl3Type.asset index 9ef9a48400c8c89d5dbc944177cc895ef876b09a..df2b46dc12b8b3fb7d97cf67920ba346177ee102 100644 --- a/Assets/World/Structures/Towers/DmgTowerLvl3Type.asset +++ b/Assets/World/Structures/Towers/DmgTowerLvl3Type.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a046f9e3c8344bada9e6404adcc932c1, type: 3} + m_Script: {fileID: 11500000, guid: 951ce2d6e2af48e4999c3cc2f9ad6fab, type: 3} m_Name: DmgTowerLvl3Type m_EditorClassIdentifier: previewSprite: {fileID: 21300000, guid: 7d101f63fc97f4d4d9e0c136b2ea179c, type: 3} diff --git a/Assets/World/Structures/Towers/FrtTowerLvl1Type.asset b/Assets/World/Structures/Towers/FrtTowerLvl1Type.asset index f73e862f44c8d3b172cabd4b00cc8fd58c73cbcd..4672e95604d966e08a9bbdf73f1a0a899afab4ea 100644 --- a/Assets/World/Structures/Towers/FrtTowerLvl1Type.asset +++ b/Assets/World/Structures/Towers/FrtTowerLvl1Type.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a046f9e3c8344bada9e6404adcc932c1, type: 3} + m_Script: {fileID: 11500000, guid: 951ce2d6e2af48e4999c3cc2f9ad6fab, type: 3} m_Name: FrtTowerLvl1Type m_EditorClassIdentifier: previewSprite: {fileID: 21300000, guid: 02fd48bbc114d324f826747f41900514, type: 3} diff --git a/Assets/World/Structures/Towers/FrtTowerLvl2Type.asset b/Assets/World/Structures/Towers/FrtTowerLvl2Type.asset index 5d2b487c603286e6f963bec4ac1ee5ed90d870db..0974f02bffa317f859663692fd9f42d9cf3da4a6 100644 --- a/Assets/World/Structures/Towers/FrtTowerLvl2Type.asset +++ b/Assets/World/Structures/Towers/FrtTowerLvl2Type.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a046f9e3c8344bada9e6404adcc932c1, type: 3} + m_Script: {fileID: 11500000, guid: 951ce2d6e2af48e4999c3cc2f9ad6fab, type: 3} m_Name: FrtTowerLvl2Type m_EditorClassIdentifier: previewSprite: {fileID: 21300000, guid: 02fd48bbc114d324f826747f41900514, type: 3} diff --git a/Assets/World/Structures/Towers/FrtTowerLvl3Type.asset b/Assets/World/Structures/Towers/FrtTowerLvl3Type.asset index f40337faa80574ca43364eee7b1d1a5c86c6a820..05a8dafd87520fa0665593cab527052a0f11f7b2 100644 --- a/Assets/World/Structures/Towers/FrtTowerLvl3Type.asset +++ b/Assets/World/Structures/Towers/FrtTowerLvl3Type.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a046f9e3c8344bada9e6404adcc932c1, type: 3} + m_Script: {fileID: 11500000, guid: 951ce2d6e2af48e4999c3cc2f9ad6fab, type: 3} m_Name: FrtTowerLvl3Type m_EditorClassIdentifier: previewSprite: {fileID: 21300000, guid: 02fd48bbc114d324f826747f41900514, type: 3} diff --git a/Assets/World/Structures/Towers/RngTowerLvl1Type.asset b/Assets/World/Structures/Towers/RngTowerLvl1Type.asset index 3f3c54099d554aa2314d9f695913b399a04a2c82..289551201d4b64616a0aa90cc2d81bedbb89627b 100644 --- a/Assets/World/Structures/Towers/RngTowerLvl1Type.asset +++ b/Assets/World/Structures/Towers/RngTowerLvl1Type.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a046f9e3c8344bada9e6404adcc932c1, type: 3} + m_Script: {fileID: 11500000, guid: 951ce2d6e2af48e4999c3cc2f9ad6fab, type: 3} m_Name: RngTowerLvl1Type m_EditorClassIdentifier: previewSprite: {fileID: 21300000, guid: 7d69bc6151ffe184bb5822ba7a7dd059, type: 3} diff --git a/Assets/World/Structures/Towers/RngTowerLvl2Type.asset b/Assets/World/Structures/Towers/RngTowerLvl2Type.asset index cfa11ed53e072ba72eb1355250502386424387ec..8b181d46a119c8226f8878a479ed5c9ea7a6864e 100644 --- a/Assets/World/Structures/Towers/RngTowerLvl2Type.asset +++ b/Assets/World/Structures/Towers/RngTowerLvl2Type.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a046f9e3c8344bada9e6404adcc932c1, type: 3} + m_Script: {fileID: 11500000, guid: 951ce2d6e2af48e4999c3cc2f9ad6fab, type: 3} m_Name: RngTowerLvl2Type m_EditorClassIdentifier: previewSprite: {fileID: 21300000, guid: 7d69bc6151ffe184bb5822ba7a7dd059, type: 3} diff --git a/Assets/World/Structures/Towers/RngTowerLvl3Type.asset b/Assets/World/Structures/Towers/RngTowerLvl3Type.asset index 728a057fdb8ae3ba6e419943bba473aa883e71a0..31f725e1f1211d814dbb44ce82ce986af3efdf98 100644 --- a/Assets/World/Structures/Towers/RngTowerLvl3Type.asset +++ b/Assets/World/Structures/Towers/RngTowerLvl3Type.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a046f9e3c8344bada9e6404adcc932c1, type: 3} + m_Script: {fileID: 11500000, guid: 951ce2d6e2af48e4999c3cc2f9ad6fab, type: 3} m_Name: RngTowerLvl3Type m_EditorClassIdentifier: previewSprite: {fileID: 21300000, guid: 7d69bc6151ffe184bb5822ba7a7dd059, type: 3} diff --git a/Assets/World/Structures/Towers/WallTowerType.asset b/Assets/World/Structures/Towers/WallTowerType.asset index f9ceaa7f5999c84b625488298a73006f2ab41450..c4c608213a92eb816cb73a60de3129a1ed226fd4 100644 --- a/Assets/World/Structures/Towers/WallTowerType.asset +++ b/Assets/World/Structures/Towers/WallTowerType.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a046f9e3c8344bada9e6404adcc932c1, type: 3} + m_Script: {fileID: 11500000, guid: 951ce2d6e2af48e4999c3cc2f9ad6fab, type: 3} m_Name: WallTowerType m_EditorClassIdentifier: previewSprite: {fileID: 21300000, guid: 609ce9e4dc32560499c5a0bd5dac1c3f, type: 3} diff --git a/Assets/World/Units/FastUnitType.asset b/Assets/World/Units/FastUnitType.asset index 82368f7d04b06b9c37f7cbdbdf318a88dafdacdf..4210f89648403e9832ecb1b94214c188d1657764 100644 --- a/Assets/World/Units/FastUnitType.asset +++ b/Assets/World/Units/FastUnitType.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3bc0fee426f84030b94afd263d5e1c32, type: 3} + m_Script: {fileID: 11500000, guid: d13d174e95cf442aaef0e6a1c6beaa30, type: 3} m_Name: FastUnitType m_EditorClassIdentifier: blueColor: {r: 0, g: 0.3296814, b: 1, a: 1} diff --git a/Assets/World/Units/SlowUnitType.asset b/Assets/World/Units/SlowUnitType.asset index fdcf3e4da7a5dc83d7c5dce45f7ac2865dba261d..78f932a069c71f66127b97701e2b2dc710152d5c 100644 --- a/Assets/World/Units/SlowUnitType.asset +++ b/Assets/World/Units/SlowUnitType.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3bc0fee426f84030b94afd263d5e1c32, type: 3} + m_Script: {fileID: 11500000, guid: d13d174e95cf442aaef0e6a1c6beaa30, type: 3} m_Name: SlowUnitType m_EditorClassIdentifier: blueColor: {r: 0, g: 0.3296814, b: 1, a: 1}