Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

chenxin

2020-10-27 43b531f76be6e12c775a1135f6895e8fdc389a59

 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