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-10-15 11:05:17 +08:00
parent c5b9b2570c
commit 7cc54022a5
4 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/imserver/player.cc
View File

@ -1232,6 +1232,7 @@ void Player::ReLogin(f8::MsgHdr& hdr, const cs::CMLogin& msg)
FillSMLogin(respmsg); FillSMLogin(respmsg);
WSListener::Instance()->SendToClient(hdr.socket_handle, 0, respmsg); WSListener::Instance()->SendToClient(hdr.socket_handle, 0, respmsg);
PlayerMgr::Instance()->ReBindSocket(hdr.socket_handle, this); PlayerMgr::Instance()->ReBindSocket(hdr.socket_handle, this);
SyncGuildMemberInfo();
} }
void Player::FillFriendList(::google::protobuf::RepeatedPtrField< ::cs::MFUserInfo >* friend_list) void Player::FillFriendList(::google::protobuf::RepeatedPtrField< ::cs::MFUserInfo >* friend_list)

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

@ -26,6 +26,7 @@ enum CMMessageId_e
_CMUpdateTempCustomData = 153; _CMUpdateTempCustomData = 153;
_CMUpdateUserInfo = 154; _CMUpdateUserInfo = 154;
_CMDirtyWordCheck = 155; _CMDirtyWordCheck = 155;
_CMGetUserGuild = 156;
_CMGuildMsgBegin = 230; _CMGuildMsgBegin = 230;
_CMGuildCreate = 231; _CMGuildCreate = 231;
@ -78,6 +79,7 @@ enum SMMessageId_e
_SMFriendIdList = 118; _SMFriendIdList = 118;
_SMDirtyWordCheck = 155; _SMDirtyWordCheck = 155;
_SMGetUserGuild = 156;
_SMGuildMsgBegin = 230; _SMGuildMsgBegin = 230;
_SMGuildCreate = 231; _SMGuildCreate = 231;

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

@ -112,6 +112,7 @@ message MFGuildBasic
optional int32 join_unlimited = 11; //不限制加入 optional int32 join_unlimited = 11; //不限制加入
optional int32 join_cond1 = 20; //加入条件1 optional int32 join_cond1 = 20; //加入条件1
optional int32 join_cond2 = 21; //加入条件2 optional int32 join_cond2 = 21; //加入条件2
optional int32 applyed = 22; //是否已申请
optional int32 _gameid = 100; //gameid optional int32 _gameid = 100; //gameid
optional int32 _channel = 101; //channel optional int32 _channel = 101; //channel
@ -181,6 +182,21 @@ message SMDirtyWordCheck
optional string errmsg = 2; //错误消息 optional string errmsg = 2; //错误消息
} }
//获取自己的公会信息
message CMGetUserGuild
{
optional string account_id = 1; //用户id，传空或不传获取自己
}
//获取自己
message SMGetUserGuild
{
optional int32 errcode = 1; //1:公会不存在
optional string errmsg = 2; //错误消息
optional string account_id = 3; //用户id，传空或不传获取自己
optional int64 guild_id = 4; //工会id(没有公会的话为0)
optional int32 guild_job = 5; //公会职位 1:公会长 2:副公会长 3：精英成员 其他(0)：普通会员
}
//获取好友列表 //获取好友列表
message CMFriendList message CMFriendList
{ {

1
server/tools/protobuild/ss_proto.proto
View File

@ -61,6 +61,7 @@ message MFRole
optional int32 last_save_time = 3; optional int32 last_save_time = 3;
optional int32 today_apply_guild_times = 4; optional int32 today_apply_guild_times = 4;
optional int32 today_create_guild_times = 5; optional int32 today_create_guild_times = 5;
repeated int32 applyed_guild_list = 6;
} }
message MFGroupMemberDB message MFGroupMemberDB