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

1

Browse Source
This commit is contained in:
aozhiwei 2020-09-29 10:44:52 +08:00
parent 53bcf2bc04
commit 2e4b6f38db
7 changed files with 15 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/imserver/guild.cc
View File

@ -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::_CMGuildMemberSetJob(f8::MsgHdr& hdr, const cs::CMGuildMemberSetJob& msg)
{
}
void Guild::_CMGuildMemberFire(f8::MsgHdr& hdr, const cs::CMGuildMemberFire& msg)
{ {
} }

3
server/imserver/guild.h
View File

@ -26,8 +26,7 @@ public:
void _CMGuildMemberList(f8::MsgHdr& hdr, const cs::CMGuildMemberList& msg); void _CMGuildMemberList(f8::MsgHdr& hdr, const cs::CMGuildMemberList& msg);
void _CMGuildApplyList(f8::MsgHdr& hdr, const cs::CMGuildApplyList& msg); void _CMGuildApplyList(f8::MsgHdr& hdr, const cs::CMGuildApplyList& msg);
void _CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg); void _CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg);
void _CMGuildMemberPromote(f8::MsgHdr& hdr, const cs::CMGuildMemberPromote& msg); void _CMGuildMemberSetJob(f8::MsgHdr& hdr, const cs::CMGuildMemberSetJob& msg);
void _CMGuildMemberFire(f8::MsgHdr& hdr, const cs::CMGuildMemberFire& msg);
long long GuildId() { return guild_id_; } long long GuildId() { return guild_id_; }
int GetMemberJob(const std::string& account_id); int GetMemberJob(const std::string& account_id);

6
server/imserver/handlermgr.cc
View File

@ -115,8 +115,7 @@ void HandlerMgr::RegisterNetMsgHandlers()
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildRank); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildRank);
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildMemberList); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildMemberList);
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildLog); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildLog);
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildMemberPromote); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildMemberSetJob);
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildMemberFire);
RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildInfo); RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildInfo);
RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildJoin); RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildJoin);
@ -128,8 +127,7 @@ void HandlerMgr::RegisterNetMsgHandlers()
RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildMemberList); RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildMemberList);
RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildApplyList); RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildApplyList);
RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildLog); RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildLog);
RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildMemberPromote); RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildMemberSetJob);
RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildMemberFire);
} }
void HandlerMgr::ProcGMMsg(unsigned long saddr, int sockhandle, void HandlerMgr::ProcGMMsg(unsigned long saddr, int sockhandle,

7
server/imserver/player.cc
View File

@ -925,12 +925,7 @@ void Player::_CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg)
ForwardGuildCMMsg(hdr, GuildId()); ForwardGuildCMMsg(hdr, GuildId());
} }
void Player::_CMGuildMemberPromote(f8::MsgHdr& hdr, const cs::CMGuildMemberPromote& msg) void Player::_CMGuildMemberSetJob(f8::MsgHdr& hdr, const cs::CMGuildMemberSetJob& msg)
{
}
void Player::_CMGuildMemberFire(f8::MsgHdr& hdr, const cs::CMGuildMemberFire& msg)
{ {
} }

3
server/imserver/player.h
View File

@ -107,8 +107,7 @@ class Player
void _CMGuildRank(f8::MsgHdr& hdr, const cs::CMGuildRank& msg); void _CMGuildRank(f8::MsgHdr& hdr, const cs::CMGuildRank& msg);
void _CMGuildMemberList(f8::MsgHdr& hdr, const cs::CMGuildMemberList& msg); void _CMGuildMemberList(f8::MsgHdr& hdr, const cs::CMGuildMemberList& msg);
void _CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg); void _CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg);
void _CMGuildMemberPromote(f8::MsgHdr& hdr, const cs::CMGuildMemberPromote& msg); void _CMGuildMemberSetJob(f8::MsgHdr& hdr, const cs::CMGuildMemberSetJob& msg);
void _CMGuildMemberFire(f8::MsgHdr& hdr, const cs::CMGuildMemberFire& msg);
void _SS_IM_FriendAgreeRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendAgreeRequest& 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); void _SS_IM_FriendDeleteRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendDeleteRequest& msg);

6
server/tools/protobuild/cs_msgid.proto
View File

@ -39,8 +39,7 @@ enum CMMessageId_e
_CMGuildMemberList = 241; _CMGuildMemberList = 241;
_CMGuildApplyList = 242; _CMGuildApplyList = 242;
_CMGuildLog = 243; _CMGuildLog = 243;
_CMGuildMemberPromote = 244; _CMGuildMemberSetJob = 244;
_CMGuildMemberFire = 245;
_CMGuildMsgEnd = 270; _CMGuildMsgEnd = 270;
_CMTeamCreate = 301; _CMTeamCreate = 301;
@ -87,8 +86,7 @@ enum SMMessageId_e
_SMGuildMemberList = 241; _SMGuildMemberList = 241;
_SMGuildApplyList = 242; _SMGuildApplyList = 242;
_SMGuildLog = 243; _SMGuildLog = 243;
_SMGuildMemberPromote = 244; _SMGuildMemberSetJob = 244;
_SMGuildMemberFire = 245;
_SMGuildMsgEnd = 270; _SMGuildMsgEnd = 270;
_SMTeamCreate = 301; _SMTeamCreate = 301;

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

@ -523,23 +523,18 @@ message SMGuildLog
repeated MFStringTuple logs = 4; repeated MFStringTuple logs = 4;
} }
//提升公会成员地位 //设置公会成员职位
message CMGuildMemberPromote message CMGuildMemberSetJob
{ {
optional string member_id = 1; //成员id optional string member_id = 1; //成员id
optional int32 job = 2; //职位 optional int32 job = 2; //职位
} }
message SMGuildMemberPromote message SMGuildMemberSetJob
{
}
//解职
message CMGuildMemberFire
{
optional string member_id = 1; //成员id
}
message SMGuildMemberFire
{ {
optional int32 errcode = 1; //错误码
optional string errmsg = 2; //错误信息
optional string member_id = 3; //成员id
optional int32 job = 4; //职位
} }
//发送聊天消息 //发送聊天消息