From 56f231f1f6523d7920cf32f033f9bb6f0015550f Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 28 Oct 2020 18:05:11 +0800
Subject: [PATCH] Merge commit '8380b3c000a04bd9bf6dfc11fd8337c1563ad265' into master
---
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
index 6045c3c..cff3ab6 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
@@ -160,6 +160,8 @@
/// </summary>
private bool isFirstLevelCompleted = false;
+ private bool isStopSecondWaveCompleted = false;
+
/// <summary>
/// 切换基地
/// </summary>
@@ -312,7 +314,7 @@
if (EndlessLeveltate == LevelState.SpawningEnemies && IsAllWaveCompleted && NumberOfEnemies == 0)
{
// 新手的话，第一关完了暂停
- if (!GameConfig.IsNewbie)
+ if (!GameConfig.IsNewbie || GameConfig.IsNewbieGuideCompleted)
{
if (!UpdateLevel())
ChangeLevelState(LevelState.AllEnemiesSpawned);
@@ -367,6 +369,17 @@
StartCoroutine(DelayToNextLevel());
return true;
+ }
+
+ /// <summary>
+ /// 新手更新关卡
+ /// </summary>
+ public void NewbieUpdateLevel()
+ {
+ ++CurrentLevel;
+ IsAllWaveCompleted = false;
+ EndlessUIStart.instance.Restart();
+ WaveManager.StartWaves(CurrentLevel);
}
/// <summary>
@@ -539,5 +552,19 @@
WaveManager.RestartAllWave();
EndlessGameUI.instance.SetAttackingTowerState(true);
}
+
+ /// <summary>
+ /// 停止第二关波次
+ /// </summary>
+ public void StopSecondWave()
+ {
+ Debug.LogError("--------------------- 停止第二关出怪 ---------------------");
+ if (!isStopSecondWaveCompleted)
+ {
+ isStopSecondWaveCompleted = true;
+ PauseWave();
+ }
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.SkillStep);
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1