From 243d65af53aae9e3084f20ea9c5815f5b29df09e Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Thu, 26 Nov 2020 18:26:58 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
index 4e5c43b..a2b3a60 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
@@ -313,6 +313,7 @@
return waves[waveline].StartingNode.GetNextNode().transform.position;
}
+
private void RefreshBoss()
{
if (CurrentWaveIndex > 0 || TotalWaves == 1)
@@ -322,6 +323,12 @@
EndlessBossHPManager.instance.UpdateWave(TotalWaves - CurrentWaveIndex);
EndlessBossHPManager.instance.ShowHP();
EndlessScoreManager.instance.ShowScore();
+ EndlessLevelManager.instance.DropRate = EndlessPortData.GetDropRate(Level, CurrentWaveIndex);
+ reward tmpData = EndlessPortData.GetDropReward(Level, CurrentWaveIndex);
+ //if(tmpData!=null && tmpData.type == Protobuf.CURRENCY.Arenaexp)//暂时没法判断，需要新加字段
+ if (tmpData != null)
+ EndlessLevelManager.instance.DropCoin = tmpData != null ? tmpData.count : 0;
+
}
/// <summary>
@@ -391,12 +398,18 @@
//Debug.Log($"当前波次是木属性的 总怪物数量：{TotalEnemies} 当前已经生成了：{SpawnedTotalEnemies * 2}");
if (TotalEnemies - (SpawnedTotalEnemies * 2) <= 0)
{
- Debug.Log("第三波生成完毕");
- EndlessUIStart.instance.guideThirdWaveStep = false;
- EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.CreateThirdWaveDone);
+ Debug.Log("延迟第三波生成完毕");
+ StartCoroutine(BroadCastCreateThirdWaveDone());
}
}
}
+ }
+
+ IEnumerator BroadCastCreateThirdWaveDone()
+ {
+ yield return new WaitForSeconds(0.5f);
+ EndlessUIStart.instance.guideThirdWaveStep = false;
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.CreateThirdWaveDone);
}
/// <summary>
@@ -406,8 +419,7 @@
{
foreach (EndlessPortConfig data in waveData)
{
- if (waves[data.Config.tunel - 1].LineState == EndlessWaveLineState.Spawning)
- waves[data.Config.tunel - 1].PauseWave();
+ waves[data.Config.tunel - 1].PauseWave();
}
}
--
Gitblit v1.9.1