From fdfb88a9ee3652e716e603f759d3be5dcc0bd3bd Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Thu, 19 Nov 2020 17:26:52 +0800
Subject: [PATCH] Merge commit '998ebc0dc00c103b365e36797c1a1ac4a6a2afa5' into master
---
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
index 0e15865..dd297f4 100644
--- a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
+++ b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
@@ -705,7 +705,7 @@
if (sTower && sTower != towerToMove)
{
- if (towerToMove && sTower.towerFeature == EFeatureTower.NULL && towerToMove.towerFeature == EFeatureTower.NULL && sTower.bInAttackMode == towerToMove.bInAttackMode)
+ if (towerToMove && sTower.towerFeature == EFeatureTower.NULL && towerToMove.towerFeature == EFeatureTower.NULL && sTower.bInAttackMode && towerToMove.bInAttackMode)
return true;
}
}
@@ -1152,7 +1152,6 @@
if (playEffect)
PlayUpgradeEffect(createdTower);
-
addTower(createdTower);
Destroy(currentTower.gameObject);
--
Gitblit v1.9.1