This commit is contained in:
aozhiwei 2023-09-25 17:26:56 +08:00
parent e7ad1756bf
commit bb02f6ee6d
5 changed files with 34 additions and 2 deletions

View File

@ -131,6 +131,7 @@ void HandlerMgr::RegisterNetMsgHandlers()
RegisterNetMsgHandler(&ggmsghandler, &Player::_CMStowShield); RegisterNetMsgHandler(&ggmsghandler, &Player::_CMStowShield);
RegisterNetMsgHandler(&ggmsghandler, &Player::_CMTeamMarkTargetPos); RegisterNetMsgHandler(&ggmsghandler, &Player::_CMTeamMarkTargetPos);
RegisterNetMsgHandler(&ggmsghandler, &Player::_CMSetRevivePosition); RegisterNetMsgHandler(&ggmsghandler, &Player::_CMSetRevivePosition);
RegisterNetMsgHandler(&ggmsghandler, &Player::_CMGetSettlementTeamList);
} }
void HandlerMgr::ProcGMMsg(unsigned long saddr, int sockhandle, void HandlerMgr::ProcGMMsg(unsigned long saddr, int sockhandle,

View File

@ -1765,3 +1765,8 @@ void Player::_CMSetRevivePosition(f8::MsgHdr& hdr, const cs::CMSetRevivePosition
{ {
} }
void Player::_CMGetSettlementTeamList(f8::MsgHdr& hdr, const cs::CMGetSettlementTeamList& msg)
{
}

View File

@ -25,6 +25,7 @@ namespace cs
class MFGasData; class MFGasData;
class MFPair; class MFPair;
class MFSettlement; class MFSettlement;
class CMGetSettlementTeamList;
} }
class Room; class Room;
@ -137,6 +138,7 @@ class Player : public Human
void _CMStowShield(f8::MsgHdr& hdr, const cs::CMStowShield& msg); void _CMStowShield(f8::MsgHdr& hdr, const cs::CMStowShield& msg);
void _CMTeamMarkTargetPos(f8::MsgHdr& hdr, const cs::CMTeamMarkTargetPos& msg); void _CMTeamMarkTargetPos(f8::MsgHdr& hdr, const cs::CMTeamMarkTargetPos& msg);
void _CMSetRevivePosition(f8::MsgHdr& hdr, const cs::CMSetRevivePosition& 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; virtual void SetAttackDir(const glm::vec3& attack_dir) override;
void AsyncRequestWatchWar(bool send_rsp_msg); void AsyncRequestWatchWar(bool send_rsp_msg);

View File

@ -29,6 +29,7 @@ enum CMMessageId_e
_CMTeamMarkTargetPos = 233; _CMTeamMarkTargetPos = 233;
_CMRequestThrowDmg = 236; _CMRequestThrowDmg = 236;
_CMSetRevivePosition = 237; _CMSetRevivePosition = 237;
_CMGetSettlementTeamList = 238;
} }
enum SMMessageId_e enum SMMessageId_e
@ -41,6 +42,7 @@ enum SMMessageId_e
_SMWatchWar = 208; _SMWatchWar = 208;
_SMLeave = 209; _SMLeave = 209;
_SMMatchCancel = 218; _SMMatchCancel = 218;
_SMGetSettlementTeamList = 238;
_SMJoinedNotify = 103; _SMJoinedNotify = 103;
_SMMapInfo = 1002; _SMMapInfo = 1002;

View File

@ -311,6 +311,23 @@ message MFTeamMarkPos
optional MFVec3 pos = 2; // 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 message MFPlayerFull
{ {
@ -1591,11 +1608,16 @@ message CMSetRevivePosition
optional MFVec3 pos = 1; // optional MFVec3 pos = 1; //
} }
// //
message CMGetTeamList message CMGetSettlementTeamList
{ {
} }
message SMGetSettlementTeamList
{
repeated MFSettlementTeam2 team_list = 1; //
}
//endcmmsg //endcmmsg
//error_code == 0 , //error_code == 0 ,