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

chenxin

2020-12-02 54181477c210344b037d88f17dbe2cddc5cbc930

 Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs

@@ -430,7 +430,7 @@
                    if (fInEnergy <= 0)
                    {
                        fireState = false;
                        EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.FireTowerChargeEnd);
                        //EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.FireTowerChargeEnd);
                        fInEnergy = 0.0f;
                        energyCalTime = 0.0f;
                        towerPtr.energyCtl.SetEnergyProgress(0);