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

chenxin

2020-10-27 43b531f76be6e12c775a1135f6895e8fdc389a59

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

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


      /// <summary>
      /// 获取对应位置的能量条界面指针.
      /// </summary>
      /// <param name="x"></param>
      /// <returns></returns>
      public EnergyUICtl GetEnergyUICtl(int x, int y)
        {
         return null;
        }

      /// <summary>
      /// 获取一个可以放置塔防的位置.
      /// </summary>