From f900853952635a6e82e24fe62548d171823afda0 Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 1 Sep 2021 17:47:20 +0800 Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9=E7=B2=92=E5=AD=90=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=9C=A8=E7=BC=96=E8=BE=91=E5=99=A8=E4=B8=8B=E7=9A=84=E6=92=AD?= =?UTF-8?q?=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Unit/Collider/CollisionSystem.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Assets/Scripts/Unit/Collider') diff --git a/Assets/Scripts/Unit/Collider/CollisionSystem.cs b/Assets/Scripts/Unit/Collider/CollisionSystem.cs index e84c54a9..4a73446f 100644 --- a/Assets/Scripts/Unit/Collider/CollisionSystem.cs +++ b/Assets/Scripts/Unit/Collider/CollisionSystem.cs @@ -126,10 +126,14 @@ public class CollisionSystem : SingletonMB foreach (var projectile in registry.projectiles) { + if (projectile == null) + continue; for(int i = 0; i < hurtboxes.Count; ++i) { ColliderDescriptor hurtCollider = hurtboxes[i]; - if (projectile.owner.type == hurtCollider.unitCollider.owner.type) + if (hurtCollider.unitCollider == null) + continue; + if (projectile.owner == null || hurtCollider.unitCollider.owner == null || projectile.owner.type == hurtCollider.unitCollider.owner.type) continue; Box hurtbox = ColliderUtility.GetColliderInWorldSpace(hurtCollider); foreach (var itor in projectile.GetCollidersInWorldSpace()) -- cgit v1.1-26-g67d0