Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle

wangguan

2020-10-26 0e8a4a629f0db7d9dc7b8c3b9795a195c279f7b9

 Assets/Scripts/TowerDefense/Towers/Tower.cs

@@ -227,6 +227,9 @@
            // 
            // 根据是否是子弹塔防来决定是否显示相应的界面
            BulletUICtl buc = this.placementArea.GetBulletUICtl(gridPosition.x);

            if (buc == null) return;

            if ((this.eTowerFuntion == ETowerFuntion.BULLET) && (buc != null))
            {
                // 设置数据