diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc index fbdb24e..9b2be17 100644 --- a/server/imserver/guild.cc +++ b/server/imserver/guild.cc @@ -525,12 +525,7 @@ void Guild::_CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg) } } -void Guild::_CMGuildMemberPromote(f8::MsgHdr& hdr, const cs::CMGuildMemberPromote& msg) -{ - -} - -void Guild::_CMGuildMemberFire(f8::MsgHdr& hdr, const cs::CMGuildMemberFire& msg) +void Guild::_CMGuildMemberSetJob(f8::MsgHdr& hdr, const cs::CMGuildMemberSetJob& msg) { } diff --git a/server/imserver/guild.h b/server/imserver/guild.h index 11caf20..631ff7f 100644 --- a/server/imserver/guild.h +++ b/server/imserver/guild.h @@ -26,8 +26,7 @@ public: void _CMGuildMemberList(f8::MsgHdr& hdr, const cs::CMGuildMemberList& msg); void _CMGuildApplyList(f8::MsgHdr& hdr, const cs::CMGuildApplyList& msg); void _CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg); - void _CMGuildMemberPromote(f8::MsgHdr& hdr, const cs::CMGuildMemberPromote& msg); - void _CMGuildMemberFire(f8::MsgHdr& hdr, const cs::CMGuildMemberFire& msg); + void _CMGuildMemberSetJob(f8::MsgHdr& hdr, const cs::CMGuildMemberSetJob& msg); long long GuildId() { return guild_id_; } int GetMemberJob(const std::string& account_id); diff --git a/server/imserver/handlermgr.cc b/server/imserver/handlermgr.cc index 7476d99..1317227 100644 --- a/server/imserver/handlermgr.cc +++ b/server/imserver/handlermgr.cc @@ -115,8 +115,7 @@ void HandlerMgr::RegisterNetMsgHandlers() RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildRank); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildMemberList); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildLog); - RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildMemberPromote); - RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildMemberFire); + RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildMemberSetJob); RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildInfo); RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildJoin); @@ -128,8 +127,7 @@ void HandlerMgr::RegisterNetMsgHandlers() RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildMemberList); RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildApplyList); RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildLog); - RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildMemberPromote); - RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildMemberFire); + RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildMemberSetJob); } void HandlerMgr::ProcGMMsg(unsigned long saddr, int sockhandle, diff --git a/server/imserver/player.cc b/server/imserver/player.cc index 44eed5b..954b34f 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -925,12 +925,7 @@ void Player::_CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg) ForwardGuildCMMsg(hdr, GuildId()); } -void Player::_CMGuildMemberPromote(f8::MsgHdr& hdr, const cs::CMGuildMemberPromote& msg) -{ - -} - -void Player::_CMGuildMemberFire(f8::MsgHdr& hdr, const cs::CMGuildMemberFire& msg) +void Player::_CMGuildMemberSetJob(f8::MsgHdr& hdr, const cs::CMGuildMemberSetJob& msg) { } diff --git a/server/imserver/player.h b/server/imserver/player.h index bcdedab..0912e79 100644 --- a/server/imserver/player.h +++ b/server/imserver/player.h @@ -107,8 +107,7 @@ class Player void _CMGuildRank(f8::MsgHdr& hdr, const cs::CMGuildRank& msg); void _CMGuildMemberList(f8::MsgHdr& hdr, const cs::CMGuildMemberList& msg); void _CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg); - void _CMGuildMemberPromote(f8::MsgHdr& hdr, const cs::CMGuildMemberPromote& msg); - void _CMGuildMemberFire(f8::MsgHdr& hdr, const cs::CMGuildMemberFire& msg); + void _CMGuildMemberSetJob(f8::MsgHdr& hdr, const cs::CMGuildMemberSetJob& msg); void _SS_IM_FriendAgreeRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendAgreeRequest& msg); void _SS_IM_FriendDeleteRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendDeleteRequest& msg); diff --git a/server/tools/protobuild/cs_msgid.proto b/server/tools/protobuild/cs_msgid.proto index 890361f..7a26850 100644 --- a/server/tools/protobuild/cs_msgid.proto +++ b/server/tools/protobuild/cs_msgid.proto @@ -39,8 +39,7 @@ enum CMMessageId_e _CMGuildMemberList = 241; _CMGuildApplyList = 242; _CMGuildLog = 243; - _CMGuildMemberPromote = 244; - _CMGuildMemberFire = 245; + _CMGuildMemberSetJob = 244; _CMGuildMsgEnd = 270; _CMTeamCreate = 301; @@ -87,8 +86,7 @@ enum SMMessageId_e _SMGuildMemberList = 241; _SMGuildApplyList = 242; _SMGuildLog = 243; - _SMGuildMemberPromote = 244; - _SMGuildMemberFire = 245; + _SMGuildMemberSetJob = 244; _SMGuildMsgEnd = 270; _SMTeamCreate = 301; diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 24b0beb..d779892 100644 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -523,23 +523,18 @@ message SMGuildLog repeated MFStringTuple logs = 4; } -//提升公会成员地位 -message CMGuildMemberPromote +//设置公会成员职位 +message CMGuildMemberSetJob { optional string member_id = 1; //成员id optional int32 job = 2; //职位 } -message SMGuildMemberPromote -{ -} - -//解职 -message CMGuildMemberFire -{ - optional string member_id = 1; //成员id -} -message SMGuildMemberFire +message SMGuildMemberSetJob { + optional int32 errcode = 1; //错误码 + optional string errmsg = 2; //错误信息 + optional string member_id = 3; //成员id + optional int32 job = 4; //职位 } //发送聊天消息