From 4c9b57207972530dd330c26aa194d300e9e81b96 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 29 Sep 2020 19:35:34 +0800 Subject: [PATCH] 1 --- server/imserver/guild.cc | 2 +- server/tools/protobuild/cs_proto.proto | 2 +- server/tools/protobuild/ss_proto.proto | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc index 53a2d91..d4906f4 100644 --- a/server/imserver/guild.cc +++ b/server/imserver/guild.cc @@ -407,7 +407,7 @@ void Guild::_CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg) } cs::SMGuildChange respmsg; - FillGuildBasic(respmsg.mutable_guild_basic()); + FillGuildBasic(respmsg.mutable_info()); GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle, forward_msg->context(), respmsg); diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index a52ecf8..c833037 100644 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -463,7 +463,7 @@ message SMGuildChange { optional int32 errcode = 1; //错误码 optional string errmsg = 2; //错误信息 - optional MFGuildBasic guild_basic = 3; //公会信息 + optional MFGuildBasic info = 3; //公会信息 } //查询公会 diff --git a/server/tools/protobuild/ss_proto.proto b/server/tools/protobuild/ss_proto.proto index 0cbc2fb..54f6292 100755 --- a/server/tools/protobuild/ss_proto.proto +++ b/server/tools/protobuild/ss_proto.proto @@ -353,3 +353,20 @@ message SS_IM_GuildMemberUpdateResponse { optional int64 seqid = 1; } + +message SS_IM_RefeshGuildMemberInfo +{ + optional MFIMMsgConext context = 1; +} + +message SS_GS_QueryGuildUserOnlineState +{ + optional MFIMMsgConext context = 1; + repeated string account_ids = 3; +} + +message SS_IM_PushGuildUserOnlineState +{ + optional MFIMMsgConext context = 1; + repeated cs.MFUserInfo user_infos = 2; +}