From 1e2f3e0c4e45188af28a7c4e5d7b90bc70ca3bfc Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 17 Apr 2019 16:16:37 +0800
Subject: [PATCH] 1

---
 server/gameserver/constant.h           | 10 ++--------
 server/gameserver/room.cc              |  2 +-
 server/gameserver/room.h               |  1 -
 server/tools/protobuild/cs_proto.proto |  3 ++-
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h
index 0338666..37df83e 100755
--- a/server/gameserver/constant.h
+++ b/server/gameserver/constant.h
@@ -54,7 +54,8 @@ enum GasMode_e
 {
     GasInactive = 0,
     GasWaiting = 1,
-    GasMoving = 2
+    GasMoving = 2,
+    GasJump = 3
 };
 
 enum ActionType_e
@@ -84,13 +85,6 @@ enum InventorySlot_e
     IS_15XSCOPE  = 16,
 };
 
-enum RoomState_e
-{
-   RS_Inactive = 0,
-   RS_Waiting = 1,
-   RS_Moveing = 2
-};
-
 const char* const PROJ_NAME_FMT = "game%d_gameserver";
 const char* const PROJ_ROOT_FMT = "/data/logs/%s";
 
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 20384cb..308575f 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -903,7 +903,7 @@ void Room::OutputDebugLog()
                                    elapsed_time_,
                                    alive_count_,
                                    current_uniid,
-                                   state_,
+                                   (int)gas_data.gas_mode,
                                    accountid_hash_.size(),
                                    moveable_hash_.size(),
                                    uniid_hash_.size(),
diff --git a/server/gameserver/room.h b/server/gameserver/room.h
index 74fb0d9..ede1f42 100644
--- a/server/gameserver/room.h
+++ b/server/gameserver/room.h
@@ -98,7 +98,6 @@ private:
 
     int current_teamid = 0;
     unsigned short current_uniid = 0;
-    RoomState_e state_ = RS_Inactive;
 
     std::map<int, std::set<Human*>> team_hash_;
     std::map<std::string, Player*> accountid_hash_;
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index e73f078..9a86fae 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -398,10 +398,11 @@ message MFGasData
 {
     /*
       0: 进入战前准备
+      3：跳伞状态
       1: 辐射区将在多少时间后扩大
       2: 辐射区正在扩大
      */
-    optional int32 mode = 1; //0:inactive 1:waiting 2:moving
+    optional int32 mode = 1; //0:inactive 1:waiting 2:moving 3:jump
     optional float duration = 2; //持续时间(秒)
     optional MFVector2D pos_old = 3; //前一个圆心
     optional MFVector2D pos_new = 4; //新圆心