diff --git a/server/gameserver/metamgr.h b/server/gameserver/metamgr.h index 2c445f5..d22470c 100755 --- a/server/gameserver/metamgr.h +++ b/server/gameserver/metamgr.h @@ -52,6 +52,9 @@ class MetaMgr : public a8::Singleton int newbie_gas_inactive_time = 5; int midbrid_gas_inactive_time = 15; int common_gas_inactive_time = 15; + int zbmode_gas_inactive_time = 15; + int zbmode_game_duration = 60 * 2; + int zbmode_player_num = 15; int jump_time = 10; float K = 100.0f; float kill_param = 0.0f; diff --git a/server/tools/protobuild/cs_msgid.proto b/server/tools/protobuild/cs_msgid.proto index 774d470..d6943ef 100644 --- a/server/tools/protobuild/cs_msgid.proto +++ b/server/tools/protobuild/cs_msgid.proto @@ -40,4 +40,5 @@ enum SMMessageId_e _SMWxVoip = 1011; _SMUiUpdate = 1012; _SMGameStart = 1013; + _SMSysPiaoMsg = 1014; } diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 2167084..502dc6a 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -87,6 +87,12 @@ message MFPair64 optional int64 value = 2; //val } +//int32元组 +message MFTuple +{ + repeated int32 values = 1; //values +} + //向量 message MFVec2 { @@ -209,6 +215,11 @@ message MFPlayerFull optional int32 revive_countdown = 31; //复活倒计时 optional string killer_name = 32; //杀手名称 optional int32 killer_id = 33; //杀手id(自杀时为自己) 特殊id: -1:倒在安全区 + + //一下字段只有僵尸模式才有效 + optional int32 level = 41; //等级 + optional int32 exp = 42; //经验 + optional int32 race = 43; //1:人 2:僵尸 } //阻挡物-部分 @@ -713,6 +724,7 @@ message CMJoin optional int64 user_value3 = 33; //对应好友系统的user_value3 optional bool force_entry_newbie_room = 50; //是否强制进新手房 repeated MFTeamMember team_members = 51; //包括自己 + optional int32 room_mode = 52; //0:吃鸡模式 1:僵尸模式 } //移动 @@ -838,6 +850,7 @@ message SMJoinedNotify optional bool elo_start = 6; //目前没用到 optional int32 error_code = 7; //错误 1:服务器维护中 2:服务器繁忙请稍后再进入 + optional int32 room_mode = 8; //0:吃鸡模式 1:僵尸模式 } //地图信息 @@ -878,6 +891,9 @@ message SMUpdate optional MFPlane plane = 27; //飞机 repeated MFBuffChg chged_buff_list = 28; //buff变更列表 repeated MFPropertyChg chged_property_list = 31; //property变更列表 + + repeated int32 revive_objids = 41; //复活的玩家 + repeated MFTuple dead_objs = 42; //死亡的玩家values[0]:objid values[1]:多少毫秒后复活 } //滚动消息 @@ -945,9 +961,21 @@ message SMUiUpdate optional int32 alive_count = 1; //存活数量 optional int32 kill_count = 2; //击杀数 repeated MFCar car_list = 3; //载具列表 + + //一下字段只有在僵尸模式有效 + optional int32 zombie_num = 10; //僵尸数 + optional int32 human_num = 11; //人类数 } //游戏开始 message SMGameStart { } + +//系统飘字 +message SMSysPiaoMsg +{ + optional string msg = 1; //消息内容 + optional int32 color = 2; //字体颜色rgb + optional int32 duration = 3; //持续时间(毫秒) +}