1

Assets/BITKit/Unity/Scripts/Entity/Components/Hitbox/EntityHitbox.cs

@@ -4,19 +4,52 @@ using UnityEngine;
 using BITKit;
 namespace BITKit.Entities
 {
-    public class EntityHitbox : EntityBehavior,IDamagable
+    public class EntityHitbox : MonoBehaviour,IDamagable
     {
-        public IHealth Health => _health;
+        public IHealth Health
+        {
+            get
+            {
+                EnsureConfigure();
+                return _health;
+            }
+        }
+
+        public IUnityEntity UnityEntity
+        {
+            get
+            {
+                EnsureConfigure();
+                return _unityEntity;
+            }
+        }
+        public Rigidbody Rigidbody
+        {
+            get=>m_rigidbody;
+            set=>m_rigidbody=value;
+        }
 
-        IUnityEntity IDamagable.UnityEntity => UnityEntity;
-        public Rigidbody Rigidbody => m_rigidbody;
         public void GiveDamage(DamageMessage message)
         {
-            UnityEntity.Invoke(message);
+            if (_unityEntity is not null)
+                UnityEntity.Invoke(message);
         }
+
         [SerializeField]private Rigidbody m_rigidbody;
         
-        [Inject]
+        [Inject(true)]
         private IHealth _health;
+
+        private IUnityEntity _unityEntity;
+        
+        private bool _initialized;
+
+        private void EnsureConfigure()
+        {
+            if (_initialized) return;
+            _unityEntity = GetComponentInParent<IUnityEntity>(true);
+            _unityEntity?.Inject(this);
+            _initialized = true;
+        }
     }
 }