From 10b5f44b36f3dd0d3bdc2fcc06aa13caaa611760 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Wed, 11 Nov 2020 16:56:04 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
index 9de2db0..8bc7435 100644
--- a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
+++ b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
@@ -879,7 +879,7 @@
else if (m_CurrentTower.controller.towerFeature == EFeatureTower.Skill_Fire || m_CurrentTower.controller.towerFeature == EFeatureTower.Skill_Bomb)
{
//Debug.Log("需要激活兵线下方绿色标识");
-
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessStartDragSkill, true);
}
}
}
@@ -889,6 +889,11 @@
/// </summary>
public void CloseCanPlaceRenderer()
{
+ if (m_CurrentTower.controller.towerFeature == EFeatureTower.Skill_Fire || m_CurrentTower.controller.towerFeature == EFeatureTower.Skill_Bomb)
+ {
+ //Debug.Log("需要激活兵线下方绿色标识");
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessStartDragSkill, false);
+ }
if (m_CurrentArea != null)
(m_CurrentArea as TowerPlacementGridEndless).CloseCanPlaceRenderer();
}
@@ -2094,6 +2099,7 @@
return currentEventSystem.IsPointerOverGameObject(pointerId);
}
+ WaveLineSelEffect currentEffect;
/// <summary>
/// Move the ghost to the pointer's position
/// </summary>
@@ -2142,8 +2148,16 @@
if (npt.overWaveLine)
{
WaveLineSelEffect selEff = npt.wavelineHit.Value.collider.GetComponent<WaveLineSelEffect>();
- if (selEff)
- selEff.SetWaveLineSel(true);
+ if (selEff != currentEffect)
+ {
+ if (currentEffect != null)
+ {
+ currentEffect.SetParticleSystem(false);
+ }
+ currentEffect = selEff;
+ currentEffect.SetParticleSystem(true);
+ }
+ //selEff.SetWaveLineSel(true);
}
}
// 炸弹是区域攻击显示:
--
Gitblit v1.9.1