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/SingleTowerPlacementArea.cs

@@ -76,7 +76,7 @@
      /// </summary>
      /// <param name="x"></param>
      /// <returns></returns>
      public BulletUICtl GetBulletUICtl(int x)
      public BulletUICtl GetBulletUICtl(int x, int y)
      {
         return null;
      }
@@ -87,7 +87,7 @@
      /// </summary>
      /// <param name="x"></param>
      /// <returns></returns>
      public EnergyUICtl GetEnergyUICtl(int x)
      public EnergyUICtl GetEnergyUICtl(int x, int y)
        {
         return null;
        }