diff --git a/Assets/Design/UnitUpgrades/Buildings/Upgrade_Castle.asset b/Assets/Design/UnitUpgrades/Buildings/Upgrade_Castle.asset new file mode 100644 index 0000000..aa16817 --- /dev/null +++ b/Assets/Design/UnitUpgrades/Buildings/Upgrade_Castle.asset @@ -0,0 +1,17 @@ +%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: d1391306ffe53984bb2bc314f1d2919f, type: 3} + m_Name: Upgrade_Castle + m_EditorClassIdentifier: + _upgradeUnitCard: {fileID: 11400000, guid: 4728bef0a18b70945bedf5b1190c491e, type: 2} + _upgradePrefab: {fileID: 1436362432952518814, guid: 8d56b160dedb7f84d830d749372fe8e8, type: 3} + _upgradeCardArt: {fileID: 21300000, guid: bc54d5d5ac69f334daf7b36882bd5199, type: 3} diff --git a/Assets/Design/UnitUpgrades/Buildings/Upgrade_Castle.asset.meta b/Assets/Design/UnitUpgrades/Buildings/Upgrade_Castle.asset.meta new file mode 100644 index 0000000..2cf5200 --- /dev/null +++ b/Assets/Design/UnitUpgrades/Buildings/Upgrade_Castle.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 20ad512fe083b804d85da6dafa69ecaf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Buildings/Castle.prefab b/Assets/Prefabs/Buildings/Castle.prefab index 060bac2..0e647f5 100644 --- a/Assets/Prefabs/Buildings/Castle.prefab +++ b/Assets/Prefabs/Buildings/Castle.prefab @@ -9,11 +9,12 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8393796362083852573} - - component: {fileID: 5337801381275763447} - component: {fileID: 6803870855974115111} - component: {fileID: -2623136057881025473} - component: {fileID: 3412246377317269183} - component: {fileID: -2943795733505287777} + - component: {fileID: 498655111277194201} + - component: {fileID: 7118484083738872079} m_Layer: 0 m_Name: Castle m_TagString: Ally @@ -39,23 +40,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5337801381275763447 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1436362432952518814} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 27e69fa6018bf654196267d829031f1a, type: 3} - m_Name: - m_EditorClassIdentifier: - _lifeBar: {fileID: 981581452810264329} - _hp: 100 - _speed: 0 - _attack_damage: 1 - _attack_interval: 2 --- !u!61 &6803870855974115111 BoxCollider2D: m_ObjectHideFlags: 0 @@ -212,6 +196,36 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!114 &498655111277194201 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1436362432952518814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 295347fae18ea1442ae2cff64e3ea6d4, type: 3} + m_Name: + m_EditorClassIdentifier: + _lifeBar: {fileID: 981581452810264329} + _hp: 20 + _speed: 0 + _attack_damage: 2 + _attack_interval: 2 + _enemy: {fileID: 0} +--- !u!114 &7118484083738872079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1436362432952518814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52b5039c6ed892a42b71ae16566ae511, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1517238551605579599 GameObject: m_ObjectHideFlags: 0 @@ -257,7 +271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 531d7966d86bd0c4d83baf58bcb56cd5, type: 3} m_Name: m_EditorClassIdentifier: - _entityLinked: {fileID: 5337801381275763447} + _entityLinked: {fileID: 0} --- !u!61 &3389094527817988571 BoxCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Buildings/House.prefab b/Assets/Prefabs/Buildings/House.prefab index c7ae240..ee0760a 100644 --- a/Assets/Prefabs/Buildings/House.prefab +++ b/Assets/Prefabs/Buildings/House.prefab @@ -137,6 +137,7 @@ MonoBehaviour: _upgradeUI: {fileID: 4817988606444742093, guid: 1d481c7093a8d2443a04261fd7c72be2, type: 3} _upgradeList: - {fileID: 11400000, guid: bb9859dfbbeec1d4583f967ab91c2248, type: 2} + - {fileID: 11400000, guid: 20ad512fe083b804d85da6dafa69ecaf, type: 2} --- !u!61 &1993481641639217671 BoxCollider2D: m_ObjectHideFlags: 0 @@ -201,6 +202,7 @@ MonoBehaviour: _speed: 0 _attack_damage: 0 _attack_interval: 0 + _enemy: {fileID: 0} --- !u!114 &6252103591577139412 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Ally/Castle.cs b/Assets/Scripts/Ally/Castle.cs new file mode 100644 index 0000000..d4effb2 --- /dev/null +++ b/Assets/Scripts/Ally/Castle.cs @@ -0,0 +1,50 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Castle : Building +{ + public float PopulationGiven => GlobalConfig.Instance.Current.populationGivenPerHouse; + + public override void Start() + { + base.Start(); + } + + public override void Update() + { + base.Update(); + if (IsEnemyDetected) + { + AttackEnemy(); + } + + } + + public override void LevelStart() + { + ResourceManager.Instance.MaximumPopulation += PopulationGiven * 2; + base.LevelStart(); + } + public override void LevelDestroy() + { + ResourceManager.Instance.MaximumPopulation -= PopulationGiven * 2; + base.LevelDestroy(); + } + + void AttackEnemy() + { + //Attack Cooldown + if (AttackInterval < AttackSpeedWait) + { + + Animation.PlayAttackAnim(); + + AttackSpeedWait = 0f; + + } + + AttackSpeedWait += Time.deltaTime; + + } +} diff --git a/Assets/Scripts/Ally/Castle.cs.meta b/Assets/Scripts/Ally/Castle.cs.meta new file mode 100644 index 0000000..e0fa876 --- /dev/null +++ b/Assets/Scripts/Ally/Castle.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 295347fae18ea1442ae2cff64e3ea6d4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: