From d35d31d85fd4b827dc37008aef39c019b6a7781d Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Sat, 07 Nov 2020 16:34:50 +0800
Subject: [PATCH] Merge commit '2940e451058b1af7541ff651f485f33a10e92f7e' into master
---
Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs b/Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs
index 139ca35..87cf356 100644
--- a/Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs
+++ b/Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs
@@ -54,7 +54,7 @@
var agent = this.gameObject.GetComponent<Agent>();
if (agent == null)
return;
-
+
BallisticProjectile ballistic = c.gameObject.GetComponent<BallisticProjectile>();
if (ballistic.IsHitEnemy)
@@ -68,7 +68,7 @@
LazyLoad();
BallisticAttack ballisticAttack = damager.GetComponent<BallisticAttack>();
- ballisticAttack.DealDamage((Targetable)damageableBehaviour);
+ ballisticAttack.DealDamage((Targetable)damageableBehaviour, ballisticAttack.attributeId);
damager.HasDamaged(c.transform.position, damageableBehaviour.configuration.alignmentProvider);
}
--
Gitblit v1.9.1