From ce7efae14eb31bcdfa0d540da6a1ef1457e046ab Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 04 Nov 2020 21:27:39 +0800
Subject: [PATCH] Merge commit '80b4237334a773b29bf69f38532a90ca659b3bfe' into master
---
Assets/Scripts/TowerDefense/Level/EndlessWave.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWave.cs b/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
index 024f0b4..294f232 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
@@ -112,10 +112,6 @@
isWaveStoped = false;
}
- /// <summary>
- /// Handles spawning the current agent and sets up the next agent for spawning
- /// 在场景内孵化出来一个Boss，这个核心函数最后被规则性的数据接管
- /// </summary>
protected virtual void SpawnCurrent()
{
if (isWaveStoped) return;
@@ -129,8 +125,15 @@
else
{
++spawnedEnemies;
+
if (SpawnNewAgent != null)
SpawnNewAgent();
+
+ if (spawnedEnemies >= waveData.Config.amount)
+ {
+ StopWave();
+ SafelyBroadcastWaveCompletedEvent();
+ }
}
}
@@ -170,7 +173,6 @@
newAgent.healthBar.SetHealthLevel(1);
// 加入Manager统一管理.
AgentInsManager.instance.addAgent(newAgent);
-
if (isDouble)
{
@@ -224,7 +226,7 @@
}
/// <summary>
- /// 暂时先这么处理
+ /// 暂时先这么处理 cx test
/// </summary>
/// <param name="resId">endless_enemy表的资源id</param>
/// <returns>所有可选的agent列表的索引</returns>
--
Gitblit v1.9.1