From 43b531f76be6e12c775a1135f6895e8fdc389a59 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Tue, 27 Oct 2020 17:39:23 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

---
 Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs b/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
index 762e8f6..09c6b11 100644
--- a/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
+++ b/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
@@ -259,6 +259,7 @@
 					this.energyCalTime += Time.deltaTime;
 					float process = energyCalTime % 11.0f;
 					int proint = (int)Math.Floor(process);
+					proint += towerPtr.uiProOffset;
 					towerPtr.energyCtl.SetEnergyProgress(proint);
 					if (proint == 10)
 					{
@@ -267,6 +268,8 @@
 						// 设置多倍攻击速度
 						fBackupTimer = m_FireTimer;
 						m_FireTimer = m_FireTimer / 3.0f;
+
+						towerPtr.uiProOffset = 0;
 					}
                 }
                 else

--
Gitblit v1.9.1