From 45faee0adf3b5bc2ac051c2a0e08bb4ecf738aac Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Thu, 17 Dec 2020 14:31:17 +0800
Subject: [PATCH] Merge commit 'fe59d1a97e80284315bcdfa18a49059b38dfd137'
---
Assets/Scripts/TowerDefense/Level/EndlessWave.cs | 77 +++++++++++++++++++++++---------------
1 files changed, 46 insertions(+), 31 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWave.cs b/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
index e30e180..098d330 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
@@ -6,6 +6,7 @@
using TowerDefense.Agents;
using TowerDefense.Agents.Data;
using TowerDefense.Nodes;
+using TowerDefense.UI.HUD;
namespace TowerDefense.Level
{
@@ -50,11 +51,6 @@
/// 有新的敌人生成
/// </summary>
public event Action SpawnNewAgent;
-
- /// <summary>
- /// 波次发生改变
- /// </summary>
- public event Action WaveChanged;
/// <summary>
/// 怪出生开始节点
@@ -108,21 +104,32 @@
public void PauseWave()
{
PauseTimer(spawnTimer);
- isWaveStoped = true;
}
public void RestartWave()
{
- StartTimer(spawnTimer);
- isWaveStoped = false;
+ if (spawnTimer != null)
+ StartTimer(spawnTimer);
}
- /// <summary>
- /// Handles spawning the current agent and sets up the next agent for spawning
- /// 在场景内孵化出来一个Boss，这个核心函数最后被规则性的数据接管
- /// </summary>
protected virtual void SpawnCurrent()
{
+ if (EndlessGameUI.instance.state == EndlessGameUI.State.GameOver)
+ {
+ StopWave();
+ // 让所有兵线上已经生成的所有agent播放一个死亡动画然后销毁
+ WaveLineAgentInsMgr[] waveLineAgentIns = AgentInsManager.instance.GetWaveLineList();
+
+ for (int i = 0; i < waveLineAgentIns.Length; ++i)
+ {
+ while (waveLineAgentIns[i].listAgent.Count > 0)
+ {
+ waveLineAgentIns[i].listAgent[0].PlayDeath();
+ }
+ }
+ return;
+ }
+
if (isWaveStoped) return;
if (!TrySetupNextSpawn())
@@ -134,8 +141,15 @@
else
{
++spawnedEnemies;
+
if (SpawnNewAgent != null)
SpawnNewAgent();
+
+ if (spawnedEnemies >= waveData.Config.amount)
+ {
+ StopWave();
+ SafelyBroadcastWaveCompletedEvent();
+ }
}
}
@@ -145,12 +159,16 @@
/// <returns>Agent</returns>
protected virtual void SpawnAgent()
{
- int index = GetIndexByResId(waveData.EnemyData.resource);
- // 木属性小怪需要同时生成两个，先这么写吧（WTF）
- bool isDouble = waveData.EnemyData.resource == 103;
+ endless_enemy enemyData = waveData.EnemyDataList[waveData.Config.enemy_id > 0 ? 0 : spawnedEnemies];
- Poolable agentPoolable = Poolable.TryGetPoolable<Poolable>(AgentConfigurationList[index].agentPrefab.gameObject);
- Agent newAgent = agentPoolable.GetComponent<Agent>();
+ int index = GetIndexByResId(enemyData.resource);
+
+ // 木属性小怪需要同时生成两个，先这么写吧（WTF）
+ bool isDouble = enemyData.resource == 103;
+ GameObject prefab = Resources.Load<GameObject>($"Prefabs/Enemies/{enemyData.resource}");
+ GameObject obj = Instantiate(prefab);
+ Agent newAgent = obj.GetComponent<Agent>();
+ newAgent.EnemyData = enemyData;
newAgent.transform.position = StartingNode.transform.position;
if (isDouble)
@@ -166,21 +184,19 @@
newAgent.Initialize();
// 最终血量 = 基础血量 * 血量增幅，速度和金币都是一个公式
- float hp = waveData.Config.b_hp * waveData.EnemyData.hp_rate;
- float speed = waveData.Config.b_speed * waveData.EnemyData.speed_rate;
- int gold = waveData.Config.b_coin * waveData.EnemyData.coin_rate;
+ float hp = waveData.Config.b_hp * enemyData.hp_rate;
+ float speed = waveData.Config.b_speed * enemyData.speed_rate;
+ int gold = waveData.Config.b_coin * enemyData.coin_rate;
newAgent.SetAgentData(hp, speed, gold);
- // todo 这里先填1级后面需要修改
- newAgent.healthBar.SetHealthLevel(1);
// 加入Manager统一管理.
AgentInsManager.instance.addAgent(newAgent);
-
if (isDouble)
{
- Poolable agentPoolable2 = Poolable.TryGetPoolable<Poolable>(AgentConfigurationList[index].agentPrefab.gameObject);
- Agent doubleAgent = agentPoolable2.GetComponent<Agent>();
+ obj = Instantiate(prefab);
+ Agent doubleAgent = obj.GetComponent<Agent>();
+ doubleAgent.EnemyData = enemyData;
doubleAgent.transform.position = StartingNode.transform.position;
Vector3 pos = doubleAgent.transform.position;
@@ -193,17 +209,16 @@
doubleAgent.Initialize();
doubleAgent.SetAgentData(hp, speed, gold);
- doubleAgent.healthBar.SetHealthLevel(1);
AgentInsManager.instance.addAgent(doubleAgent);
}
}
/// <summary>
- /// 从Tower的AttributeId获取到怪物的数据
- /// </summary>
- /// <param name="id"></param>
- /// <returns></returns>
- protected List<int> GetMonsterDataFromAttributeId(int id)
+ /// 从Tower的AttributeId获取到怪物的数据
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ protected List<int> GetMonsterDataFromAttributeId(int id)
{
geminfo tgem = new geminfo();
if (JsonDataCenter.gemInfoDic.TryGetValue(id, out tgem))
--
Gitblit v1.9.1