server/game2001
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2019-04-17 16:16:37 +08:00
parent cd4370948a
commit 1e2f3e0c4e
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/gameserver/constant.h
View File

@ -54,7 +54,8 @@ enum GasMode_e
{ {
GasInactive = 0, GasInactive = 0,
GasWaiting = 1, GasWaiting = 1,
GasMoving = 2 GasMoving = 2,
GasJump = 3
}; };
enum ActionType_e enum ActionType_e
@ -84,13 +85,6 @@ enum InventorySlot_e
IS_15XSCOPE = 16, 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_NAME_FMT = "game%d_gameserver";
const char* const PROJ_ROOT_FMT = "/data/logs/%s"; const char* const PROJ_ROOT_FMT = "/data/logs/%s";

2
server/gameserver/room.cc
View File

@ -903,7 +903,7 @@ void Room::OutputDebugLog()
elapsed_time_, elapsed_time_,
alive_count_, alive_count_,
current_uniid, current_uniid,
state_, (int)gas_data.gas_mode,
accountid_hash_.size(), accountid_hash_.size(),
moveable_hash_.size(), moveable_hash_.size(),
uniid_hash_.size(), uniid_hash_.size(),

1
server/gameserver/room.h
View File

@ -98,7 +98,6 @@ private:
int current_teamid = 0; int current_teamid = 0;
unsigned short current_uniid = 0; unsigned short current_uniid = 0;
RoomState_e state_ = RS_Inactive;
std::map<int, std::set<Human*>> team_hash_; std::map<int, std::set<Human*>> team_hash_;
std::map<std::string, Player*> accountid_hash_; std::map<std::string, Player*> accountid_hash_;

3
server/tools/protobuild/cs_proto.proto
View File

@ -398,10 +398,11 @@ message MFGasData
{ {
/* /*
0: 进入战前准备 0: 进入战前准备
3：跳伞状态
1: 辐射区将在多少时间后扩大 1: 辐射区将在多少时间后扩大
2: 辐射区正在扩大 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 float duration = 2; //持续时间(秒)
optional MFVector2D pos_old = 3; //前一个圆心 optional MFVector2D pos_old = 3; //前一个圆心
optional MFVector2D pos_new = 4; //新圆心 optional MFVector2D pos_new = 4; //新圆心