From 9abbdf408daf5bc140ffd039125f6ac54f2774b9 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Fri, 06 Nov 2020 10:13:55 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle
---
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
index 05d2c6f..1ffb283 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
@@ -144,7 +144,7 @@
/// <param name="level"></param>
public void InitPort(int level)
{
- EndlessPortData.InitPortList();
+ EndlessBuffData.InitEndlessBuffPool(level);
InitPortData(level);
InitWaveData();
RefreshBoss();
@@ -191,7 +191,6 @@
private void OnEndlessBossSummonEnd()
{
EventCenter.Ins.Remove((int)KTGMGemClient.EventType.EndlessBossSummonEnd, OnEndlessBossSummonEnd);
- EndlessBossCtrl.instance.ChangeState(EndlessBossActionState.Standing);
HideTunel();
RefreshFaZhen();
}
@@ -355,13 +354,15 @@
public void Update()
{
+ if (EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return;
+
if (faZhenRefreshTimer != null)
{
if (faZhenRefreshTimer.Tick(Time.deltaTime))
faZhenRefreshTimer = null;
}
- if (!isWaveStarted) return;
+ if (!isWaveStarted || EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return;
// 所有赛道都完成
if (CompletedWaveLine >= TotalWaveLines)
--
Gitblit v1.9.1