summaryrefslogtreecommitdiff
path: root/Assets/Scripts/Unit/Collider
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2021-09-01 17:47:20 +0800
committerchai <chaifix@163.com>2021-09-01 17:47:20 +0800
commitf900853952635a6e82e24fe62548d171823afda0 (patch)
tree0d2c0bce3f7411c8ab61c13a5ade65bddbac6375 /Assets/Scripts/Unit/Collider
parenta93ea925263c23d5c08b5fca546eef81d6d4fec3 (diff)
*修改粒子系统在编辑器下的播放
Diffstat (limited to 'Assets/Scripts/Unit/Collider')
-rw-r--r--Assets/Scripts/Unit/Collider/CollisionSystem.cs6
1 files changed, 5 insertions, 1 deletions
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<CollisionSystem>
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())