From b37c8df72e1926292fc8ebe55fb1d9ba50e0a41b Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 22 Jul 2020 17:28:57 +0800
Subject: [PATCH] 1

---
 server/gameserver/metamgr.cc |  3 +++
 server/gameserver/room.cc    | 32 ++++++++++++++++++++------------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc
index ab98fc3..428da70 100755
--- a/server/gameserver/metamgr.cc
+++ b/server/gameserver/metamgr.cc
@@ -191,6 +191,9 @@ public:
             MetaMgr::Instance()->newbie_fill_interval = MetaMgr::Instance()->GetSysParamAsInt("newbie_fill_interval", 5000);
             MetaMgr::Instance()->other_fill_interval = MetaMgr::Instance()->GetSysParamAsInt("other_fill_interval", 2000);
             MetaMgr::Instance()->map_cell_width = MetaMgr::Instance()->GetSysParamAsInt("map_cell_width", 64 * 8);
+            METAMGR_READ(zbmode_gas_inactive_time, 25);
+            METAMGR_READ(zbmode_game_duration, 300);
+            METAMGR_READ(zbmode_player_num, 15);
             {
                 METAMGR_READ(newbie_first_robot_ammo, 3);
                 METAMGR_READ(newbie_first_robot_appeartime, 8);
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 973d3c9..a52b72d 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1796,16 +1796,20 @@ ObstacleData* Room::GetPermanentObstacleData(int obstacle_uniid)
 
 long long Room::GetGasInactiveTime()
 {
-    if (room_type_ == RT_NewBrid) {
-        if (creator_game_times_ <= 0) {
-            return MetaMgr::Instance()->newbie_gas_inactive_time;
-        } else {
-            return MetaMgr::Instance()->common_gas_inactive_time;
-        }
-    } else if (room_type_ == RT_MidBrid) {
-        return MetaMgr::Instance()->midbrid_gas_inactive_time;
+    if (room_mode_ == kZombieMode) {
+        return MetaMgr::Instance()->zbmode_gas_inactive_time;
     } else {
-        return MetaMgr::Instance()->gas_inactive_time;
+        if (room_type_ == RT_NewBrid) {
+            if (creator_game_times_ <= 0) {
+                return MetaMgr::Instance()->newbie_gas_inactive_time;
+            } else {
+                return MetaMgr::Instance()->common_gas_inactive_time;
+            }
+        } else if (room_type_ == RT_MidBrid) {
+            return MetaMgr::Instance()->midbrid_gas_inactive_time;
+        } else {
+            return MetaMgr::Instance()->gas_inactive_time;
+        }
     }
 }
 
@@ -2903,10 +2907,14 @@ bool Room::IsMiniRoom()
 
 size_t Room::GetRoomMaxPlayerNum()
 {
-    if (IsMiniRoom()) {
-        return MINI_ROOM_MAX_PLAYER_NUM;
+    if (room_mode_ == kZombieMode) {
+        return MetaMgr::Instance()->zbmode_player_num;
     } else {
-        return NORMAL_ROOM_MAX_PLAYER_NUM;
+        if (IsMiniRoom()) {
+            return MINI_ROOM_MAX_PLAYER_NUM;
+        } else {
+            return NORMAL_ROOM_MAX_PLAYER_NUM;
+        }
     }
 }