From 2669e465a82faa0440165f7c38ca69f11135587a Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Wed, 28 Oct 2020 20:27:36 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/Towers/Tower.cs | 37 ++++++++++++-------------------------
1 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Towers/Tower.cs b/Assets/Scripts/TowerDefense/Towers/Tower.cs
index 7305372..d62e1bd 100644
--- a/Assets/Scripts/TowerDefense/Towers/Tower.cs
+++ b/Assets/Scripts/TowerDefense/Towers/Tower.cs
@@ -134,7 +134,7 @@
public int uiProOffset
{
- get { return this.progressOffset; }
+ get { return this.progressOffset; }
set { this.progressOffset = value; }
}
@@ -190,33 +190,20 @@
/// 播放充能状态特效.
/// </summary>
/// <param name="play"></param>
- public void PlayEnergyEffect( bool play)
+ public void PlayEnergyEffect(bool play)
{
if (this.energyCtl)
energyCtl.gameObject.SetActive(!play);
- if( play)
+ if (!opponentSide)
{
- if( !opponentSide)
- {
- ((TowerPlacementGrid)GameUI.instance.selfTowerPlaceArea).PlayEnergyEffect(gridPosition.x, true);
- }
- else
- {
- ((TowerPlacementGrid)OpponentMgr.instance.m_CurrentArea).PlayEnergyEffect(gridPosition.x, true);
- }
+ if (GameUI.instanceExists)
+ ((TowerPlacementGrid)GameUI.instance.selfTowerPlaceArea).PlayEnergyEffect(gridPosition.x, play);
+ else if (EndlessGameUI.instanceExists)
+ ((TowerPlacementGridEndless)EndlessGameUI.instance.selfTowerPlaceArea).PlayEnergyEffect(gridPosition.x, gridPosition.y, play);
}
else
- {
- if ( !opponentSide)
- {
- ((TowerPlacementGrid)GameUI.instance.selfTowerPlaceArea).PlayEnergyEffect(gridPosition.x, false);
- }
- else
- {
- ((TowerPlacementGrid)OpponentMgr.instance.m_CurrentArea).PlayEnergyEffect(gridPosition.x, false);
- }
- }
+ ((TowerPlacementGrid)OpponentMgr.instance.m_CurrentArea).PlayEnergyEffect(gridPosition.x, play);
}
/// <summary>
@@ -289,7 +276,7 @@
}
return;
- }
+ }
public int GetTowerUICtrlProgress()
{
@@ -306,7 +293,7 @@
return 0;
}
- public void SetTowerUICtlProcess( int pro)
+ public void SetTowerUICtlProcess(int pro)
{
// 根据是否是子弹塔防来决定是否显示相应的界面
BulletUICtl buc = this.placementArea.GetBulletUICtl(gridPosition.x, gridPosition.y);
@@ -317,7 +304,7 @@
progressOffset = pro;
}
- EnergyUICtl euc = placementArea.GetEnergyUICtl(gridPosition.x, gridPosition.y);
+ EnergyUICtl euc = placementArea.GetEnergyUICtl(gridPosition.x, gridPosition.y);
if ((eTowerFuntion == ETowerFuntion.ENERGY) && (euc != null))
{
euc.SetCtlProcess(pro);
@@ -328,7 +315,7 @@
- return;
+ return;
}
--
Gitblit v1.9.1