From 54181477c210344b037d88f17dbe2cddc5cbc930 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 02 Dec 2020 17:54:32 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

---
 Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
index d044f8c..d79cf06 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
@@ -395,12 +395,14 @@
 
             if (GameConfig.IsNewbie)
             {
-                if (EndlessUIStart.instance.beginDragStep && SpawnedTotalEnemies >= 3)
+                if (EndlessUIStart.instance.beginDragStep && SpawnedTotalEnemies >= 5)
                 {
+                    //Debug.Log("这里本来要做一大波敌人的,现在注释掉");
+
                     EndlessUIStart.instance.beginDragStep = false;
                     EndlessLevelManager.instance.StopSecondWave();
                 }
-                else if (EndlessUIStart.instance.guideThirdWaveStep)
+                else if (EndlessUIStart.instance.guideFourthWaveStep)
                 {
                     //Debug.Log($"当前波次是木属性的 总怪物数量:{TotalEnemies}  当前已经生成了:{SpawnedTotalEnemies * 2}");
                     if (TotalEnemies - (SpawnedTotalEnemies * 2) <= 0)
@@ -415,8 +417,8 @@
         IEnumerator BroadCastCreateThirdWaveDone()
         {
             yield return new WaitForSeconds(0.5f);
-            EndlessUIStart.instance.guideThirdWaveStep = false;
-            EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.CreateThirdWaveDone);
+            EndlessUIStart.instance.guideFourthWaveStep = false;
+            EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.CreateFourthWaveDone);
         }
 
         /// <summary>

--
Gitblit v1.9.1