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-28 10:14:34 +08:00
parent acc71ccd87
commit 8bde103bf5
7 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/imserver/guild.cc
View File

@ -461,6 +461,16 @@ 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::FillGuildBasic(cs::MFGuildBasic* guild_basic) void Guild::FillGuildBasic(cs::MFGuildBasic* guild_basic)
{ {
guild_basic->set_guild_id(guild_id_); guild_basic->set_guild_id(guild_id_);

2
server/imserver/guild.h
View File

@ -26,6 +26,8 @@ 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 _CMGuildMemberFire(f8::MsgHdr& hdr, const cs::CMGuildMemberFire& msg);
long long GuildId() { return guild_id_; } long long GuildId() { return guild_id_; }

4
server/imserver/handlermgr.cc
View File

@ -115,6 +115,8 @@ 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::_CMGuildMemberFire);
RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildInfo); RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildInfo);
RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildJoin); RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildJoin);
@ -126,6 +128,8 @@ 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::_CMGuildMemberFire);
} }
void HandlerMgr::ProcGMMsg(unsigned long saddr, int sockhandle, void HandlerMgr::ProcGMMsg(unsigned long saddr, int sockhandle,

10
server/imserver/player.cc
View File

@ -920,6 +920,16 @@ 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::_CMGuildMemberFire(f8::MsgHdr& hdr, const cs::CMGuildMemberFire& msg)
{
}
void Player::_SS_IM_FriendAgreeRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendAgreeRequest& msg) void Player::_SS_IM_FriendAgreeRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendAgreeRequest& msg)
{ {
if (!GetFriendById(msg.context().user_info().base_data().account_id())) { if (!GetFriendById(msg.context().user_info().base_data().account_id())) {

2
server/imserver/player.h
View File

@ -107,6 +107,8 @@ 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 _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);

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

@ -47,6 +47,8 @@ enum CMMessageId_e
_CMGuildMemberList = 241; _CMGuildMemberList = 241;
_CMGuildApplyList = 242; _CMGuildApplyList = 242;
_CMGuildLog = 243; _CMGuildLog = 243;
_CMGuildMemberPromote = 244;
_CMGuildMemberFire = 245;
_CMGuildMsgEnd = 270; _CMGuildMsgEnd = 270;
} }
@ -92,6 +94,8 @@ enum SMMessageId_e
_SMGuildMemberList = 241; _SMGuildMemberList = 241;
_SMGuildApplyList = 242; _SMGuildApplyList = 242;
_SMGuildLog = 243; _SMGuildLog = 243;
_SMGuildMemberPromote = 244;
_SMGuildMemberFire = 245;
_SMGuildMsgEnd = 270; _SMGuildMsgEnd = 270;
_SMUserStatusNotify = 501; _SMUserStatusNotify = 501;

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

@ -516,6 +516,25 @@ message SMGuildLog
repeated MFStringTuple logs = 4; repeated MFStringTuple logs = 4;
} }
//提升公会成员地位
message CMGuildMemberPromote
{
optional string member_id = 1; //成员id
optional int32 job = 2; //职位
}
message SMGuildMemberPromote
{
}
//解职
message CMGuildMemberFire
{
optional string member_id = 1; //成员id
}
message SMGuildMemberFire
{
}
//发送聊天消息 //发送聊天消息
message CMSendChatMsg message CMSendChatMsg
{ {