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/TowerDefense/Towers/Projectiles/BallisticAttack.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs b/Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs
index 089f629..4f2a959 100644
--- a/Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs
+++ b/Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs
@@ -110,15 +110,25 @@
// 处理PVE无尽模式，buff增加的伤害
finalDamage += ProcessEndlessBuffAttack(finalDamage);
+ int deathCount = 0;
+
// 提前处理非当前Enemy的爆炸攻击:
if (chainAttackRate > 0)
- AgentInsManager.instance.StartExplodeAttack((Agent)enemy, finalDamage);
+ deathCount = AgentInsManager.instance.StartExplodeAttack((Agent)enemy, finalDamage);
int tid = enemy.liveID;
Vector3 backPos = enemy.position;
// 这里也可以把碰撞点传进来
- enemy.TakeDamage(finalDamage, enemy.position, damager.alignmentProvider);
+ enemy.TakeDamage(finalDamage, enemy.position, damager.alignmentProvider, 0);
+
+ if (chainAttackRate > 0)
+ {
+ if (enemy.isDead)
+ ++deathCount;
+ if (deathCount > 1)
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessOneTimeKillCount, deathCount);
+ }
// 处理塔位的技能攻击:
ProcessTowerAttributeAttack(enemy, finalDamage, attributeId);
--
Gitblit v1.9.1