From 24f59b89e9eabcfe948fc0ba304a8dbec2deda14 Mon Sep 17 00:00:00 2001
From: River Jiang <546213258@qq.com>
Date: Tue, 27 Oct 2020 14:09:47 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGrid.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGrid.cs b/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGrid.cs
index 3e75b17..a9a7c87 100644
--- a/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGrid.cs
+++ b/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;
--
Gitblit v1.9.1