Merge commit '4a083f2f3d8baf1c2630b3717d62904edcc8e24a' into master

chenxin

2020-11-14 62b2779db75575bebd80ffac74fc3f25b5b994fa

 Assets/Scripts/TowerDefense/Towers/Tower.cs

@@ -1,4 +1,5 @@
using System.Collections;
using KTGMGemClient;
using System.Collections;
using System;
using ActionGameFramework.Health;
using Core.Utilities;
@@ -197,7 +198,8 @@
        {
            if (this.energyCtl && isClose)
                energyCtl.gameObject.SetActive(!play);
            else if(!isClose){
            else if (!isClose)
            {

            }

@@ -224,16 +226,10 @@
            {
                m_bInAttackMode = value;
                currentTowerLevel.SetAffectorState(m_bInAttackMode, gridPosition.x);
                currentTowerLevel.SetAttackState(value);

                if (value)
                {
                    if (opponentSide)
                        currentTowerLevel.SetTowerMonsterMat(materialTowerWaitOppo, false);
                    else
                        currentTowerLevel.SetTowerMonsterMat(materialTowerWaitSelf, false);

                    // 处理Tower
                    this.setTowerState(false);

                    if (opponentSide)
                    {
                        OpponentMgr.instance.SetTowerAttID(gridPosition.x, attributeId, this.currentLevel);
@@ -255,7 +251,6 @@
                    // 处理塔位边上的界面.
                    OnTowerUICtrl();
                }

            }
        }