#9 Fix hit event issue (are called multiple times)

TODO: Need optimization
IDstorage · Sep 2, 2022 · 58f159a · 58f159a
1 parent d513184
commit 58f159a
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 16 deletions.
diff --git a/project-kata-unity/Assets/Scripts/Behaviours/CombatEntity.cs b/project-kata-unity/Assets/Scripts/Behaviours/CombatEntity.cs
@@ -67,7 +67,7 @@ public async void DoLineAttack(AnimationEvent param)
 
         var track = trailData.tracks[param.intParameter];
 
-        HashSet<CustomBehaviour> hitList = new HashSet<CustomBehaviour>();
+        Dictionary<CustomBehaviour, HashSet<Collider>> hitList = new Dictionary<CustomBehaviour, HashSet<Collider>>();
 
         boxCastQueue.Clear();
 
@@ -92,26 +92,39 @@ public async void DoLineAttack(AnimationEvent param)
 
             for (int j = 0; j < hits.Length; ++j)
             {
-                if (ReferenceEquals(hits[j], weaponCollider)) continue;
+                var hit = hits[j];
+                if (ReferenceEquals(hit, weaponCollider)) continue;
 
-                var root = hits[j].GetComponent<RootSelector>().Root;
-                if (root == null)
+                var selector = hit.GetComponent<RootSelector>();
+                if (selector == null) continue;
+                if (selector.Root == null)
                 {
                     Debug.Log("RootSelector: Root is Null");
                     continue;
                 }
 
-                if (hitList.Contains(root)) continue;
-                hitList.Contains(root);
+                if (ReferenceEquals(selector.Root, rootBehaviour)) continue;
 
-                EventDispatcher.Instance.Send(new HitEvent()
+                if (!hitList.ContainsKey(selector.Root))
                 {
-                    sender = rootBehaviour,
-                    receiver = root,
-                    hitPart = hits[j]
-                });
+                    hitList.Add(selector.Root, new HashSet<Collider>());
+                }
+
+                if (hitList[selector.Root].Contains(hit)) continue;
+
+                hitList[selector.Root].Add(hit);
             }
         }
+
+        foreach (var hits in hitList)
+        {
+            EventDispatcher.Instance.Send(new HitEvent()
+            {
+                sender = rootBehaviour,
+                receiver = hits.Key,
+                hitParts = hits.Value
+            });
+        }
     }
 
     public void CollectInputEvent(AnimationEvent param)

diff --git a/project-kata-unity/Assets/Scripts/Behaviours/Player/Player.cs b/project-kata-unity/Assets/Scripts/Behaviours/Player/Player.cs
@@ -85,11 +85,14 @@ public void Attack()
 
     public void Hit(HitEvent e)
     {
-        if (StateMachine.CurrentState.ID == StateID.PlayerDefense
-            && e.hitPart.CompareTag("Weapon"))
+        if (StateMachine.CurrentState.ID == StateID.PlayerDefense)
         {
-            Block();
-            return;
+            foreach (var part in e.hitParts)
+            {
+                if (!part.CompareTag("Weapon")) continue;
+                Block();
+                return;
+            }
         }
 
         Debug.Log($"Hit! {e.sender.name} -> {e.receiver.name}");

diff --git a/project-kata-unity/Assets/Scripts/Events/HitEvent.cs b/project-kata-unity/Assets/Scripts/Events/HitEvent.cs
@@ -4,7 +4,7 @@
 
 public class HitEvent : Anomaly.BaseEvent
 {
-    public Collider hitPart;
+    public HashSet<Collider> hitParts;
 }
 
 public class HitEventStream : Anomaly.EventStream<HitEvent>