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

weixudong

2020-11-19 69e0fea6c92fd4e153d45e5f26ef89baecf0405a

 Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs

@@ -6,7 +6,6 @@
using TowerDefense.Towers.Data;
using TowerDefense.Towers.Placement;
using UnityEngine;
using UnityEngine.UI;
using KTGMGemClient;
using System.Collections;
using System.Collections.Generic;
@@ -24,7 +23,7 @@
    {
        /// <summary>
        /// 起始关卡
        /// </summary>
        /// </summary>'
        /// <value></value>
        protected int startLevel { get; set; } = 1;

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

        public List<Node> EndNodeList;

        /// <summary>
        /// 已经完成的关卡数量
        /// </summary>
@@ -167,6 +168,51 @@
        private bool isFirstLevelCompleted = false;

        private bool isStopSecondWaveCompleted = false;

        /// <summary>
        /// 赛道长度
        /// </summary>
        private float tunelLength;

        private List<Vector3> homeBasePositionList;

        /// <summary>
        /// 根据赛道id（1~5）获得基地坐标
        /// </summary>
        /// <param name="tunelId"></param>
        /// <returns></returns>
        public Vector3 GetHomeBasePosition(int tunelId)
        {
            return homeBasePositionList[tunelId - 1];
        }

        /// <summary>
        /// 根据赛道id（1~5）和赛道类型获得世界坐标
        /// </summary>
        /// <param name="tunelId"></param>
        /// <param name="tunelType"></param>
        public Vector3 GetTunelWorldPosition(int tunelId, EndlessBossSkillTunelType tunelType)
        {
            Vector3 startPos = StartingNodeList[tunelId - 1].transform.position;
            Vector3 ret = new Vector3(startPos.x, startPos.y, startPos.z);
            float add = 0;

            switch (tunelType)
            {
                case EndlessBossSkillTunelType.Top:
                    break;
                case EndlessBossSkillTunelType.Center:
                    add = -(tunelLength / 2);
                    break;
                case EndlessBossSkillTunelType.Bottom:
                    add = -tunelLength;
                    break;
            }

            ret.z += add;

            return ret;
        }

        /// <summary>
        /// 切换基地
@@ -285,18 +331,25 @@
            // Iterate through home bases and subscribe
            NumberOfHomeBases = HomeBases.Length;
            NumberOfHomeBasesLeft = NumberOfHomeBases;

            for (int i = 0; i < NumberOfHomeBases; i++)
            {
                HomeBases[i].homebaseIdx = i % MAX_TOWER;
                HomeBases[i].died += OnHomeBaseDestroyed;
            }
        }

        private void Start()
        {
            EndlessBuffSelect.instance.BuffSelectCompleted += OnBuffSelectCompleted;
            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)
            {
                Vector3 startPos = StartingNodeList[i].transform.position;
                Vector3 pos = new Vector3();
                pos.x = startPos.x;
                pos.y = startPos.y;
                pos.z = startPos.z - tunelLength;
                homeBasePositionList.Add(pos);
            }
        }

        /// <summary>
@@ -304,6 +357,8 @@
        /// </summary>
        protected virtual void Update()
        {
            if (EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return;

            if (alwaysGainCurrency || !alwaysGainCurrency && EndlessLeveltate != LevelState.Building && EndlessLeveltate != LevelState.Intro)
            {
                CurrencyGainer.Tick(Time.deltaTime);
@@ -313,7 +368,8 @@
            if (!isBuffSelectCompleted)
            {
                isBuffSelectCompleted = true;
                WaveManager.InitPort(CurrentLevel);
                if (CurrentLevel > startLevel)
                    WaveManager.InitPort(CurrentLevel);
                EndlessUIStart.instance.Restart();
                WaveManager.StartWaves(CurrentLevel);
            }
@@ -346,12 +402,6 @@

            if (WaveManager != null)
                WaveManager.AllWaveCompleted -= AllWaveCompleted;

            // Iterate through home bases and unsubscribe
            for (int i = 0; i < NumberOfHomeBases; i++)
            {
                HomeBases[i].died -= OnHomeBaseDestroyed;
            }
        }

        /// <summary>
@@ -360,6 +410,12 @@
        protected virtual void AllWaveCompleted()
        {
            IsAllWaveCompleted = true;
            int score = EndlessPortData.GetLevelScore(CurrentLevel);
            Debug.Log($"--------------------- 通过第{CurrentLevel}关，+{score}分 ---------------------");
            // 关卡通过，加分
            EndlessScoreManager.instance.AddScore(score);
            EndlessBossSkillManager.instance.ClearSkillList();
            EndlessBossCtrl.instance.ChangeState(EndlessBossActionState.Death);
        }

        /// <summary>
@@ -397,7 +453,7 @@
        /// <returns></returns>
        private IEnumerator DelayToNextLevel()
        {
            yield return new WaitForSeconds(5f);
            yield return new WaitForSeconds(2f);
            BeginLevel();
        }

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