From 6d3bfdaad36f4af65494854e5651f7d37ad81d6b Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Sat, 12 Dec 2020 18:56:34 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/Level/AgentInsManager.cs | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Level/AgentInsManager.cs b/Assets/Scripts/TowerDefense/Level/AgentInsManager.cs
index 6ba57fe..0d92f60 100644
--- a/Assets/Scripts/TowerDefense/Level/AgentInsManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/AgentInsManager.cs
@@ -961,28 +961,27 @@
Agent eag = listAg[ti];
if (eag == ag) continue;
+ Vector3 fpos = eag.transform.position;
+ tpos.y = 0;
+ fpos.y = 0;
+ if (Vector3.Distance(tpos, fpos) > 12) continue;
+
if (eag.AgentType == SpawnAgentType.BubbleBomb)
{
EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessBossSkillBubbleBombGetHit, (eag as BubbleBombAgent).Id);
}
else
{
- Vector3 fpos = eag.transform.position;
- tpos.y = 0;
- fpos.y = 0;
- if (Vector3.Distance(tpos, fpos) < 12)
+ eag.TakeDamage(damage, fpos, null);
+ if (!eag.opponentAgent)
{
- eag.TakeDamage(damage, fpos, null);
- if (!eag.opponentAgent)
- {
- // if (GameUI.instanceExists)
- // GameUI.instance.generateBloodText(fpos, damage);
- // else if (EndlessGameUI.instanceExists)
- // EndlessGameUI.instance.generateBloodText(fpos, damage);
- }
- if (eag.isDead)
- ++deathCount;
+ // if (GameUI.instanceExists)
+ // GameUI.instance.generateBloodText(fpos, damage);
+ // else if (EndlessGameUI.instanceExists)
+ // EndlessGameUI.instance.generateBloodText(fpos, damage);
}
+ if (eag.isDead)
+ ++deathCount;
}
}
--
Gitblit v1.9.1