diff --git a/server/gameserver/handlermgr.cc b/server/gameserver/handlermgr.cc index cfa73f0b..1dd962d5 100644 --- a/server/gameserver/handlermgr.cc +++ b/server/gameserver/handlermgr.cc @@ -131,6 +131,7 @@ void HandlerMgr::RegisterNetMsgHandlers() RegisterNetMsgHandler(&ggmsghandler, &Player::_CMStowShield); RegisterNetMsgHandler(&ggmsghandler, &Player::_CMTeamMarkTargetPos); RegisterNetMsgHandler(&ggmsghandler, &Player::_CMSetRevivePosition); + RegisterNetMsgHandler(&ggmsghandler, &Player::_CMGetSettlementTeamList); } void HandlerMgr::ProcGMMsg(unsigned long saddr, int sockhandle, diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index a1de39ca..3fdb2fb0 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -1765,3 +1765,8 @@ void Player::_CMSetRevivePosition(f8::MsgHdr& hdr, const cs::CMSetRevivePosition { } + +void Player::_CMGetSettlementTeamList(f8::MsgHdr& hdr, const cs::CMGetSettlementTeamList& msg) +{ + +} diff --git a/server/gameserver/player.h b/server/gameserver/player.h index fff8f668..2ff18c34 100644 --- a/server/gameserver/player.h +++ b/server/gameserver/player.h @@ -25,6 +25,7 @@ namespace cs class MFGasData; class MFPair; class MFSettlement; + class CMGetSettlementTeamList; } class Room; @@ -137,6 +138,7 @@ class Player : public Human void _CMStowShield(f8::MsgHdr& hdr, const cs::CMStowShield& msg); void _CMTeamMarkTargetPos(f8::MsgHdr& hdr, const cs::CMTeamMarkTargetPos& msg); void _CMSetRevivePosition(f8::MsgHdr& hdr, const cs::CMSetRevivePosition& msg); + void _CMGetSettlementTeamList(f8::MsgHdr& hdr, const cs::CMGetSettlementTeamList& msg); virtual void SetAttackDir(const glm::vec3& attack_dir) override; void AsyncRequestWatchWar(bool send_rsp_msg); diff --git a/server/tools/protobuild/cs_msgid.proto b/server/tools/protobuild/cs_msgid.proto index 11597df3..999c6341 100644 --- a/server/tools/protobuild/cs_msgid.proto +++ b/server/tools/protobuild/cs_msgid.proto @@ -29,6 +29,7 @@ enum CMMessageId_e _CMTeamMarkTargetPos = 233; _CMRequestThrowDmg = 236; _CMSetRevivePosition = 237; + _CMGetSettlementTeamList = 238; } enum SMMessageId_e @@ -41,6 +42,7 @@ enum SMMessageId_e _SMWatchWar = 208; _SMLeave = 209; _SMMatchCancel = 218; + _SMGetSettlementTeamList = 238; _SMJoinedNotify = 103; _SMMapInfo = 1002; diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 7ad95b91..83729c76 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -311,6 +311,23 @@ message MFTeamMarkPos optional MFVec3 pos = 2; //位置 } +//结算队伍信息 +message MFSettlementTeam2 +{ + optional int32 team_id = 1; //队伍Id + optional int32 team_rank = 2; //队伍排名 + repeated MFSettlementMember members = 3; //成员列表 +} + +//结算队伍成员信息 +message MFSettlementMember2 +{ + optional int32 obj_uniid = 1; //唯一id + optional string account_id = 2; //账号id + optional string name = 3; //昵称 + optional int32 hero_id = 4 [default = 0]; //英雄id +} + //玩家信息-全量 message MFPlayerFull { @@ -1591,11 +1608,16 @@ message CMSetRevivePosition optional MFVec3 pos = 1; //子弹当前位置 } -//获取队伍列表 -message CMGetTeamList +//获取结算队伍列表 +message CMGetSettlementTeamList { } +message SMGetSettlementTeamList +{ + repeated MFSettlementTeam2 team_list = 1; //队伍列表 +} + //endcmmsg //观战error_code == 0 时关闭结算界面,回到战斗界面