From 86ec4522be1d0b932006801c7bf2297adc9f0028 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 30 Aug 2021 21:11:54 +0800 Subject: *misc --- Assets/Scripts/Unit/Collider/ColliderRegistry.cs | 17 ++++++++++++++++- Assets/Scripts/Unit/Collider/CollisionSystem.cs | 15 +++++++++++---- 2 files changed, 27 insertions(+), 5 deletions(-) (limited to 'Assets/Scripts/Unit/Collider') 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 { public List colliders = new List(); + public List projectiles = new List(); public void AddCollider(UnitCollider collider) { @@ -16,5 +17,19 @@ public class ColliderRegistry : Singleton { 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 m_UnitColliderCount = registry.colliders != null ? registry.colliders.Count : 0; SolveHit(); + SolveProjectile(); } // hitbox <-> hurtbox @@ -102,10 +103,16 @@ public class CollisionSystem : SingletonMB ListPool.Release(hitboxes); ListPool.Release(hurtboxes); - } - - // throwbox <-> hurtbox - void SolveThrow() + } + + void SolveProjectile() + { + + } + + + // throwbox <-> hurtbox + void SolveThrow() { } -- cgit v1.1-26-g67d0