From d7db442a4655baa0c0f282aa415fd12da4edc40a Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Tue, 27 Oct 2020 09:46:31 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle

---
 Assets/Scripts/TowerDefense/Towers/Placement/SingleTowerPlacementArea.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Assets/Scripts/TowerDefense/Towers/Placement/SingleTowerPlacementArea.cs b/Assets/Scripts/TowerDefense/Towers/Placement/SingleTowerPlacementArea.cs
index 55030f5..231fbf5 100644
--- a/Assets/Scripts/TowerDefense/Towers/Placement/SingleTowerPlacementArea.cs
+++ b/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;
         }

--
Gitblit v1.9.1