From b613141b8937c348b0e6e97f645543a5d00c72b3 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 20 Aug 2021 06:06:59 +0000
Subject: [PATCH] 1

---
 server/gameserver/app.h           |  3 +++
 server/gameserver/player.cc       |  2 ++
 server/gameserver/room.cc         |  3 ++-
 server/gameserver/roomobstacle.cc | 10 +++++++++-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/app.h b/server/gameserver/app.h
index 26ab7fb..25ac9ed 100644
--- a/server/gameserver/app.h
+++ b/server/gameserver/app.h
@@ -11,6 +11,9 @@ private:
     friend class a8::Singleton<App>;
 
 public:
+    #ifdef DEBUG
+    std::map<int, int> debug_params;
+    #endif
 
     bool Init(int argc, char* argv[]);
     void UnInit();
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index e5804c6..efb3531 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -1245,6 +1245,8 @@ void Player::_CMExecCommand(f8::MsgHdr& hdr, const cs::CMExecCommand& msg)
         SendDebugMsg(a8::Format("attr_id:%d abs_val:%f rate_val:%f", {attr_id, abs_val, rate_val}));
     } else if (cmd == "bufflist") {
         SendDebugMsg(DebugOutBuffList());
+    } else if (cmd == "set_inactive_time" && cmds.size() >= 2) {
+        App::Instance()->debug_params[1] = a8::XValue(cmds[1]);
     } else if (cmd == "reset_skill" && cmds.size() >= 2) {
         int skill_id = a8::XValue(cmds[1]);
         Skill* skill = GetSkill(skill_id);
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index e752554..6b47ac1 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -2422,7 +2422,8 @@ ObstacleData* Room::GetPermanentObstacleData(int obstacle_uniid)
 long long Room::GetGasInactiveTime()
 {
 #ifdef DEBUG
-    return f8::IsOnlineEnv() ? 10 : 10;
+    return App::Instance()->debug_params.find(1) != App::Instance()->debug_params.end() ?
+        App::Instance()->debug_params[1] : 10;
 #endif
     if (room_mode_ == kZombieMode) {
         #if DEBUG
diff --git a/server/gameserver/roomobstacle.cc b/server/gameserver/roomobstacle.cc
index 42f320a..b70aad3 100644
--- a/server/gameserver/roomobstacle.cc
+++ b/server/gameserver/roomobstacle.cc
@@ -584,5 +584,13 @@ void RoomObstacle::OnBattleStart(Room* room)
 
 void RoomObstacle::Destory()
 {
-
+    #if DEBUG
+    room->BroadcastDebugMsg(a8::Format("obstacle destory uniid:%d pos:%d,%d",
+                            {
+                             GetUniId(),
+                             GetPos().x,
+                             GetPos().y
+                            }));
+    #endif
+    DetachFromMaster();
 }