Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

liuzhiwei

2020-11-26 243d65af53aae9e3084f20ea9c5815f5b29df09e

 Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs

@@ -351,7 +351,7 @@
        {
            foreach (Tower tower in m_listTower)
            {
                tower.bInAttackMode = canAttack;
                tower.CanAttack = canAttack;
            }
        }

@@ -714,6 +714,29 @@
        }

        /// <summary>
        /// 判断是否有不同类型的Tower，可以发生置换，仅限于火木水之间发生
        /// </summary>
        /// <param name="pinfo"></param>
        /// <returns></returns>
        protected bool IsSubstituteGuide(PointerInfo pinfo)
        {
            if (!m_CurrentTower || !IsGhostAtValidPosition())
            {
                // 判断格子上的塔防:
                UIPointer pointer = WrapPointer(pinfo);
                Tower sTower = PickTowerInGrid(pointer);

                if (sTower && sTower != towerToMove)
                {
                    if (towerToMove && sTower.towerFeature == EFeatureTower.NULL && towerToMove.towerFeature == EFeatureTower.NULL)
                        return true;
                }
            }

            return false;
        }

        /// <summary>
        /// 获取目标格子上的塔防的名字数据
        /// </summary>
        /// <param name="pinfo"></param>
@@ -739,13 +762,13 @@
        /// <param name="tower"></param>
        protected void growUpTower(Tower tower)
        {
            Tower newTower = EndlessRandomTower.instance.GetRandomTower(EFeatureTower.NULL, true);
            Tower newTower = EndlessRandomTower.instance.GetRandomTower(EFeatureTower.NULL);

            // 所有的Tower不能升级成为FeatureTower.
            int maxLoop = 20;
            while (newTower.towerFeature != EFeatureTower.NULL)
            {
                newTower = EndlessRandomTower.instance.GetRandomTower(EFeatureTower.NULL, true);
                newTower = EndlessRandomTower.instance.GetRandomTower(EFeatureTower.NULL);
                maxLoop--;
                if (maxLoop <= 0)
                {
@@ -1125,6 +1148,28 @@
            if (m_CurrentTower.controller.towerFeature != EFeatureTower.NULL)
                bSkill = true;

            if (GameConfig.IsNewbie)
            {
                bool isCanChange = false;
                if (EndlessLevelManager.instanceExists && IsSubstituteGuide(pointerInfo))
                {
                    isCanChange = CheckCanChangePos(pointerInfo);
                }
                if (isCanChange)
                {
                    GuideCtrl.Ins.DragDone();
                    Debug.Log("交换了位置");
                }
                else
                {
                    GuideCtrl.Ins.EndDrag11_1();
                    CancelPlaceTower(pointerInfo);
                    Debug.Log("没有放置在火塔上");
                }

                return;
            }

            // 判断目标位置是否有Tower且类型和等级一致,如果没有，则GhostTower删除，原Tower显示。
            if (isValidateCombineTarget(pointerInfo))
            {
@@ -1151,49 +1196,7 @@
            }
            else if (EndlessLevelManager.instanceExists && IsSubstitute(pointerInfo))
            {
                // 可以发生置换
                UIPointer pointer = WrapPointer(pointerInfo);
                // 格子上的塔
                Tower sTower = PickTowerInGrid(pointer);

                if (sTower.bInAttackMode == towerToMove.bInAttackMode)
                {
                    IntVector2 v1 = new IntVector2(towerToMove.gridPosition.x, towerToMove.gridPosition.y);
                    IntVector2 v2 = new IntVector2(sTower.gridPosition.x, sTower.gridPosition.y);

                    if (m_CurrentArea == null)
                    {
                        CancelGhostPlacement();
                        towerToMove.showTower(true);
                    }
                    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);

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

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

                        CancelGhostPlacement();

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

                        //强制交换塔的时候检查自身充能条
                        newTower1.CheckCtrl();
                        newTower2.CheckCtrl();
                    }
                }
                CheckCanChangePos(pointerInfo);
            }
            // 当前是Skill塔位的状态.
            else if (bSkill)
@@ -1218,6 +1221,60 @@
            else
                CancelPlaceTower(pointerInfo);
        }

        private bool CheckCanChangePos(PointerInfo pointerInfo)
        {
            // 可以发生置换
            UIPointer pointer = WrapPointer(pointerInfo);
            // 格子上的塔
            Tower sTower = PickTowerInGrid(pointer);
            if (sTower == null)
                return false;

            if (sTower.bInAttackMode == towerToMove.bInAttackMode)
            {
                IntVector2 v1 = new IntVector2(towerToMove.gridPosition.x, towerToMove.gridPosition.y);
                IntVector2 v2 = new IntVector2(sTower.gridPosition.x, sTower.gridPosition.y);

                if (m_CurrentArea == null)
                {
                    CancelGhostPlacement();
                    towerToMove.showTower(true);
                    return false;
                }
                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);

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

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

                    CancelGhostPlacement();

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

                    //强制交换塔的时候检查自身充能条
                    newTower1.CheckCtrl();
                    newTower2.CheckCtrl();
                    return true;
                }
            }
            return false;

        }


        /// <summary>
        /// 强制放置塔，主要是用于新手
@@ -1363,9 +1420,7 @@
                return false;
            }

            BuyTower(pointer, force, zeroCost);

            return true;
            return BuyTower(pointer, force, zeroCost);
        }

        /// <summary>
@@ -1497,7 +1552,8 @@
            // 直接随机升级，零成本。
            // 1：记录当前Tower的Level，删除当前的Tower. 2：从TowerLib中随机找一个高一级别的Tower.
            string towerName = currentSelectedTower.towerName;
            if (currentSelectedTower.towerFeature == EFeatureTower.NULL)

            if (currentSelectedTower.towerFeature == EFeatureTower.NULL && GameConfig.CreateRandomTower)
                towerName = "";
            int towerLvl = currentSelectedTower.currentLevel + 1;
            int posx = currentSelectedTower.gridPosition.x;
@@ -1573,9 +1629,9 @@
        /// Throws exception when not in a build mode or when tower is not a valid position
        /// </exception>
        /// </summary>
        public void BuyTower(UIPointer pointer, bool force = false, bool zeroCost = false)
        public bool BuyTower(UIPointer pointer, bool force = false, bool zeroCost = false)
        {
            if (!isBuilding) return;
            if (!isBuilding) return false;

            // 判断是否格子上重复放置塔防
            if (!m_CurrentTower || !IsGhostAtValidPosition())
@@ -1607,11 +1663,11 @@
                    if (!pointer.raycast.HasValue || pointer.raycast.Value.collider == null)
                    {
                        CancelGhostPlacement();
                        return;
                        return false;
                    }
                    PlaceGhost(pointer);
                }
                return;
                return true;
            }

            // 这是判断是否超出了格子
@@ -1619,7 +1675,7 @@
            if (!pointer.raycast.HasValue || pointer.raycast.Value.collider == null)
            {
                CancelGhostPlacement();
                return;
                return false;
            }

            int cost = m_CurrentTower.controller.purchaseCost;
@@ -1630,6 +1686,8 @@
            {
                PlaceGhost(pointer);
            }

            return true;
        }

        /// <summary>