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;
                }
            }
@@ -1051,7 +1051,6 @@
                if (!TryPlaceTower(pointerInfo, false, true))
                {
                    CancelPlaceTower(pointerInfo);

                    Debug.Log("这里需要返回原位");
                    return;
                }
@@ -1077,26 +1076,38 @@
                    IntVector2 v1 = new IntVector2(towerToMove.gridPosition.x, towerToMove.gridPosition.y);
                    IntVector2 v2 = new IntVector2(sTower.gridPosition.x, sTower.gridPosition.y);

                    Tower newTower1 = PlaceTowerForce(EndlessRandomTower.instance.getTowerByName(sTower.towerName), v1, sTower.currentLevel + 1, false);
                    Tower newTower2 = PlaceTowerForce(m_CurrentTower.controller, v2, towerToMove.currentLevel + 1, false);

                    if (towerToMove != null)
                    if (m_CurrentArea == null)
                    {
                        delTower(towerToMove);
                        CancelGhostPlacement();
                        towerToMove.showTower(true);
                        towerToMove.Sell();
                        towerToMove = null;
                    }
                    else
                    {
                        Tower newTower1 = PlaceTowerForce(EndlessRandomTower.instance.getTowerByName(sTower.towerName), v1, sTower.currentLevel + 1, false);
                        Tower newTower2 = PlaceTowerForce(m_CurrentTower.controller, v2, towerToMove.currentLevel + 1, false);

                    delTower(sTower);
                    sTower.showTower(true);
                    sTower.Sell();
                    sTower = null;
                        if (towerToMove != null)
                        {
                            delTower(towerToMove);
                            towerToMove.showTower(true);
                            towerToMove.Sell();
                            towerToMove = null;
                        }

                    CancelGhostPlacement();
                        delTower(sTower);
                        sTower.showTower(true);
                        sTower.Sell();
                        sTower = null;

                    newTower1.placementArea.Occupy(newTower1.gridPosition, newTower1.dimensions);
                    newTower2.placementArea.Occupy(newTower2.gridPosition, newTower2.dimensions);
                        CancelGhostPlacement();

                        newTower1.placementArea.Occupy(newTower1.gridPosition, newTower1.dimensions);
                        newTower2.placementArea.Occupy(newTower2.gridPosition, newTower2.dimensions);

                        //强制交换塔的时候检查自身充能条
                        newTower1.CheckCtrl();
                        newTower2.CheckCtrl();
                    }
                }
            }
            // 当前是Skill塔位的状态.
@@ -1141,7 +1152,6 @@

            if (playEffect)
                PlayUpgradeEffect(createdTower);

            addTower(createdTower);
            Destroy(currentTower.gameObject);

@@ -1210,6 +1220,7 @@
            if (towerToMove)
            {
                towerToMove.showTower(true);
                towerToMove.CheckCtrl();

                // 处理复制骰子：
                if (towerToMove.towerFeature == EFeatureTower.CopyCat)
@@ -2155,7 +2166,7 @@
            base.Awake();

            randomTowerBtn = transform.Find("BottomCanvas/Panel/TowerBuyBtn").GetComponent<Button>();
            DOTween.Init(true, true, LogBehaviour.Verbose).SetCapacity(200, 10);
            //DOTween.Init(true, true, LogBehaviour.Verbose).SetCapacity(200, 10);

            state = State.Normal;
            m_Camera = GameObject.Find("SceneCamera3D").GetComponent<Camera>();