diff options
| author | chai <chaifix@163.com> | 2021-08-30 21:11:54 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2021-08-30 21:11:54 +0800 |
| commit | 86ec4522be1d0b932006801c7bf2297adc9f0028 (patch) | |
| tree | 551739eaff15f0a1990f997409da8926979ba85a /Assets/Scripts/Unit/Collider | |
| parent | 07fd372981a16672af23e30816ade14fcb744804 (diff) | |
*misc
Diffstat (limited to 'Assets/Scripts/Unit/Collider')
| -rw-r--r-- | Assets/Scripts/Unit/Collider/ColliderRegistry.cs | 17 | ||||
| -rw-r--r-- | Assets/Scripts/Unit/Collider/CollisionSystem.cs | 15 |
2 files changed, 27 insertions, 5 deletions
diff --git a/Assets/Scripts/Unit/Collider/ColliderRegistry.cs b/Assets/Scripts/Unit/Collider/ColliderRegistry.cs index d51e9615..408ce5a4 100644 --- a/Assets/Scripts/Unit/Collider/ColliderRegistry.cs +++ b/Assets/Scripts/Unit/Collider/ColliderRegistry.cs @@ -5,6 +5,7 @@ using UnityEngine; public class ColliderRegistry : Singleton<ColliderRegistry> { public List<UnitCollider> colliders = new List<UnitCollider>(); + public List<Projectile> projectiles = new List<Projectile>(); public void AddCollider(UnitCollider collider) { @@ -16,5 +17,19 @@ public class ColliderRegistry : Singleton<ColliderRegistry> { if (colliders.Contains(collider)) colliders.Remove(collider); - } + }
+
+
+ public void AddProjectile(Projectile projectile)
+ {
+ if (!projectiles.Contains(projectile))
+ projectiles.Add(projectile);
+ }
+
+ public void RemoveProjectile(Projectile projectile)
+ {
+ if (projectiles.Contains(projectile))
+ projectiles.Remove(projectile);
+ } + }
\ No newline at end of file diff --git a/Assets/Scripts/Unit/Collider/CollisionSystem.cs b/Assets/Scripts/Unit/Collider/CollisionSystem.cs index d5c96d0c..0e3c92f0 100644 --- a/Assets/Scripts/Unit/Collider/CollisionSystem.cs +++ b/Assets/Scripts/Unit/Collider/CollisionSystem.cs @@ -42,6 +42,7 @@ public class CollisionSystem : SingletonMB<CollisionSystem> m_UnitColliderCount = registry.colliders != null ? registry.colliders.Count : 0; SolveHit(); + SolveProjectile(); } // hitbox <-> hurtbox @@ -102,10 +103,16 @@ public class CollisionSystem : SingletonMB<CollisionSystem> ListPool<ColliderDescriptor>.Release(hitboxes); ListPool<ColliderDescriptor>.Release(hurtboxes); - } - - // throwbox <-> hurtbox - void SolveThrow() + }
+
+ void SolveProjectile()
+ {
+
+ }
+
+
+ // throwbox <-> hurtbox
+ void SolveThrow() { } |