*collision

1 files changed, 19 insertions, 17 deletions

diff --git a/Assets/Scripts/Unit/Component/UnitCollider.cs b/Assets/Scripts/Unit/Component/UnitCollider.cs
index 57585ba2..3d6bca70 100644
--- a/Assets/Scripts/Unit/Component/UnitCollider.cs
+++ b/Assets/Scripts/Unit/Component/UnitCollider.cs
@@ -2,29 +2,14 @@
 using System.Collections.Generic;

 using UnityEngine;

 

-public class ColliderRegistry : Singleton<ColliderRegistry>

-{

-    public List<UnitCollider> colliders = new List<UnitCollider>();

-

-    public void AddCollider(UnitCollider collider)

-    {

-        if (!colliders.Contains(collider))

-            colliders.Add(collider);

-    }

-

-    public void RemoveCollider(UnitCollider collider)

-    {

-        if (colliders.Contains(collider))

-            colliders.Remove(collider);

-    }

-}

-

 // 角色当前的碰撞盒

 [DisallowMultipleComponent]

 public class UnitCollider : UnitComponent

 {

     public bool showGizmos;

 

+	private Dictionary<int/*hitbox hash*/, List<int/*unitController hash*/>> hitMask = new Dictionary<int, List<int>>();

+

     public override void Awake()

     {

         base.Awake();

@@ -56,6 +41,23 @@ public class UnitCollider : UnitComponent
         return infos;

     }

 

+	// 动作切换，重置collider mask

+	public void OnAnimationChange()

+	{

+		hitMask.Clear();

+

+	}

+

+	public void RecordCollision()

+	{

+

+	}

+

+	public bool CanCollide()

+	{

+		return true;

+	}

+

 #if UNITY_EDITOR

 

     public void OnDrawGizmos()