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

wangguan

2020-10-27 bac1e673b54b1e5f773c4bd098e1b4fe8981c62e

 Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGrid.cs

@@ -768,7 +768,7 @@
                img.transform.SetAsFirstSibling();
                EnergyUICtl euc = img.GetComponent<EnergyUICtl>();
                arrTowerEnergyUi[x] = euc;
                // euc.gameObject.SetActive(false);
                euc.gameObject.SetActive(false);
            }

            return;