From b9ee5c460e65922729cfcf57f6db02c274105c2c Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Wed, 18 Nov 2020 17:17:45 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
index 272ea5b..3b69902 100644
--- a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
+++ b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
@@ -272,7 +272,7 @@
public GameObject woodAppearEffect1;
public GameObject woodAppearEffect2;
/// <summary>
- /// 保存所有生成或合成的塔的最小等级，索引0 -> 火木水塔 索引1 -> 技能塔
+ /// 保存所有生成或合成的塔的最小等级
/// </summary>
/// <value></value>
public int MinLevel;
@@ -1033,7 +1033,10 @@
// 判断目标位置是否有Tower且类型和等级一致,如果没有，则GhostTower删除，原Tower显示。
if (isValidateCombineTarget(pointerInfo))
+ {
TryPlaceTower(pointerInfo);
+ EndlessRandomTower.instance.UpdateDescDisplay();
+ }
else if (isFreeAttackGrid(pointerInfo) && !bSkill)
{
if (!TryPlaceTower(pointerInfo, false, true))
@@ -1989,6 +1992,7 @@
bool successfulPurchase = EndlessLevelManager.instance.Currency.TryPurchase(cost);
if (!successfulPurchase) return false;
+ EndlessRandomTower.instance.UpdateDescDisplay();
SetUpGhostTower(tow);
//Debug.Log("设置影子塔防.");
m_CurrentTower.Show();
--
Gitblit v1.9.1