From 18f96c9313bf24d2296e615f44fc0ca005f2e872 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Thu, 12 Nov 2020 16:05:44 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs b/Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs
index 87cf356..d7aee7a 100644
--- a/Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs
+++ b/Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs
@@ -52,18 +52,10 @@
// 非Agent不参与碰撞:
var agent = this.gameObject.GetComponent<Agent>();
- if (agent == null)
+ if (agent == null || agent.isDead)
return;
BallisticProjectile ballistic = c.gameObject.GetComponent<BallisticProjectile>();
-
- if (ballistic.IsHitEnemy)
- {
- Debug.Log("--------------------- 已发生过碰撞 ---------------------");
- return;
- }
-
- ballistic.IsHitEnemy = true;
LazyLoad();
--
Gitblit v1.9.1