Merge commit 'fafc11ad74601a1c4e4b2e28165af25bd19bb5a9' into master

chenxin

2020-11-20 09053388ef6d58a7de59fab450c11ee0affbceb2

 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);