From 42e3011811195611a50b9c562a98a0147803c8af Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 29 Dec 2023 16:12:12 +0800
Subject: [PATCH 1/2] 1

---
 server/gameserver/room.cc    | 3 +++
 server/gameserver/roommgr.cc | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 136dd49a..0048d156 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -2408,6 +2408,9 @@ long long Room::GetGasInactiveTime()
         inactive_time = 12;
     }
 #endif
+    if (IsMobaModeRoom()) {
+        inactive_time = 12;
+    }
     inactive_time = std::max((long long)0, inactive_time - acc_inactive_time_);
     if (IsNewerMap()) {
         inactive_time = 10;
diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index 8bee2991..8554da19 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -834,7 +834,7 @@ void RoomMgr::AdjustCMJoin(cs::CMJoin* msg)
 {
     msg->set_force_enter_newbie_room(false);
     msg->set_pve_instance_id(0);
-#ifdef MYDEBUG
+#if 1
     const mt::Map* map_meta = mt::Map::GetById(msg->mapid());
     if (map_meta && map_meta->is_moba()) {
         msg->set_room_mode(kMobaMode);

From 2f6d753f2f24a8894ef00c031e1a27ef1731cccf Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 29 Dec 2023 16:23:23 +0800
Subject: [PATCH 2/2] 1

---
 server/gameserver/room.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 0048d156..23396aa9 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -331,9 +331,6 @@ void Room::AddPlayer(Player* hum, std::shared_ptr<BornPoint> init_born_point, bo
     if (!no_matchteam) {
         MatchTeam(hum);
     }
-#ifdef MYDEBUG
-    hum->side = a8::RandEx(1, 2);
-#endif
     hum->PushJoinRoomMsg();
     ++alive_count_;
     alive_count_chged_frameno_ = GetFrameNo();
@@ -354,6 +351,7 @@ void Room::AddPlayer(Player* hum, std::shared_ptr<BornPoint> init_born_point, bo
     }
 #if 1
     if (IsMobaModeRoom()) {
+        hum->side = a8::RandEx(1, 2);
         CreateAndroid(7);
         std::vector<Human*> humans;
         for (auto& pair : human_hash_) {
@@ -2409,7 +2407,7 @@ long long Room::GetGasInactiveTime()
     }
 #endif
     if (IsMobaModeRoom()) {
-        inactive_time = 12;
+        inactive_time = 7;
     }
     inactive_time = std::max((long long)0, inactive_time - acc_inactive_time_);
     if (IsNewerMap()) {