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

liuzhiwei

2020-12-08 2cd0602f983b36d00c2a1573dffe7135c2ff18a9

 Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs

@@ -1287,6 +1287,9 @@
                    //强制交换塔的时候检查自身充能条
                    newTower1.CheckCtrl();
                    newTower2.CheckCtrl();
                    //Debug.Log($"newTower1:{newTower1.towerName}  newTower2:{newTower2.towerName}");

                    TowerPlacementGridEndless.instance.PlayPutPs(newTower2.gridPosition.x,newTower2.gridPosition.y);
                    return true;
                }
            }