解决冲突

chenxin

2020-10-31 a1f0653ec48d7787e0d57cabef0600b2a07355eb

 Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs

@@ -23,6 +23,12 @@
    public class EndlessLevelManager : Singleton<EndlessLevelManager>
    {
        /// <summary>
        /// 起始关卡
        /// </summary>
        /// <value></value>
        protected int startLevel { get; set; } = 1;

        /// <summary>
        /// 当前的关卡等级
        /// </summary>
        public int CurrentLevel { get; set; } = 1;
@@ -303,11 +309,13 @@
                CurrencyGainer.Tick(Time.deltaTime);
            }

            // buff选择完成，开始波次
            if (!isBuffSelectCompleted)
            {
                isBuffSelectCompleted = true;
                WaveManager.StartWaves(CurrentLevel);
                WaveManager.InitPort(CurrentLevel);
                EndlessUIStart.instance.Restart();
                WaveManager.StartWaves(CurrentLevel);
            }

            // 本关卡所有波次全部生成完成 && 敌人全部被清理了，然后就去尝试进入下一关
@@ -377,6 +385,7 @@
        public void NewbieUpdateLevel()
        {
            ++CurrentLevel;
            WaveManager.InitPort(CurrentLevel);
            IsAllWaveCompleted = false;
            EndlessUIStart.instance.Restart();
            WaveManager.StartWaves(CurrentLevel);
@@ -399,6 +408,9 @@
        {
            if (EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return;

            if (CurrentLevel == startLevel)
                WaveManager.InitPort(CurrentLevel);

            if (!GameConfig.IsNewbie)
                ShowSelectBuffUI();
            else