From 554eda43e00d5817cd3e06a60e39d4bd882ee584 Mon Sep 17 00:00:00 2001 From: chenxin <chenxin6991@163.com> Date: Wed, 25 Nov 2020 10:33:33 +0800 Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master --- Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs index 19235f0..1cc09b4 100644 --- a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs +++ b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs @@ -379,10 +379,23 @@ { ++SpawnedTotalEnemies; - if (GameConfig.IsNewbie && EndlessUIStart.instance.beginSkillStep && SpawnedTotalEnemies >= 8) + if (GameConfig.IsNewbie) { - EndlessUIStart.instance.beginSkillStep = false; - EndlessLevelManager.instance.StopSecondWave(); + if (EndlessUIStart.instance.beginDragStep && SpawnedTotalEnemies >= 3) + { + EndlessUIStart.instance.beginDragStep = false; + EndlessLevelManager.instance.StopSecondWave(); + } + else if (EndlessUIStart.instance.guideThirdWaveStep) + { + Debug.Log($"当前波次是木属性的 总怪物数量:{TotalEnemies} 当前已经生成了:{SpawnedTotalEnemies * 2}"); + if (TotalEnemies - (SpawnedTotalEnemies * 2) <= 0) + { + Debug.Log("第三波生成完毕"); + EndlessUIStart.instance.guideThirdWaveStep = false; + EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.CreateThirdWaveDone); + } + } } } -- Gitblit v1.9.1