From 56d95fa59a9f6dc12d0fc0723ea449e5b317f994 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Sat, 26 Dec 2020 14:05:00 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs b/Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs
index b39d49a..3068215 100644
--- a/Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs
+++ b/Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs
@@ -60,7 +60,7 @@
LazyLoad();
BallisticAttack ballisticAttack = damager.GetComponent<BallisticAttack>();
- ballisticAttack.DealDamage((Targetable)damageableBehaviour, damager.IsEnhancedBullet);
+ ballisticAttack.DealDamage((Targetable)damageableBehaviour, damager);
damager.HasDamaged(c.transform.position, damageableBehaviour.configuration.alignmentProvider);
}
--
Gitblit v1.9.1