From f3eb699401e3e95448c12c0058ba8e6045480223 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Mon, 07 Dec 2020 10:45:57 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs | 20 ++------------------
1 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs b/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
index 57b8806..42120af 100644
--- a/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
+++ b/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
@@ -456,22 +456,6 @@
if (towerPtr && towerPtr.FreezeBreathCtrl)
{
Damager damager = projectile.gameObject.GetComponent<Damager>();
- float finalDamage = damager.damage;
-
- List<EndlessBuffConfig> list = EndlessBuffManager.instance.GetBuffListByEffectType(EndlessBuffEffectType.AttackAdd, towerPtr.ElfId);
- float ratio = 0;
- float add = 0;
-
- if (list.Count > 0)
- {
- for (int i = 0; i < list.Count; ++i)
- {
- ratio += list[i].Config.buff_effect[1];
- add += list[i].Config.buff_effect[2];
- }
- }
-
- finalDamage += (ratio / 100f) * finalDamage + add;
if (inFreezeBreath <= 0)
{
@@ -488,7 +472,7 @@
towerPtr.PlayFreezeBreathEffect(true);
towerPtr.FreezeBreathCtrl.ReleaseCount = 1;
towerPtr.FreezeBreathCtrl.PlayFreezeEffect(waveLineID);
- towerPtr.FreezeBreathCtrl.ReleaseFreeze(waveLineID, finalDamage, damager.alignmentProvider);
+ towerPtr.FreezeBreathCtrl.ReleaseFreeze(waveLineID, towerPtr, damager.alignmentProvider);
}
}
else
@@ -501,7 +485,7 @@
if (interval == time * (towerPtr.FreezeBreathCtrl.DamageCount - towerPtr.FreezeBreathCtrl.ReleaseCount - 1) + offset && towerPtr.FreezeBreathCtrl.ReleaseCount < towerPtr.FreezeBreathCtrl.DamageCount)
{
++towerPtr.FreezeBreathCtrl.ReleaseCount;
- towerPtr.FreezeBreathCtrl.ReleaseFreeze(waveLineID, finalDamage, damager.alignmentProvider);
+ towerPtr.FreezeBreathCtrl.ReleaseFreeze(waveLineID, towerPtr, damager.alignmentProvider);
}
if (inFreezeBreath <= 0)
--
Gitblit v1.9.1