From af03e1ad530c4a8ea2423a7f5ed6b5533a8c308f Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Sat, 31 Oct 2020 17:27:02 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
index b0b994f..d534361 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
+++ b/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
--
Gitblit v1.9.1