From 60be8befe7f0ebfcdb66d00429d766f0e3c017a9 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 31 Aug 2022 11:28:30 +0800
Subject: [PATCH] 1

---
 server/gameserver/incubator.cc | 5 +++++
 server/gameserver/room.cc      | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/incubator.cc b/server/gameserver/incubator.cc
index e8a59656..e3f2d4ec 100644
--- a/server/gameserver/incubator.cc
+++ b/server/gameserver/incubator.cc
@@ -252,6 +252,9 @@ void Incubator::ActiveAndroid(Human* hum, Human* android)
 
 void Incubator::OnEnterNewWave(int wave)
 {
+#ifdef DEBUG
+    a8::XPrintf("OnEnterNewWave2 wave:%d \n", {wave});
+#endif
     if (room->IsGameOver()) {
         return;
     }
@@ -275,9 +278,11 @@ void Incubator::OnEnterNewWave(int wave)
         timeout_ = true;
         return;
     }
+    #if 0
     if (wave > 0 && room->IsSurvivalRoom()) {
         return;
     }
+    #endif
     if (wave + 1 < room->pve_mode_meta->waves.size()) {
         SpawnWaveMon(wave + 1);
     }
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index dfb9a090..01a39cc3 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -4129,9 +4129,9 @@ void Room::OnEnterNewWave(int wave)
         gas_data_.rad_old = gas_data_.old_area_meta->i->rad();
         gas_data_.rad_new = gas_data_.new_area_meta->i->rad();
         gas_data_.gas_progress = 0;
+    }
+    NotifyUiUpdate();
 #ifdef DEBUG
         a8::XPrintf("OnEnternerWave:%d\n", {wave});
 #endif
-        NotifyUiUpdate();
-    }
 }