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/TowerDefense/Towers/Projectiles/BallisticAttack.cs | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs b/Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs
index 8b48756..089f629 100644
--- a/Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs
+++ b/Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs
@@ -36,7 +36,8 @@
/// 处理代理收到的伤害，这里需要判断代理的类型分别去处理
/// </summary>
/// <param name="enemy"></param>
- public void DealDamage(Targetable enemy)
+ /// <param name="attributeId">子弹的属性id</param>
+ public void DealDamage(Targetable enemy, int attributeId = -1)
{
switch ((enemy as Agent).AgentType)
{
@@ -47,11 +48,31 @@
HandleBubbleBomb(enemy);
break;
case SpawnAgentType.WoodPile:
+ HandleWoodPile(enemy, attributeId);
break;
}
}
/// <summary>
+ /// 处理木桩墙壁收到的伤害
+ /// </summary>
+ /// <param name="enemy"></param>
+ private void HandleWoodPile(Targetable enemy, int id)
+ {
+ float finalDamage = damager.finalDamage;
+
+ if (id == 10101)
+ finalDamage *= (enemy as WoodPileAgent).FireHurtRate;
+
+ int tid = enemy.liveID;
+ Vector3 backPos = enemy.position;
+
+ // 这里也可以把碰撞点传进来
+ enemy.TakeDamage(finalDamage, enemy.position, damager.alignmentProvider);
+ EndlessGameUI.instance.generateBloodText(backPos, finalDamage);
+ }
+
+ /// <summary>
/// 处理泡泡炸弹收到的伤害
/// </summary>
/// <param name="enemy"></param>
--
Gitblit v1.9.1