Merge branch 'master' into dev

This commit is contained in:
aozhiwei 2020-12-24 20:00:36 +08:00
commit 08beee49c0
2 changed files with 15 additions and 0 deletions

View File

@ -49,6 +49,7 @@ enum CMMessageId_e
_CMGuildRefuse = 245;
_CMGuildAgreeInvite = 246;
_CMGuildGainExp = 247;
_CMGuildSearchMember = 248;
_CMGuildMsgEnd = 270;
_CMTeamCreate = 301;
@ -103,6 +104,7 @@ enum SMMessageId_e
_SMGuildRefuse = 245;
_SMGuildAgreeInvite = 246;
_SMGuildGainExp = 247;
_SMGuildSearchMember = 248;
_SMGuildMsgEnd = 270;
_SMTeamCreate = 301;

View File

@ -671,6 +671,19 @@ message SMGuildGainExp
optional string errmsg = 2; //
}
//
message CMGuildSearchMember
{
optional string target_id = 1; //id
}
message SMGuildSearchMember
{
optional int32 errcode = 1; //
optional string errmsg = 2; //
optional MFGuildBasic guild_basic = 3; //
optional MFUserInfo user_info = 4; //
}
//
message CMSendChatMsg
{