Merge branch 'develop'

Assets/Game/Scripts/Gameplay/ArenaTower.cs

@@ -9,8 +9,10 @@ public class ArenaTower : Tower
         [SerializeField]
         private Renderer m_Renderer;
 
-        void Awake()
+        protected override void Awake()
         {
+            base.Awake();
+
             m_Renderer.material.color = m_Owner.Definition.Color;
         }
     }

Assets/Game/Scripts/Gameplay/KingTower.cs

@@ -25,8 +25,10 @@ public class KingTower : Tower
         [SerializeField]
         private Renderer m_Renderer;
 
-        void Awake()
+        protected override void Awake()
         {
+            base.Awake();
+
             m_Renderer.material.color = m_Definition.Color;
         }
     }

Assets/Game/Scripts/Gameplay/Modules/IDamageable.cs

@@ -2,13 +2,16 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
 
 namespace CRC
 {
     public delegate void DeathEventHandler();
+    public delegate void HealthChangeEventHandler();
     public interface IDamageable
     {
         event DeathEventHandler DeathEvent;
+        event HealthChangeEventHandler HealthChangeEvent;
 
         KingTower Owner { get; }
 
@@ -22,6 +25,7 @@ public interface IDamageable
     public abstract class Damageable : MonoBehaviour, IDamageable
     {
         public event DeathEventHandler DeathEvent;
+        public event HealthChangeEventHandler HealthChangeEvent;
 
         [SerializeField]
         protected KingTower m_Owner;
@@ -37,23 +41,36 @@ public abstract class Damageable : MonoBehaviour, IDamageable
         public virtual void Hurt(float amount)
         {
             m_CurrentHealth -= amount;
+
             if (m_CurrentHealth <= .0f)
             {
                 m_CurrentHealth = .0f;
                 FireDeathEvent();
             }
+
+            FireHealthChangeEvent();
         }
 
         public virtual void Heal(float amount)
         {
             m_CurrentHealth += amount;
-            if (m_CurrentHealth > m_MaxHealth) m_CurrentHealth = m_MaxHealth;
+
+            if (m_CurrentHealth > m_MaxHealth)
+                m_CurrentHealth = m_MaxHealth;
+
+            FireHealthChangeEvent();
         }
 
-        protected virtual void FireDeathEvent()
+        protected void FireDeathEvent()
         {
             if (DeathEvent != null)
                 DeathEvent();
         }
+
+        protected void FireHealthChangeEvent()
+        {
+            if (HealthChangeEvent != null)
+                HealthChangeEvent();
+        }
     }
 }

Assets/Game/Scripts/Gameplay/SpawningHandler.cs

@@ -29,7 +29,13 @@ void Update()
 
                 if (hitSuccess)
                 {
-                    Unit unit = Instantiate(m_UnitPrefab.gameObject, hitInfo.point, Quaternion.identity).GetComponent<Unit>();
+                    Unit unit = Instantiate
+                    (
+                        m_UnitPrefab.gameObject,
+                        hitInfo.point + Vector3.up * m_UnitPrefab.transform.lossyScale.y,
+                        Quaternion.identity
+                    )
+                    .GetComponent<Unit>();
 
                     if (unit == null)
                         return;

Assets/Game/Scripts/Gameplay/Tower.cs

@@ -2,11 +2,35 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
 
 namespace CRC
 {
     public class Tower : Damageable
     {
+        [SerializeField]
+        private Text m_HPText;
 
+        protected virtual void Awake()
+        {
+            m_CurrentHealth = m_MaxHealth;
+
+            m_HPText.text = m_CurrentHealth.ToString();
+        }
+
+        protected virtual void Start()
+        {
+            HealthChangeEvent += OnHealthChange;
+        }
+
+        protected virtual void OnDestroy()
+        {
+            HealthChangeEvent -= OnHealthChange;
+        }
+
+        protected virtual void OnHealthChange()
+        {
+            m_HPText.text = m_CurrentHealth.ToString();
+        }
     }
 }

Assets/Game/Scripts/Gameplay/Units/Unit.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.AI;
+using UnityEngine.UI;
 
 namespace CRC
 {
@@ -45,6 +46,16 @@ public enum UnitState
         [SerializeField]
         private NavMeshAgent m_Agent;
 
+        [Header("Healthbar")]
+
+        [SerializeField]
+        private GameObject m_HealthPanelPrefab;
+
+        [SerializeField]
+        private float m_HPBarYOffPx = 50.0f;
+
+        private Image m_HPBarForeground;
+
         private bool m_Enabled;
 
         private UnitState m_State;
@@ -63,6 +74,21 @@ public void Initialize(KingTower owner)
             m_State = UnitState.Idle;
             m_CurrentHealth = m_MaxHealth;
 
+            GameObject healthPanel = Instantiate
+            (
+                m_HealthPanelPrefab,
+                Camera.main.WorldToScreenPoint(this.transform.position) + Vector3.up * m_HPBarYOffPx,
+                Quaternion.identity,
+                GameObject.Find("HUD").transform
+            );
+
+            healthPanel.GetComponent<UnitHealthPanel>().Initialize(this, m_HPBarYOffPx);
+
+            m_HPBarForeground = healthPanel.transform.GetChild(1).GetComponent<Image>();
+            m_HPBarForeground.color = m_Owner.Definition.Color;
+
+            HealthChangeEvent += OnHealthChange;
+
             m_Enabled = true;
         }
 
@@ -74,6 +100,16 @@ void Update()
             StartCoroutine(Walk());
         }
 
+        void OnDestroy()
+        {
+            HealthChangeEvent -= OnHealthChange;
+        }
+
+        private void OnHealthChange()
+        {
+            m_HPBarForeground.fillAmount = m_CurrentHealth / m_MaxHealth;
+        }
+
         private IEnumerator Walk()
         {
             yield return new WaitForSeconds(0.5f);