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

liuzhiwei

2020-11-04 78e14d93c46238881339f33a56c81275c55d5089

 Assets/Scripts/TowerDefense/Towers/Tower.cs

@@ -460,6 +460,7 @@
        /// </summary>
        public Action towerDestroyed;


        /// <summary>
        /// Provide the tower with data to initialize with
        /// </summary>
@@ -497,6 +498,13 @@
            // 
            // 初始化当前的局内Tower等级数据
            this.initInSceneTowerLevel(SceneTowerLvl.getInSceneTowerLvl(this.towerName));

            if (gridPosition.y > 1)
            {
                currentTowerLevel.ResetScale();
            }else{
                currentTowerLevel.NormalScale();
            }
        }

        /// <summary>