From a513db5c0ad65636c90996ed86fd098b05f13659 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 21 Apr 2023 19:55:05 +0800
Subject: [PATCH] 1

---
 server/gameserver/guide.cc   | 8 ++++++++
 server/gameserver/roommgr.cc | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/guide.cc b/server/gameserver/guide.cc
index 03f326c7..3e5d242f 100644
--- a/server/gameserver/guide.cc
+++ b/server/gameserver/guide.cc
@@ -25,15 +25,23 @@ void Guide::Init(Human* owner)
     }
     curr_step_idx_ = 0;
     UpdateStep();
+    #if 0
     owner_->room->xtimer.SetTimeoutEx
         (
+         #ifdef DEBUG
+         SERVER_FRAME_RATE * 1,
+         #else
          SERVER_FRAME_RATE * 60 * 10,
+         #endif
          [this] (int event, const a8::Args* args)
          {
              if (a8::TIMER_EXEC_EVENT == event) {
+                 finished_ = true;
+                 owner_->SendNewBieEnd();
              }
          },
          &owner_->xtimer_attacher);
+    #endif
 }
 
 void Guide::UpdateStep()
diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index 8205052f..5e5b4abf 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -866,7 +866,7 @@ void RoomMgr::SetMatchMode(int mode)
 
 void RoomMgr::AdjustCMJoin(cs::CMJoin* msg)
 {
-#if 1
+#if 0
 #ifdef DEBUG
 #ifdef NEWBIE_ROOM
     msg->set_force_enter_newbie_room(true);