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

weixudong

2020-11-19 69e0fea6c92fd4e153d45e5f26ef89baecf0405a

 Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs

@@ -142,6 +142,8 @@
        /// </summary>
        public List<Node> StartingNodeList;

        public List<Node> EndNodeList;

        /// <summary>
        /// 已经完成的关卡数量
        /// </summary>
@@ -170,7 +172,7 @@
        /// <summary>
        /// 赛道长度
        /// </summary>
        private float tunelLength = 31.94f;
        private float tunelLength;

        private List<Vector3> homeBasePositionList;

@@ -337,6 +339,7 @@
            EndlessGameUI.instance.GameOverEvent += SafelyCallLevelCompleted;

            homeBasePositionList = new List<Vector3>();
            tunelLength = Mathf.Abs(StartingNodeList[0].transform.position.z - EndNodeList[0].transform.position.z);

            for (int i = 0; i < StartingNodeList.Count; ++i)
            {
@@ -493,13 +496,14 @@
        }

        /// <summary>
        /// buff选择完成
        /// buff选择完成p
        /// </summary>
        /// <param name="index"></param>
        public void OnBuffSelectCompleted(int index)
        {
            isBuffSelectCompleted = false;
            EndlessBuffManager.instance.AddBuff(EndlessBuffData.GetBuffByIndex(index));
            EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessBuffRefresh);
        }

        /// <summary>
@@ -623,7 +627,6 @@
        /// </summary>
        public void StopSecondWave()
        {
            Debug.LogError("--------------------- 停止第二关出怪 ---------------------");
            if (!isStopSecondWaveCompleted)
            {
                isStopSecondWaveCompleted = true;