Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master

weixudong

2020-12-09 17c6e8b6f2aee4ed9a15c886f54a73f0cb61b125

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

@@ -200,6 +200,7 @@
            }
        }


        // TowerList用于简单记录相关的数据
        protected List<Tower> m_listTower = new List<Tower>();

@@ -773,6 +774,27 @@
        }

        /// <summary>
        /// 提升所有塔的等级，如果现在塔的等级 < level，设置等级为 level，如果 > level 不做改变
        /// </summary>
        /// <param name="level">从0开始</param>
        public void UpgradeAllTowerMinLevel(int level)
        {
            if (level < 0 || level > ElfUpgradeData.MaxTowerLevel - 1) return;

            for (int i = 0; i < m_listTower.Count; ++i)
            {
                if (m_listTower[i].currentLevel < level)
                {
                    m_listTower[i].currentLevel = level;
                    m_listTower[i].CurrentTowerLevel.SetShowLevel(level + 1);
                    m_listTower[i].CurrentTowerLevel.SetScale(level + 1);
                    PlayUpgradeEffect(m_listTower[i]);
                }
            }
            UpdateMinLevelArr();
        }

        /// <summary>
        /// 成长骰子升级为高一级别的随机骰子.
        /// </summary>
        /// <param name="tower"></param>
@@ -1081,7 +1103,7 @@
            }
        }

        void CloseCanPlace()
        public void CloseCanPlace()
        {
            dragTowerPlacement.CloseCanPlace();
            if (bInAttackModeTower != null)
@@ -1140,6 +1162,15 @@
        }

        #endregion

        /// <summary>
        /// 推拽结束，如果判断HasTower==true 就强行释放
        /// </summary>
        public void EndDragCancelPlaceTower()
        {
            Debug.Log("强行释放了m_CurrentTower");
            CancelPlaceTower(null);
        }

        /// <summary>
        /// 拖动一个Tower之后，松开鼠标或者EndDrag.
@@ -1216,6 +1247,8 @@
            else if (EndlessLevelManager.instanceExists && IsSubstitute(pointerInfo))
            {
                CheckCanChangePos(pointerInfo);
                if (EndlessUIStart.instance.GameStartTime >= JsonDataCenter.DOUBLE_GEM_TIME)
                    UpgradeAllTowerMinLevel(1);
            }
            // 当前是Skill塔位的状态.
            else if (bSkill)
@@ -1287,6 +1320,9 @@
                    //强制交换塔的时候检查自身充能条
                    newTower1.CheckCtrl();
                    newTower2.CheckCtrl();
                    //Debug.Log($"newTower1:{newTower1.towerName}  newTower2:{newTower2.towerName}");

                    TowerPlacementGridEndless.instance.PlayPutPs(newTower2.gridPosition.x, newTower2.gridPosition.y);
                    return true;
                }
            }
@@ -1697,6 +1733,7 @@
        public void PlayUpgradeEffect(Tower newTower)
        {
            newTower.CurrentTowerLevel.PlayUpGradeEffect();
            AudioSourceManager.Ins.Play(AudioEnum.Upgrade);
        }

        /// <summary>