From c4b8dbd94f555b599bc847b7fa8a2e1c6caf31e1 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Wed, 21 Oct 2020 10:53:37 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle
---
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
index dc7c1ca..725bed7 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
@@ -30,7 +30,7 @@
/// <summary>
/// 当前波索引
/// </summary>
- protected int currentWaveIndex;
+ public int CurrentWaveIndex { get; protected set; }
/// <summary>
/// 当前波数据
@@ -94,7 +94,7 @@
Level = level;
LevelData = EndlessPortData.GetLevelWaveData(level);
TotalWaves = LevelData.Count;
- currentWaveIndex = 0;
+ CurrentWaveIndex = 0;
EndlessBossHPManager.instance.InitHP();
EndlessLevelManager.instance.DecrementEnemies -= DecrementEnemies;
EndlessLevelManager.instance.DecrementEnemies += DecrementEnemies;
@@ -133,15 +133,14 @@
{
if (EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return;
-
- if (currentWaveIndex > 0)
- EndlessBossHPManager.instance.SwitchHP(currentWaveIndex == TotalWaves -1);
- EndlessBossHPManager.instance.UpdateWave(TotalWaves - currentWaveIndex);
+ if (CurrentWaveIndex > 0)
+ EndlessBossHPManager.instance.SwitchHP(CurrentWaveIndex == TotalWaves -1);
+ EndlessBossHPManager.instance.UpdateWave(TotalWaves - CurrentWaveIndex);
EndlessBossHPManager.instance.ShowHP();
- TotalEnemies = EndlessPortData.GetWaveEnemiesCount(Level, currentWaveIndex);
+ TotalEnemies = EndlessPortData.GetWaveEnemiesCount(Level, CurrentWaveIndex);
RemainEnemies = TotalEnemies;
- waveData = LevelData[currentWaveIndex];
+ waveData = LevelData[CurrentWaveIndex];
// 直接取第一条就行了
WaveInterval = waveData[0].Config.cooldown / 1000f;
TotalWaveLines = waveData.Count;
@@ -190,10 +189,10 @@
}
// 更新波索引
- ++currentWaveIndex;
+ ++CurrentWaveIndex;
EndlessBuffManager.instance.UpdateBuffList();
- if (currentWaveIndex >= TotalWaves)
+ if (CurrentWaveIndex >= TotalWaves)
// 当前关卡的所有波次全部完成
SafelyCallSpawningCompleted();
else
@@ -221,7 +220,7 @@
protected virtual void SafelyCallSpawningCompleted()
{
isWaveStarted = false;
- EndlessBossHPManager.instance.UpdateWave(TotalWaves - currentWaveIndex);
+ EndlessBossHPManager.instance.UpdateWave(TotalWaves - CurrentWaveIndex);
if (AllWaveCompleted != null)
AllWaveCompleted();
--
Gitblit v1.9.1