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 15:05:51 +08:00
parent 32a92bb0d0
commit 8fff4a8407
7 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/imserver/guild.cc
View File

@ -268,6 +268,10 @@ void Guild::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg)
ClearApplyBySenderId(msg.apply().base_data().account_id());
}
void Guild::_CMGuildRefuse(f8::MsgHdr& hdr, const cs::CMGuildRefuse& msg)
{
}
void Guild::_CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg)
{
ss::SS_IM_ForwardGuildCMMsg *forward_msg = (ss::SS_IM_ForwardGuildCMMsg*)hdr.user_data;

1
server/imserver/guild.h
View File

@ -19,6 +19,7 @@ public:
void _CMGuildInfo(f8::MsgHdr& hdr, const cs::CMGuildInfo& msg);
void _CMGuildJoin(f8::MsgHdr& hdr, const cs::CMGuildJoin& msg);
void _CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg);
void _CMGuildRefuse(f8::MsgHdr& hdr, const cs::CMGuildRefuse& msg);
void _CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg);
void _CMGuildQuit(f8::MsgHdr& hdr, const cs::CMGuildQuit& msg);
void _CMGuildDismiss(f8::MsgHdr& hdr, const cs::CMGuildDismiss& msg);

2
server/imserver/handlermgr.cc
View File

@ -107,6 +107,7 @@ void HandlerMgr::RegisterNetMsgHandlers()
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildCreate);
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildJoin);
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildAgree);
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildRefuse);
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildKick);
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildQuit);
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildDismiss);
@ -121,6 +122,7 @@ void HandlerMgr::RegisterNetMsgHandlers()
RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildInfo);
RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildJoin);
RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildAgree);
RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildRefuse);
RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildKick);
RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildQuit);
RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildDismiss);

12
server/imserver/player.cc
View File

@ -726,6 +726,18 @@ void Player::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg)
ForwardGuildCMMsg(hdr, GuildId());
}
void Player::_CMGuildRefuse(f8::MsgHdr& hdr, const cs::CMGuildRefuse& msg)
{
cs::SMGuildRefuse respmsg;
if (GuildId() == 0) {
respmsg.set_errcode(1);
respmsg.set_errmsg("你还没有公会");
SendMsg(respmsg);
return;
}
ForwardGuildCMMsg(hdr, GuildId());
}
void Player::_CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg)
{
cs::SMGuildKick respmsg;

1
server/imserver/player.h
View File

@ -99,6 +99,7 @@ class Player
void _CMGuildCreate(f8::MsgHdr& hdr, const cs::CMGuildCreate& msg);
void _CMGuildJoin(f8::MsgHdr& hdr, const cs::CMGuildJoin& msg);
void _CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg);
void _CMGuildRefuse(f8::MsgHdr& hdr, const cs::CMGuildRefuse& msg);
void _CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg);
void _CMGuildQuit(f8::MsgHdr& hdr, const cs::CMGuildQuit& msg);
void _CMGuildDismiss(f8::MsgHdr& hdr, const cs::CMGuildDismiss& msg);

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

@ -40,6 +40,7 @@ enum CMMessageId_e
_CMGuildApplyList = 242;
_CMGuildLog = 243;
_CMGuildMemberSetJob = 244;
_CMGuildRefuse = 245;
_CMGuildMsgEnd = 270;
_CMTeamCreate = 301;
@ -87,6 +88,7 @@ enum SMMessageId_e
_SMGuildApplyList = 242;
_SMGuildLog = 243;
_SMGuildMemberSetJob = 244;
_SMGuildRefuse = 245;
_SMGuildMsgEnd = 270;
_SMTeamCreate = 301;

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

@ -404,6 +404,17 @@ message SMGuildAgree
optional string errmsg = 2;
}
//拒绝加公会申请
message CMGuildRefuse
{
optional MFGuildApply apply = 1; //申请信息
}
message SMGuildRefuse
{
optional int32 errcode = 1;
optional string errmsg = 2;
}
//踢人
message CMGuildKick
{