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

River Jiang

2020-10-27 24f59b89e9eabcfe948fc0ba304a8dbec2deda14

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

@@ -176,7 +176,7 @@
        /// </summary>
        /// <param name="x"></param>
        /// <returns></returns>
        public BulletUICtl GetBulletUICtl(int x)
        public BulletUICtl GetBulletUICtl(int x, int y)
        {
            return this.arrTowerBulletUi[x];
        }
@@ -186,7 +186,7 @@
        /// </summary>
        /// <param name="x"></param>
        /// <returns></returns>
        public EnergyUICtl GetEnergyUICtl(int x)
        public EnergyUICtl GetEnergyUICtl(int x, int y)
        {
            return this.arrTowerEnergyUi[x];
        }
@@ -768,7 +768,7 @@
                img.transform.SetAsFirstSibling();
                EnergyUICtl euc = img.GetComponent<EnergyUICtl>();
                arrTowerEnergyUi[x] = euc;
                euc.gameObject.SetActive(false);
                // euc.gameObject.SetActive(false);
            }

            return;