From 1c578a1b3e4047101851da4ae2e4bada853a10cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B7=E5=8B=87?= Date: Thu, 14 Sep 2023 14:57:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/imserver/constant.go | 2 +- server/imserver/cs/cs_msgid.pb.go | 122 +- server/imserver/cs/cs_proto.pb.go | 1921 ++++++++++++++------------ server/imserver/guildmgr.go | 21 + server/imserver/player.go | 152 +- server/imserver/proto/cs_msgid.proto | 2 + server/imserver/proto/cs_proto.proto | 73 +- 7 files changed, 1286 insertions(+), 1007 deletions(-) diff --git a/server/imserver/constant.go b/server/imserver/constant.go index 54475047..0667578f 100644 --- a/server/imserver/constant.go +++ b/server/imserver/constant.go @@ -50,7 +50,7 @@ const ( // im server guild const ( RandomGuildCount = 10 - MembersMax = 10 + MembersMax = 30 MaxPendingReqs = 10 DefaultLogs = 20 LogTypeApprove = 1 // 公会日志类型， 批准加入 diff --git a/server/imserver/cs/cs_msgid.pb.go b/server/imserver/cs/cs_msgid.pb.go index 787f68a5..6565d2d2 100644 --- a/server/imserver/cs/cs_msgid.pb.go +++ b/server/imserver/cs/cs_msgid.pb.go @@ -63,6 +63,7 @@ const ( CMMessageIdE__CMGuildMembersList CMMessageIdE = 135 CMMessageIdE__CMSetName CMMessageIdE = 136 CMMessageIdE__CMSetAvatar CMMessageIdE = 137 + CMMessageIdE__CMSetJoinCond CMMessageIdE = 138 ) // Enum value maps for CMMessageIdE. @@ -104,6 +105,7 @@ var ( 135: "_CMGuildMembersList", 136: "_CMSetName", 137: "_CMSetAvatar", + 138: "_CMSetJoinCond", } CMMessageIdE_value = map[string]int32{ "_CMPing": 101, @@ -142,6 +144,7 @@ var ( "_CMGuildMembersList": 135, "_CMSetName": 136, "_CMSetAvatar": 137, + "_CMSetJoinCond": 138, } ) @@ -219,6 +222,7 @@ const ( SMMessageIdE__SMGuildMembersList SMMessageIdE = 135 SMMessageIdE__SMSetName SMMessageIdE = 136 SMMessageIdE__SMSetAvatar SMMessageIdE = 137 + SMMessageIdE__SMSetJoinCond SMMessageIdE = 138 // 聊天相关 SMMessageIdE__SMUpdateChatRedPointNotify SMMessageIdE = 200 SMMessageIdE__SMChatMsgNotify SMMessageIdE = 201 @@ -263,6 +267,7 @@ var ( 135: "_SMGuildMembersList", 136: "_SMSetName", 137: "_SMSetAvatar", + 138: "_SMSetJoinCond", 200: "_SMUpdateChatRedPointNotify", 201: "_SMChatMsgNotify", 202: "_SMUpdateRedPointNotify", @@ -303,6 +308,7 @@ var ( "_SMGuildMembersList": 135, "_SMSetName": 136, "_SMSetAvatar": 137, + "_SMSetJoinCond": 138, "_SMUpdateChatRedPointNotify": 200, "_SMChatMsgNotify": 201, "_SMUpdateRedPointNotify": 202, @@ -352,7 +358,7 @@ var File_cs_msgid_proto protoreflect.FileDescriptor var file_cs_msgid_proto_rawDesc = []byte{ 0x0a, 0x0e, 0x63, 0x73, 0x5f, 0x6d, 0x73, 0x67, 0x69, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x12, 0x02, 0x63, 0x73, 0x2a, 0xa1, 0x06, 0x0a, 0x0d, 0x43, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, + 0x12, 0x02, 0x63, 0x73, 0x2a, 0xb6, 0x06, 0x0a, 0x0d, 0x43, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x64, 0x5f, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x5f, 0x43, 0x4d, 0x50, 0x69, 0x6e, 0x67, 0x10, 0x65, 0x12, 0x0c, 0x0a, 0x08, 0x5f, 0x43, 0x4d, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x10, 0x67, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x43, 0x4d, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, @@ -402,62 +408,64 @@ var file_cs_msgid_proto_rawDesc = []byte{ 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x87, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x43, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x10, 0x88, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x43, 0x4d, 0x53, 0x65, 0x74, 0x41, - 0x76, 0x61, 0x74, 0x61, 0x72, 0x10, 0x89, 0x01, 0x2a, 0xe1, 0x06, 0x0a, 0x0d, 0x53, 0x4d, 0x4d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x64, 0x5f, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x5f, 0x53, - 0x4d, 0x50, 0x69, 0x6e, 0x67, 0x10, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x5f, 0x53, 0x4d, 0x52, 0x70, - 0x63, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x66, 0x12, 0x0c, 0x0a, 0x08, 0x5f, 0x53, 0x4d, 0x4c, - 0x6f, 0x67, 0x69, 0x6e, 0x10, 0x67, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x63, - 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x10, 0x68, 0x12, 0x1c, 0x0a, 0x18, 0x5f, 0x53, 0x4d, 0x53, - 0x65, 0x61, 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, 0x42, 0x79, 0x41, 0x63, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x49, 0x64, 0x10, 0x69, 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x61, - 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, 0x10, 0x6a, 0x12, 0x17, 0x0a, 0x13, 0x5f, 0x53, 0x4d, - 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x10, 0x6b, 0x12, 0x1a, 0x0a, 0x16, 0x5f, 0x53, 0x4d, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6c, 0x12, 0x1a, - 0x0a, 0x16, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6d, 0x12, 0x1f, 0x0a, 0x1b, 0x5f, 0x53, - 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x46, 0x72, 0x69, 0x65, - 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6e, 0x12, 0x11, 0x0a, 0x0d, 0x5f, - 0x53, 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x10, 0x6f, 0x12, 0x17, - 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x70, 0x12, 0x13, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x41, 0x64, - 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, 0x71, 0x12, 0x16, 0x0a, 0x12, - 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, 0x69, - 0x73, 0x74, 0x10, 0x72, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x42, 0x6c, 0x61, 0x63, 0x6b, - 0x6c, 0x69, 0x73, 0x74, 0x10, 0x74, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69, - 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0x78, 0x12, 0x12, 0x0a, 0x0e, 0x5f, 0x53, 0x4d, 0x43, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, 0x79, 0x12, 0x13, 0x0a, 0x0f, - 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x54, 0x6f, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, - 0x7a, 0x12, 0x0e, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x10, - 0x7b, 0x12, 0x0d, 0x0a, 0x09, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x10, 0x7c, - 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x47, 0x75, 0x69, 0x6c, - 0x64, 0x10, 0x7d, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, - 0x73, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7e, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x53, 0x4d, - 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7f, 0x12, - 0x14, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x44, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, - 0x65, 0x72, 0x10, 0x80, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x44, 0x69, 0x73, 0x62, - 0x61, 0x6e, 0x64, 0x10, 0x81, 0x01, 0x12, 0x14, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x61, - 0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x10, 0x82, 0x01, 0x12, 0x11, 0x0a, 0x0c, - 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x83, 0x01, 0x12, - 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x73, 0x10, - 0x84, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x69, - 0x63, 0x65, 0x10, 0x85, 0x01, 0x12, 0x16, 0x0a, 0x11, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4d, - 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x10, 0x86, 0x01, 0x12, 0x18, 0x0a, - 0x13, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, - 0x4c, 0x69, 0x73, 0x74, 0x10, 0x87, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x53, 0x65, - 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x10, 0x88, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x53, - 0x65, 0x74, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x10, 0x89, 0x01, 0x12, 0x20, 0x0a, 0x1b, 0x5f, - 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x64, 0x50, - 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xc8, 0x01, 0x12, 0x15, 0x0a, - 0x10, 0x5f, 0x53, 0x4d, 0x43, 0x68, 0x61, 0x74, 0x4d, 0x73, 0x67, 0x4e, 0x6f, 0x74, 0x69, 0x66, - 0x79, 0x10, 0xc9, 0x01, 0x12, 0x1c, 0x0a, 0x17, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x52, 0x65, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, - 0xca, 0x01, 0x12, 0x27, 0x0a, 0x22, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, - 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x64, 0x50, 0x6f, 0x69, - 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xcb, 0x01, 0x12, 0x1f, 0x0a, 0x1a, 0x5f, - 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6e, - 0x6e, 0x65, 0x6c, 0x4c, 0x61, 0x73, 0x74, 0x49, 0x64, 0x10, 0xcc, 0x01, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x63, 0x73, + 0x76, 0x61, 0x74, 0x61, 0x72, 0x10, 0x89, 0x01, 0x12, 0x13, 0x0a, 0x0e, 0x5f, 0x43, 0x4d, 0x53, + 0x65, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x10, 0x8a, 0x01, 0x2a, 0xf6, 0x06, + 0x0a, 0x0d, 0x53, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x64, 0x5f, 0x65, 0x12, + 0x0b, 0x0a, 0x07, 0x5f, 0x53, 0x4d, 0x50, 0x69, 0x6e, 0x67, 0x10, 0x65, 0x12, 0x0f, 0x0a, 0x0b, + 0x5f, 0x53, 0x4d, 0x52, 0x70, 0x63, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x66, 0x12, 0x0c, 0x0a, + 0x08, 0x5f, 0x53, 0x4d, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x10, 0x67, 0x12, 0x10, 0x0a, 0x0c, 0x5f, + 0x53, 0x4d, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x10, 0x68, 0x12, 0x1c, 0x0a, + 0x18, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, 0x42, 0x79, + 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x10, 0x69, 0x12, 0x11, 0x0a, 0x0d, 0x5f, + 0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, 0x10, 0x6a, 0x12, 0x17, + 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6b, 0x12, 0x1a, 0x0a, 0x16, 0x5f, 0x53, 0x4d, 0x41, 0x63, + 0x63, 0x65, 0x70, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x10, 0x6c, 0x12, 0x1a, 0x0a, 0x16, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6d, 0x12, + 0x1f, 0x0a, 0x1b, 0x5f, 0x53, 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, + 0x67, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6e, + 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x10, 0x6f, 0x12, 0x17, 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x70, 0x12, 0x13, 0x0a, 0x0f, + 0x5f, 0x53, 0x4d, 0x41, 0x64, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, + 0x71, 0x12, 0x16, 0x0a, 0x12, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x42, 0x6c, + 0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, 0x72, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, + 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, 0x74, 0x12, 0x10, 0x0a, 0x0c, 0x5f, + 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0x78, 0x12, 0x12, 0x0a, + 0x0e, 0x5f, 0x53, 0x4d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, + 0x79, 0x12, 0x13, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x54, 0x6f, 0x47, + 0x75, 0x69, 0x6c, 0x64, 0x10, 0x7a, 0x12, 0x0e, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, + 0x72, 0x6f, 0x76, 0x65, 0x10, 0x7b, 0x12, 0x0d, 0x0a, 0x09, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6a, + 0x65, 0x63, 0x74, 0x10, 0x7c, 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x4c, 0x65, 0x61, 0x76, + 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, 0x7d, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x44, + 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7e, 0x12, 0x14, + 0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, + 0x65, 0x72, 0x10, 0x7f, 0x12, 0x14, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x44, 0x65, 0x6d, 0x6f, 0x74, + 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x80, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x53, + 0x4d, 0x44, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x64, 0x10, 0x81, 0x01, 0x12, 0x14, 0x0a, 0x0f, 0x5f, + 0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x10, 0x82, + 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, + 0x74, 0x10, 0x83, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, + 0x4c, 0x6f, 0x67, 0x73, 0x10, 0x84, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x53, 0x65, + 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x10, 0x85, 0x01, 0x12, 0x16, 0x0a, 0x11, 0x5f, 0x53, + 0x4d, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x10, + 0x86, 0x01, 0x12, 0x18, 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, + 0x6d, 0x62, 0x65, 0x72, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x87, 0x01, 0x12, 0x0f, 0x0a, 0x0a, + 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x10, 0x88, 0x01, 0x12, 0x11, 0x0a, + 0x0c, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x10, 0x89, 0x01, + 0x12, 0x13, 0x0a, 0x0e, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x43, 0x6f, + 0x6e, 0x64, 0x10, 0x8a, 0x01, 0x12, 0x20, 0x0a, 0x1b, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, + 0x74, 0x69, 0x66, 0x79, 0x10, 0xc8, 0x01, 0x12, 0x15, 0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x43, 0x68, + 0x61, 0x74, 0x4d, 0x73, 0x67, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xc9, 0x01, 0x12, 0x1c, + 0x0a, 0x17, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x64, 0x50, 0x6f, + 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xca, 0x01, 0x12, 0x27, 0x0a, 0x22, + 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, + 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, + 0x66, 0x79, 0x10, 0xcb, 0x01, 0x12, 0x1f, 0x0a, 0x1a, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4c, 0x61, 0x73, + 0x74, 0x49, 0x64, 0x10, 0xcc, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x63, 0x73, } var ( diff --git a/server/imserver/cs/cs_proto.pb.go b/server/imserver/cs/cs_proto.pb.go index abacf0ca..b9a98602 100644 --- a/server/imserver/cs/cs_proto.pb.go +++ b/server/imserver/cs/cs_proto.pb.go @@ -2808,10 +2808,9 @@ type SMCreateGuild struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Errcode *int32 `protobuf:"varint,1,opt,name=errcode" json:"errcode,omitempty"` - Errmsg *string `protobuf:"bytes,2,opt,name=errmsg" json:"errmsg,omitempty"` - // optional int64 guild_id = 3; - Guild *MFGuild `protobuf:"bytes,3,opt,name=guild" json:"guild,omitempty"` + Errcode *int32 `protobuf:"varint,1,opt,name=errcode" json:"errcode,omitempty"` + Errmsg *string `protobuf:"bytes,2,opt,name=errmsg" json:"errmsg,omitempty"` + Guild *MFGuild `protobuf:"bytes,3,opt,name=guild" json:"guild,omitempty"` } func (x *SMCreateGuild) Reset() { @@ -3016,9 +3015,9 @@ type SMApplyList struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Errcode *string `protobuf:"bytes,1,opt,name=errcode" json:"errcode,omitempty"` - Errmsg *string `protobuf:"bytes,2,opt,name=errmsg" json:"errmsg,omitempty"` - Users []*MFGuildApplyUser `protobuf:"bytes,3,rep,name=users" json:"users,omitempty"` + Errcode *string `protobuf:"bytes,1,opt,name=errcode" json:"errcode,omitempty"` + Errmsg *string `protobuf:"bytes,2,opt,name=errmsg" json:"errmsg,omitempty"` + Members []*MFGuildMember `protobuf:"bytes,3,rep,name=members" json:"members,omitempty"` } func (x *SMApplyList) Reset() { @@ -3067,108 +3066,13 @@ func (x *SMApplyList) GetErrmsg() string { return "" } -func (x *SMApplyList) GetUsers() []*MFGuildApplyUser { +func (x *SMApplyList) GetMembers() []*MFGuildMember { if x != nil { - return x.Users + return x.Members } return nil } -type MFGuildApplyUser struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - AccountId *string `protobuf:"bytes,1,opt,name=account_id,json=accountId" json:"account_id,omitempty"` - Username *string `protobuf:"bytes,2,opt,name=username" json:"username,omitempty"` - Avatar *int32 `protobuf:"varint,3,opt,name=avatar" json:"avatar,omitempty"` - AvatarHead *int32 `protobuf:"varint,4,opt,name=avatar_head,json=avatarHead" json:"avatar_head,omitempty"` - Rank *int32 `protobuf:"varint,5,opt,name=rank" json:"rank,omitempty"` - OnlineStatus *int32 `protobuf:"varint,6,opt,name=online_status,json=onlineStatus" json:"online_status,omitempty"` - LastLoginTime *int32 `protobuf:"varint,7,opt,name=last_login_time,json=lastLoginTime" json:"last_login_time,omitempty"` -} - -func (x *MFGuildApplyUser) Reset() { - *x = MFGuildApplyUser{} - if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[52] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MFGuildApplyUser) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MFGuildApplyUser) ProtoMessage() {} - -func (x *MFGuildApplyUser) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[52] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use MFGuildApplyUser.ProtoReflect.Descriptor instead. -func (*MFGuildApplyUser) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{52} -} - -func (x *MFGuildApplyUser) GetAccountId() string { - if x != nil && x.AccountId != nil { - return *x.AccountId - } - return "" -} - -func (x *MFGuildApplyUser) GetUsername() string { - if x != nil && x.Username != nil { - return *x.Username - } - return "" -} - -func (x *MFGuildApplyUser) GetAvatar() int32 { - if x != nil && x.Avatar != nil { - return *x.Avatar - } - return 0 -} - -func (x *MFGuildApplyUser) GetAvatarHead() int32 { - if x != nil && x.AvatarHead != nil { - return *x.AvatarHead - } - return 0 -} - -func (x *MFGuildApplyUser) GetRank() int32 { - if x != nil && x.Rank != nil { - return *x.Rank - } - return 0 -} - -func (x *MFGuildApplyUser) GetOnlineStatus() int32 { - if x != nil && x.OnlineStatus != nil { - return *x.OnlineStatus - } - return 0 -} - -func (x *MFGuildApplyUser) GetLastLoginTime() int32 { - if x != nil && x.LastLoginTime != nil { - return *x.LastLoginTime - } - return 0 -} - // 请求批准申请加入公会 type CMApprove struct { state protoimpl.MessageState @@ -3181,7 +3085,7 @@ type CMApprove struct { func (x *CMApprove) Reset() { *x = CMApprove{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[53] + mi := &file_cs_proto_proto_msgTypes[52] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3194,7 +3098,7 @@ func (x *CMApprove) String() string { func (*CMApprove) ProtoMessage() {} func (x *CMApprove) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[53] + mi := &file_cs_proto_proto_msgTypes[52] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3207,7 +3111,7 @@ func (x *CMApprove) ProtoReflect() protoreflect.Message { // Deprecated: Use CMApprove.ProtoReflect.Descriptor instead. func (*CMApprove) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{53} + return file_cs_proto_proto_rawDescGZIP(), []int{52} } func (x *CMApprove) GetApplicantAccountId() string { @@ -3230,7 +3134,7 @@ type SMApprove struct { func (x *SMApprove) Reset() { *x = SMApprove{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[54] + mi := &file_cs_proto_proto_msgTypes[53] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3243,7 +3147,7 @@ func (x *SMApprove) String() string { func (*SMApprove) ProtoMessage() {} func (x *SMApprove) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[54] + mi := &file_cs_proto_proto_msgTypes[53] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3256,7 +3160,7 @@ func (x *SMApprove) ProtoReflect() protoreflect.Message { // Deprecated: Use SMApprove.ProtoReflect.Descriptor instead. func (*SMApprove) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{54} + return file_cs_proto_proto_rawDescGZIP(), []int{53} } func (x *SMApprove) GetErrcode() int32 { @@ -3285,7 +3189,7 @@ type CMReject struct { func (x *CMReject) Reset() { *x = CMReject{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[55] + mi := &file_cs_proto_proto_msgTypes[54] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3298,7 +3202,7 @@ func (x *CMReject) String() string { func (*CMReject) ProtoMessage() {} func (x *CMReject) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[55] + mi := &file_cs_proto_proto_msgTypes[54] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3311,7 +3215,7 @@ func (x *CMReject) ProtoReflect() protoreflect.Message { // Deprecated: Use CMReject.ProtoReflect.Descriptor instead. func (*CMReject) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{55} + return file_cs_proto_proto_rawDescGZIP(), []int{54} } func (x *CMReject) GetApplicantAccountId() string { @@ -3334,7 +3238,7 @@ type SMReject struct { func (x *SMReject) Reset() { *x = SMReject{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[56] + mi := &file_cs_proto_proto_msgTypes[55] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3347,7 +3251,7 @@ func (x *SMReject) String() string { func (*SMReject) ProtoMessage() {} func (x *SMReject) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[56] + mi := &file_cs_proto_proto_msgTypes[55] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3360,7 +3264,7 @@ func (x *SMReject) ProtoReflect() protoreflect.Message { // Deprecated: Use SMReject.ProtoReflect.Descriptor instead. func (*SMReject) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{56} + return file_cs_proto_proto_rawDescGZIP(), []int{55} } func (x *SMReject) GetErrcode() int32 { @@ -3387,7 +3291,7 @@ type CMLeaveGuild struct { func (x *CMLeaveGuild) Reset() { *x = CMLeaveGuild{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[57] + mi := &file_cs_proto_proto_msgTypes[56] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3400,7 +3304,7 @@ func (x *CMLeaveGuild) String() string { func (*CMLeaveGuild) ProtoMessage() {} func (x *CMLeaveGuild) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[57] + mi := &file_cs_proto_proto_msgTypes[56] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3413,7 +3317,7 @@ func (x *CMLeaveGuild) ProtoReflect() protoreflect.Message { // Deprecated: Use CMLeaveGuild.ProtoReflect.Descriptor instead. func (*CMLeaveGuild) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{57} + return file_cs_proto_proto_rawDescGZIP(), []int{56} } // 回复离开公会 @@ -3429,7 +3333,7 @@ type SMLeaveGuild struct { func (x *SMLeaveGuild) Reset() { *x = SMLeaveGuild{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[58] + mi := &file_cs_proto_proto_msgTypes[57] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3442,7 +3346,7 @@ func (x *SMLeaveGuild) String() string { func (*SMLeaveGuild) ProtoMessage() {} func (x *SMLeaveGuild) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[58] + mi := &file_cs_proto_proto_msgTypes[57] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3455,7 +3359,7 @@ func (x *SMLeaveGuild) ProtoReflect() protoreflect.Message { // Deprecated: Use SMLeaveGuild.ProtoReflect.Descriptor instead. func (*SMLeaveGuild) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{58} + return file_cs_proto_proto_rawDescGZIP(), []int{57} } func (x *SMLeaveGuild) GetErrcode() int32 { @@ -3484,7 +3388,7 @@ type CMDismissMember struct { func (x *CMDismissMember) Reset() { *x = CMDismissMember{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[59] + mi := &file_cs_proto_proto_msgTypes[58] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3497,7 +3401,7 @@ func (x *CMDismissMember) String() string { func (*CMDismissMember) ProtoMessage() {} func (x *CMDismissMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[59] + mi := &file_cs_proto_proto_msgTypes[58] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3510,7 +3414,7 @@ func (x *CMDismissMember) ProtoReflect() protoreflect.Message { // Deprecated: Use CMDismissMember.ProtoReflect.Descriptor instead. func (*CMDismissMember) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{59} + return file_cs_proto_proto_rawDescGZIP(), []int{58} } func (x *CMDismissMember) GetDismissAccountId() string { @@ -3533,7 +3437,7 @@ type SMDismissMember struct { func (x *SMDismissMember) Reset() { *x = SMDismissMember{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[60] + mi := &file_cs_proto_proto_msgTypes[59] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3546,7 +3450,7 @@ func (x *SMDismissMember) String() string { func (*SMDismissMember) ProtoMessage() {} func (x *SMDismissMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[60] + mi := &file_cs_proto_proto_msgTypes[59] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3559,7 +3463,7 @@ func (x *SMDismissMember) ProtoReflect() protoreflect.Message { // Deprecated: Use SMDismissMember.ProtoReflect.Descriptor instead. func (*SMDismissMember) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{60} + return file_cs_proto_proto_rawDescGZIP(), []int{59} } func (x *SMDismissMember) GetErrcode() int32 { @@ -3589,7 +3493,7 @@ type CMSetMemberLevel struct { func (x *CMSetMemberLevel) Reset() { *x = CMSetMemberLevel{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[61] + mi := &file_cs_proto_proto_msgTypes[60] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3602,7 +3506,7 @@ func (x *CMSetMemberLevel) String() string { func (*CMSetMemberLevel) ProtoMessage() {} func (x *CMSetMemberLevel) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[61] + mi := &file_cs_proto_proto_msgTypes[60] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3615,7 +3519,7 @@ func (x *CMSetMemberLevel) ProtoReflect() protoreflect.Message { // Deprecated: Use CMSetMemberLevel.ProtoReflect.Descriptor instead. func (*CMSetMemberLevel) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{61} + return file_cs_proto_proto_rawDescGZIP(), []int{60} } func (x *CMSetMemberLevel) GetMemberAccountId() string { @@ -3645,7 +3549,7 @@ type SMSetMemberLevel struct { func (x *SMSetMemberLevel) Reset() { *x = SMSetMemberLevel{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[62] + mi := &file_cs_proto_proto_msgTypes[61] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3658,7 +3562,7 @@ func (x *SMSetMemberLevel) String() string { func (*SMSetMemberLevel) ProtoMessage() {} func (x *SMSetMemberLevel) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[62] + mi := &file_cs_proto_proto_msgTypes[61] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3671,7 +3575,7 @@ func (x *SMSetMemberLevel) ProtoReflect() protoreflect.Message { // Deprecated: Use SMSetMemberLevel.ProtoReflect.Descriptor instead. func (*SMSetMemberLevel) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{62} + return file_cs_proto_proto_rawDescGZIP(), []int{61} } func (x *SMSetMemberLevel) GetErrcode() int32 { @@ -3700,7 +3604,7 @@ type CMPromoteMember struct { func (x *CMPromoteMember) Reset() { *x = CMPromoteMember{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[63] + mi := &file_cs_proto_proto_msgTypes[62] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3713,7 +3617,7 @@ func (x *CMPromoteMember) String() string { func (*CMPromoteMember) ProtoMessage() {} func (x *CMPromoteMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[63] + mi := &file_cs_proto_proto_msgTypes[62] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3726,7 +3630,7 @@ func (x *CMPromoteMember) ProtoReflect() protoreflect.Message { // Deprecated: Use CMPromoteMember.ProtoReflect.Descriptor instead. func (*CMPromoteMember) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{63} + return file_cs_proto_proto_rawDescGZIP(), []int{62} } func (x *CMPromoteMember) GetPromoteAccountId() string { @@ -3749,7 +3653,7 @@ type SMPromoteMember struct { func (x *SMPromoteMember) Reset() { *x = SMPromoteMember{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[64] + mi := &file_cs_proto_proto_msgTypes[63] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3762,7 +3666,7 @@ func (x *SMPromoteMember) String() string { func (*SMPromoteMember) ProtoMessage() {} func (x *SMPromoteMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[64] + mi := &file_cs_proto_proto_msgTypes[63] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3775,7 +3679,7 @@ func (x *SMPromoteMember) ProtoReflect() protoreflect.Message { // Deprecated: Use SMPromoteMember.ProtoReflect.Descriptor instead. func (*SMPromoteMember) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{64} + return file_cs_proto_proto_rawDescGZIP(), []int{63} } func (x *SMPromoteMember) GetErrcode() int32 { @@ -3804,7 +3708,7 @@ type CMDemoteMember struct { func (x *CMDemoteMember) Reset() { *x = CMDemoteMember{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[65] + mi := &file_cs_proto_proto_msgTypes[64] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3817,7 +3721,7 @@ func (x *CMDemoteMember) String() string { func (*CMDemoteMember) ProtoMessage() {} func (x *CMDemoteMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[65] + mi := &file_cs_proto_proto_msgTypes[64] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3830,7 +3734,7 @@ func (x *CMDemoteMember) ProtoReflect() protoreflect.Message { // Deprecated: Use CMDemoteMember.ProtoReflect.Descriptor instead. func (*CMDemoteMember) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{65} + return file_cs_proto_proto_rawDescGZIP(), []int{64} } func (x *CMDemoteMember) GetDemoteAccountId() string { @@ -3853,7 +3757,7 @@ type SMDemoteMember struct { func (x *SMDemoteMember) Reset() { *x = SMDemoteMember{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[66] + mi := &file_cs_proto_proto_msgTypes[65] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3866,7 +3770,7 @@ func (x *SMDemoteMember) String() string { func (*SMDemoteMember) ProtoMessage() {} func (x *SMDemoteMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[66] + mi := &file_cs_proto_proto_msgTypes[65] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3879,7 +3783,7 @@ func (x *SMDemoteMember) ProtoReflect() protoreflect.Message { // Deprecated: Use SMDemoteMember.ProtoReflect.Descriptor instead. func (*SMDemoteMember) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{66} + return file_cs_proto_proto_rawDescGZIP(), []int{65} } func (x *SMDemoteMember) GetErrcode() int32 { @@ -3906,7 +3810,7 @@ type CMGuildMembersList struct { func (x *CMGuildMembersList) Reset() { *x = CMGuildMembersList{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[67] + mi := &file_cs_proto_proto_msgTypes[66] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3919,7 +3823,7 @@ func (x *CMGuildMembersList) String() string { func (*CMGuildMembersList) ProtoMessage() {} func (x *CMGuildMembersList) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[67] + mi := &file_cs_proto_proto_msgTypes[66] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3932,7 +3836,7 @@ func (x *CMGuildMembersList) ProtoReflect() protoreflect.Message { // Deprecated: Use CMGuildMembersList.ProtoReflect.Descriptor instead. func (*CMGuildMembersList) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{67} + return file_cs_proto_proto_rawDescGZIP(), []int{66} } // 回复公会成员列表 @@ -3941,15 +3845,15 @@ type SMGuildMembersList struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Errcode *int32 `protobuf:"varint,1,opt,name=errcode" json:"errcode,omitempty"` - Errmsg *string `protobuf:"bytes,2,opt,name=errmsg" json:"errmsg,omitempty"` - Users []*MFUser `protobuf:"bytes,3,rep,name=users" json:"users,omitempty"` + Errcode *int32 `protobuf:"varint,1,opt,name=errcode" json:"errcode,omitempty"` + Errmsg *string `protobuf:"bytes,2,opt,name=errmsg" json:"errmsg,omitempty"` + Members []*MFGuildMember `protobuf:"bytes,3,rep,name=members" json:"members,omitempty"` } func (x *SMGuildMembersList) Reset() { *x = SMGuildMembersList{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[68] + mi := &file_cs_proto_proto_msgTypes[67] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3962,7 +3866,7 @@ func (x *SMGuildMembersList) String() string { func (*SMGuildMembersList) ProtoMessage() {} func (x *SMGuildMembersList) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[68] + mi := &file_cs_proto_proto_msgTypes[67] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3975,7 +3879,7 @@ func (x *SMGuildMembersList) ProtoReflect() protoreflect.Message { // Deprecated: Use SMGuildMembersList.ProtoReflect.Descriptor instead. func (*SMGuildMembersList) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{68} + return file_cs_proto_proto_rawDescGZIP(), []int{67} } func (x *SMGuildMembersList) GetErrcode() int32 { @@ -3992,9 +3896,9 @@ func (x *SMGuildMembersList) GetErrmsg() string { return "" } -func (x *SMGuildMembersList) GetUsers() []*MFUser { +func (x *SMGuildMembersList) GetMembers() []*MFGuildMember { if x != nil { - return x.Users + return x.Members } return nil } @@ -4009,7 +3913,7 @@ type CMDisband struct { func (x *CMDisband) Reset() { *x = CMDisband{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[69] + mi := &file_cs_proto_proto_msgTypes[68] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4022,7 +3926,7 @@ func (x *CMDisband) String() string { func (*CMDisband) ProtoMessage() {} func (x *CMDisband) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[69] + mi := &file_cs_proto_proto_msgTypes[68] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4035,7 +3939,7 @@ func (x *CMDisband) ProtoReflect() protoreflect.Message { // Deprecated: Use CMDisband.ProtoReflect.Descriptor instead. func (*CMDisband) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{69} + return file_cs_proto_proto_rawDescGZIP(), []int{68} } // 回复解散公会 @@ -4051,7 +3955,7 @@ type SMDisband struct { func (x *SMDisband) Reset() { *x = SMDisband{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[70] + mi := &file_cs_proto_proto_msgTypes[69] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4064,7 +3968,7 @@ func (x *SMDisband) String() string { func (*SMDisband) ProtoMessage() {} func (x *SMDisband) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[70] + mi := &file_cs_proto_proto_msgTypes[69] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4077,7 +3981,7 @@ func (x *SMDisband) ProtoReflect() protoreflect.Message { // Deprecated: Use SMDisband.ProtoReflect.Descriptor instead. func (*SMDisband) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{70} + return file_cs_proto_proto_rawDescGZIP(), []int{69} } func (x *SMDisband) GetErrcode() int32 { @@ -4107,7 +4011,7 @@ type CMSearchGuilds struct { func (x *CMSearchGuilds) Reset() { *x = CMSearchGuilds{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[71] + mi := &file_cs_proto_proto_msgTypes[70] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4120,7 +4024,7 @@ func (x *CMSearchGuilds) String() string { func (*CMSearchGuilds) ProtoMessage() {} func (x *CMSearchGuilds) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[71] + mi := &file_cs_proto_proto_msgTypes[70] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4133,7 +4037,7 @@ func (x *CMSearchGuilds) ProtoReflect() protoreflect.Message { // Deprecated: Use CMSearchGuilds.ProtoReflect.Descriptor instead. func (*CMSearchGuilds) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{71} + return file_cs_proto_proto_rawDescGZIP(), []int{70} } func (x *CMSearchGuilds) GetSinceId() int64 { @@ -4165,7 +4069,7 @@ type SMSearchGuilds struct { func (x *SMSearchGuilds) Reset() { *x = SMSearchGuilds{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[72] + mi := &file_cs_proto_proto_msgTypes[71] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4178,7 +4082,7 @@ func (x *SMSearchGuilds) String() string { func (*SMSearchGuilds) ProtoMessage() {} func (x *SMSearchGuilds) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[72] + mi := &file_cs_proto_proto_msgTypes[71] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4191,7 +4095,7 @@ func (x *SMSearchGuilds) ProtoReflect() protoreflect.Message { // Deprecated: Use SMSearchGuilds.ProtoReflect.Descriptor instead. func (*SMSearchGuilds) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{72} + return file_cs_proto_proto_rawDescGZIP(), []int{71} } func (x *SMSearchGuilds) GetErrcode() int32 { @@ -4222,30 +4126,628 @@ func (x *SMSearchGuilds) GetGuilds() []*MFGuild { return nil } +// 请求公会日志 +type CMGuildLogs struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *CMGuildLogs) Reset() { + *x = CMGuildLogs{} + if protoimpl.UnsafeEnabled { + mi := &file_cs_proto_proto_msgTypes[72] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CMGuildLogs) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CMGuildLogs) ProtoMessage() {} + +func (x *CMGuildLogs) ProtoReflect() protoreflect.Message { + mi := &file_cs_proto_proto_msgTypes[72] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CMGuildLogs.ProtoReflect.Descriptor instead. +func (*CMGuildLogs) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{72} +} + +// 回复公会日志 +type SMGuildLogs struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Errcode *int32 `protobuf:"varint,1,opt,name=errcode" json:"errcode,omitempty"` + Errmsg *string `protobuf:"bytes,2,opt,name=errmsg" json:"errmsg,omitempty"` + GuildLogs []*MFGuildLog `protobuf:"bytes,3,rep,name=guildLogs" json:"guildLogs,omitempty"` +} + +func (x *SMGuildLogs) Reset() { + *x = SMGuildLogs{} + if protoimpl.UnsafeEnabled { + mi := &file_cs_proto_proto_msgTypes[73] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SMGuildLogs) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SMGuildLogs) ProtoMessage() {} + +func (x *SMGuildLogs) ProtoReflect() protoreflect.Message { + mi := &file_cs_proto_proto_msgTypes[73] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SMGuildLogs.ProtoReflect.Descriptor instead. +func (*SMGuildLogs) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{73} +} + +func (x *SMGuildLogs) GetErrcode() int32 { + if x != nil && x.Errcode != nil { + return *x.Errcode + } + return 0 +} + +func (x *SMGuildLogs) GetErrmsg() string { + if x != nil && x.Errmsg != nil { + return *x.Errmsg + } + return "" +} + +func (x *SMGuildLogs) GetGuildLogs() []*MFGuildLog { + if x != nil { + return x.GuildLogs + } + return nil +} + +type MFGuildLog struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + GuildId *int64 `protobuf:"varint,1,opt,name=guild_id,json=guildId" json:"guild_id,omitempty"` + AccountId *string `protobuf:"bytes,2,opt,name=account_id,json=accountId" json:"account_id,omitempty"` + LogType *int32 `protobuf:"varint,3,opt,name=log_type,json=logType" json:"log_type,omitempty"` + Content *string `protobuf:"bytes,4,opt,name=content" json:"content,omitempty"` +} + +func (x *MFGuildLog) Reset() { + *x = MFGuildLog{} + if protoimpl.UnsafeEnabled { + mi := &file_cs_proto_proto_msgTypes[74] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *MFGuildLog) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*MFGuildLog) ProtoMessage() {} + +func (x *MFGuildLog) ProtoReflect() protoreflect.Message { + mi := &file_cs_proto_proto_msgTypes[74] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use MFGuildLog.ProtoReflect.Descriptor instead. +func (*MFGuildLog) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{74} +} + +func (x *MFGuildLog) GetGuildId() int64 { + if x != nil && x.GuildId != nil { + return *x.GuildId + } + return 0 +} + +func (x *MFGuildLog) GetAccountId() string { + if x != nil && x.AccountId != nil { + return *x.AccountId + } + return "" +} + +func (x *MFGuildLog) GetLogType() int32 { + if x != nil && x.LogType != nil { + return *x.LogType + } + return 0 +} + +func (x *MFGuildLog) GetContent() string { + if x != nil && x.Content != nil { + return *x.Content + } + return "" +} + +// 请求修改公会名称 +type CMSetName struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` +} + +func (x *CMSetName) Reset() { + *x = CMSetName{} + if protoimpl.UnsafeEnabled { + mi := &file_cs_proto_proto_msgTypes[75] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CMSetName) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CMSetName) ProtoMessage() {} + +func (x *CMSetName) ProtoReflect() protoreflect.Message { + mi := &file_cs_proto_proto_msgTypes[75] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CMSetName.ProtoReflect.Descriptor instead. +func (*CMSetName) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{75} +} + +func (x *CMSetName) GetName() string { + if x != nil && x.Name != nil { + return *x.Name + } + return "" +} + +// 回复修改公会名称 +type SMSetName struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Errcode *int32 `protobuf:"varint,1,opt,name=errcode" json:"errcode,omitempty"` + Errmsg *string `protobuf:"bytes,2,opt,name=errmsg" json:"errmsg,omitempty"` +} + +func (x *SMSetName) Reset() { + *x = SMSetName{} + if protoimpl.UnsafeEnabled { + mi := &file_cs_proto_proto_msgTypes[76] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SMSetName) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SMSetName) ProtoMessage() {} + +func (x *SMSetName) ProtoReflect() protoreflect.Message { + mi := &file_cs_proto_proto_msgTypes[76] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SMSetName.ProtoReflect.Descriptor instead. +func (*SMSetName) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{76} +} + +func (x *SMSetName) GetErrcode() int32 { + if x != nil && x.Errcode != nil { + return *x.Errcode + } + return 0 +} + +func (x *SMSetName) GetErrmsg() string { + if x != nil && x.Errmsg != nil { + return *x.Errmsg + } + return "" +} + +// 请求修改公会头像 +type CMSetAvatar struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Avatar *int32 `protobuf:"varint,1,opt,name=avatar" json:"avatar,omitempty"` +} + +func (x *CMSetAvatar) Reset() { + *x = CMSetAvatar{} + if protoimpl.UnsafeEnabled { + mi := &file_cs_proto_proto_msgTypes[77] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CMSetAvatar) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CMSetAvatar) ProtoMessage() {} + +func (x *CMSetAvatar) ProtoReflect() protoreflect.Message { + mi := &file_cs_proto_proto_msgTypes[77] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CMSetAvatar.ProtoReflect.Descriptor instead. +func (*CMSetAvatar) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{77} +} + +func (x *CMSetAvatar) GetAvatar() int32 { + if x != nil && x.Avatar != nil { + return *x.Avatar + } + return 0 +} + +// 回复修改公会头像 +type SMSetAvatar struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Errcode *int32 `protobuf:"varint,1,opt,name=errcode" json:"errcode,omitempty"` + Errmsg *string `protobuf:"bytes,2,opt,name=errmsg" json:"errmsg,omitempty"` +} + +func (x *SMSetAvatar) Reset() { + *x = SMSetAvatar{} + if protoimpl.UnsafeEnabled { + mi := &file_cs_proto_proto_msgTypes[78] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SMSetAvatar) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SMSetAvatar) ProtoMessage() {} + +func (x *SMSetAvatar) ProtoReflect() protoreflect.Message { + mi := &file_cs_proto_proto_msgTypes[78] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SMSetAvatar.ProtoReflect.Descriptor instead. +func (*SMSetAvatar) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{78} +} + +func (x *SMSetAvatar) GetErrcode() int32 { + if x != nil && x.Errcode != nil { + return *x.Errcode + } + return 0 +} + +func (x *SMSetAvatar) GetErrmsg() string { + if x != nil && x.Errmsg != nil { + return *x.Errmsg + } + return "" +} + +// 请求设置公告 +type CMSetNotice struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Content *string `protobuf:"bytes,1,opt,name=content" json:"content,omitempty"` +} + +func (x *CMSetNotice) Reset() { + *x = CMSetNotice{} + if protoimpl.UnsafeEnabled { + mi := &file_cs_proto_proto_msgTypes[79] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CMSetNotice) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CMSetNotice) ProtoMessage() {} + +func (x *CMSetNotice) ProtoReflect() protoreflect.Message { + mi := &file_cs_proto_proto_msgTypes[79] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CMSetNotice.ProtoReflect.Descriptor instead. +func (*CMSetNotice) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{79} +} + +func (x *CMSetNotice) GetContent() string { + if x != nil && x.Content != nil { + return *x.Content + } + return "" +} + +// 回复设置公告 +type SMSetNotice struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Errcode *int32 `protobuf:"varint,1,opt,name=errcode" json:"errcode,omitempty"` + Errmsg *string `protobuf:"bytes,2,opt,name=errmsg" json:"errmsg,omitempty"` +} + +func (x *SMSetNotice) Reset() { + *x = SMSetNotice{} + if protoimpl.UnsafeEnabled { + mi := &file_cs_proto_proto_msgTypes[80] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SMSetNotice) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SMSetNotice) ProtoMessage() {} + +func (x *SMSetNotice) ProtoReflect() protoreflect.Message { + mi := &file_cs_proto_proto_msgTypes[80] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SMSetNotice.ProtoReflect.Descriptor instead. +func (*SMSetNotice) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{80} +} + +func (x *SMSetNotice) GetErrcode() int32 { + if x != nil && x.Errcode != nil { + return *x.Errcode + } + return 0 +} + +func (x *SMSetNotice) GetErrmsg() string { + if x != nil && x.Errmsg != nil { + return *x.Errmsg + } + return "" +} + +// 请求设置公会加入条件 +type CMSetJoinCond struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + JoinCond *int32 `protobuf:"varint,1,opt,name=join_cond,json=joinCond" json:"join_cond,omitempty"` // default: 0, free:1, star: 2 + JoinCondValue *int32 `protobuf:"varint,2,opt,name=join_cond_value,json=joinCondValue" json:"join_cond_value,omitempty"` // only cond star, value: +} + +func (x *CMSetJoinCond) Reset() { + *x = CMSetJoinCond{} + if protoimpl.UnsafeEnabled { + mi := &file_cs_proto_proto_msgTypes[81] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CMSetJoinCond) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CMSetJoinCond) ProtoMessage() {} + +func (x *CMSetJoinCond) ProtoReflect() protoreflect.Message { + mi := &file_cs_proto_proto_msgTypes[81] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CMSetJoinCond.ProtoReflect.Descriptor instead. +func (*CMSetJoinCond) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{81} +} + +func (x *CMSetJoinCond) GetJoinCond() int32 { + if x != nil && x.JoinCond != nil { + return *x.JoinCond + } + return 0 +} + +func (x *CMSetJoinCond) GetJoinCondValue() int32 { + if x != nil && x.JoinCondValue != nil { + return *x.JoinCondValue + } + return 0 +} + +// 回复设置公会加入条件 +type SMSetJoinCond struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Errcode *int32 `protobuf:"varint,1,opt,name=errcode" json:"errcode,omitempty"` + Errmsg *string `protobuf:"bytes,2,opt,name=errmsg" json:"errmsg,omitempty"` +} + +func (x *SMSetJoinCond) Reset() { + *x = SMSetJoinCond{} + if protoimpl.UnsafeEnabled { + mi := &file_cs_proto_proto_msgTypes[82] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SMSetJoinCond) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SMSetJoinCond) ProtoMessage() {} + +func (x *SMSetJoinCond) ProtoReflect() protoreflect.Message { + mi := &file_cs_proto_proto_msgTypes[82] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SMSetJoinCond.ProtoReflect.Descriptor instead. +func (*SMSetJoinCond) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{82} +} + +func (x *SMSetJoinCond) GetErrcode() int32 { + if x != nil && x.Errcode != nil { + return *x.Errcode + } + return 0 +} + +func (x *SMSetJoinCond) GetErrmsg() string { + if x != nil && x.Errmsg != nil { + return *x.Errmsg + } + return "" +} + type MFGuild struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - AutoId *int64 `protobuf:"varint,1,opt,name=auto_id,json=autoId" json:"auto_id,omitempty"` - GuildId *int64 `protobuf:"varint,2,opt,name=guild_id,json=guildId" json:"guild_id,omitempty"` - Name *string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"` - LeaderId *string `protobuf:"bytes,4,opt,name=leader_id,json=leaderId" json:"leader_id,omitempty"` - Avatar *int32 `protobuf:"varint,5,opt,name=avatar" json:"avatar,omitempty"` - Notice *string `protobuf:"bytes,6,opt,name=notice" json:"notice,omitempty"` - JoinCond *int32 `protobuf:"varint,7,opt,name=join_cond,json=joinCond" json:"join_cond,omitempty"` // 公会加入条件 default:0, free:1 , 2 ,star: 3 - JoinCondValue *int32 `protobuf:"varint,8,opt,name=join_cond_value,json=joinCondValue" json:"join_cond_value,omitempty"` // star value - TotalStars *int32 `protobuf:"varint,9,opt,name=total_stars,json=totalStars" json:"total_stars,omitempty"` // 公会统计信息, 总星星数量 - TotalKills *int32 `protobuf:"varint,10,opt,name=total_kills,json=totalKills" json:"total_kills,omitempty"` // 公会统计信息, 单局总击杀数 - ChickenDinners *int32 `protobuf:"varint,11,opt,name=chicken_dinners,json=chickenDinners" json:"chicken_dinners,omitempty"` // 公会统计信息, 单局第一名数 - MembersCount *int32 `protobuf:"varint,12,opt,name=members_count,json=membersCount" json:"members_count,omitempty"` // 成员数 - MembersMax *int32 `protobuf:"varint,13,opt,name=members_max,json=membersMax" json:"members_max,omitempty"` // 成员上限 + AutoId *int64 `protobuf:"varint,1,opt,name=auto_id,json=autoId" json:"auto_id,omitempty"` + GuildId *int64 `protobuf:"varint,2,opt,name=guild_id,json=guildId" json:"guild_id,omitempty"` + Name *string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"` + LeaderId *string `protobuf:"bytes,4,opt,name=leader_id,json=leaderId" json:"leader_id,omitempty"` + Avatar *int32 `protobuf:"varint,5,opt,name=avatar" json:"avatar,omitempty"` + Notice *string `protobuf:"bytes,6,opt,name=notice" json:"notice,omitempty"` + JoinCond *int32 `protobuf:"varint,7,opt,name=join_cond,json=joinCond" json:"join_cond,omitempty"` // 公会加入条件 default:0, free:1, star: 2 + JoinCondValue *int32 `protobuf:"varint,8,opt,name=join_cond_value,json=joinCondValue" json:"join_cond_value,omitempty"` // star value + TotalStars *int32 `protobuf:"varint,9,opt,name=total_stars,json=totalStars" json:"total_stars,omitempty"` // 公会统计信息, 总星星数量 + TotalKills *int32 `protobuf:"varint,10,opt,name=total_kills,json=totalKills" json:"total_kills,omitempty"` // 公会统计信息, 单局总击杀数 + ChickenDinners *int32 `protobuf:"varint,11,opt,name=chicken_dinners,json=chickenDinners" json:"chicken_dinners,omitempty"` // 公会统计信息, 单局第一名数 + MaxMembers *int32 `protobuf:"varint,13,opt,name=max_members,json=maxMembers" json:"max_members,omitempty"` // 成员上限 + Members []*MFGuildMember `protobuf:"bytes,14,rep,name=members" json:"members,omitempty"` } func (x *MFGuild) Reset() { *x = MFGuild{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[73] + mi := &file_cs_proto_proto_msgTypes[83] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4258,7 +4760,7 @@ func (x *MFGuild) String() string { func (*MFGuild) ProtoMessage() {} func (x *MFGuild) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[73] + mi := &file_cs_proto_proto_msgTypes[83] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4271,7 +4773,7 @@ func (x *MFGuild) ProtoReflect() protoreflect.Message { // Deprecated: Use MFGuild.ProtoReflect.Descriptor instead. func (*MFGuild) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{73} + return file_cs_proto_proto_rawDescGZIP(), []int{83} } func (x *MFGuild) GetAutoId() int64 { @@ -4351,151 +4853,53 @@ func (x *MFGuild) GetChickenDinners() int32 { return 0 } -func (x *MFGuild) GetMembersCount() int32 { - if x != nil && x.MembersCount != nil { - return *x.MembersCount +func (x *MFGuild) GetMaxMembers() int32 { + if x != nil && x.MaxMembers != nil { + return *x.MaxMembers } return 0 } -func (x *MFGuild) GetMembersMax() int32 { - if x != nil && x.MembersMax != nil { - return *x.MembersMax - } - return 0 -} - -// 请求公会日志 -type CMGuildLogs struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *CMGuildLogs) Reset() { - *x = CMGuildLogs{} - if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[74] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CMGuildLogs) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CMGuildLogs) ProtoMessage() {} - -func (x *CMGuildLogs) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[74] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use CMGuildLogs.ProtoReflect.Descriptor instead. -func (*CMGuildLogs) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{74} -} - -// 回复公会日志 -type SMGuildLogs struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Errcode *int32 `protobuf:"varint,1,opt,name=errcode" json:"errcode,omitempty"` - Errmsg *string `protobuf:"bytes,2,opt,name=errmsg" json:"errmsg,omitempty"` - GuildLogs []*MFGuildLog `protobuf:"bytes,3,rep,name=guildLogs" json:"guildLogs,omitempty"` -} - -func (x *SMGuildLogs) Reset() { - *x = SMGuildLogs{} - if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[75] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *SMGuildLogs) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*SMGuildLogs) ProtoMessage() {} - -func (x *SMGuildLogs) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[75] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use SMGuildLogs.ProtoReflect.Descriptor instead. -func (*SMGuildLogs) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{75} -} - -func (x *SMGuildLogs) GetErrcode() int32 { - if x != nil && x.Errcode != nil { - return *x.Errcode - } - return 0 -} - -func (x *SMGuildLogs) GetErrmsg() string { - if x != nil && x.Errmsg != nil { - return *x.Errmsg - } - return "" -} - -func (x *SMGuildLogs) GetGuildLogs() []*MFGuildLog { +func (x *MFGuild) GetMembers() []*MFGuildMember { if x != nil { - return x.GuildLogs + return x.Members } return nil } -type MFGuildLog struct { +type MFGuildMember struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - GuildId *int64 `protobuf:"varint,1,opt,name=guild_id,json=guildId" json:"guild_id,omitempty"` - AccountId *string `protobuf:"bytes,2,opt,name=account_id,json=accountId" json:"account_id,omitempty"` - LogType *int32 `protobuf:"varint,3,opt,name=log_type,json=logType" json:"log_type,omitempty"` - Content *string `protobuf:"bytes,4,opt,name=content" json:"content,omitempty"` + AccountId *string `protobuf:"bytes,1,opt,name=account_id,json=accountId" json:"account_id,omitempty"` + Username *string `protobuf:"bytes,2,opt,name=username" json:"username,omitempty"` + Avatar *int32 `protobuf:"varint,3,opt,name=avatar" json:"avatar,omitempty"` + AvatarHead *int32 `protobuf:"varint,4,opt,name=avatar_head,json=avatarHead" json:"avatar_head,omitempty"` + Rank *int32 `protobuf:"varint,7,opt,name=rank" json:"rank,omitempty"` + OnlineStatus *int32 `protobuf:"varint,8,opt,name=online_status,json=onlineStatus" json:"online_status,omitempty"` + LastLoginTime *int32 `protobuf:"varint,9,opt,name=last_login_time,json=lastLoginTime" json:"last_login_time,omitempty"` + Level *int32 `protobuf:"varint,10,opt,name=level" json:"level,omitempty"` + Star *int32 `protobuf:"varint,11,opt,name=star" json:"star,omitempty"` } -func (x *MFGuildLog) Reset() { - *x = MFGuildLog{} +func (x *MFGuildMember) Reset() { + *x = MFGuildMember{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[76] + mi := &file_cs_proto_proto_msgTypes[84] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } } -func (x *MFGuildLog) String() string { +func (x *MFGuildMember) String() string { return protoimpl.X.MessageStringOf(x) } -func (*MFGuildLog) ProtoMessage() {} +func (*MFGuildMember) ProtoMessage() {} -func (x *MFGuildLog) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[76] +func (x *MFGuildMember) ProtoReflect() protoreflect.Message { + mi := &file_cs_proto_proto_msgTypes[84] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4506,349 +4910,72 @@ func (x *MFGuildLog) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use MFGuildLog.ProtoReflect.Descriptor instead. -func (*MFGuildLog) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{76} +// Deprecated: Use MFGuildMember.ProtoReflect.Descriptor instead. +func (*MFGuildMember) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{84} } -func (x *MFGuildLog) GetGuildId() int64 { - if x != nil && x.GuildId != nil { - return *x.GuildId - } - return 0 -} - -func (x *MFGuildLog) GetAccountId() string { +func (x *MFGuildMember) GetAccountId() string { if x != nil && x.AccountId != nil { return *x.AccountId } return "" } -func (x *MFGuildLog) GetLogType() int32 { - if x != nil && x.LogType != nil { - return *x.LogType - } - return 0 -} - -func (x *MFGuildLog) GetContent() string { - if x != nil && x.Content != nil { - return *x.Content +func (x *MFGuildMember) GetUsername() string { + if x != nil && x.Username != nil { + return *x.Username } return "" } -// 请求修改公会名称 -type CMSetName struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` -} - -func (x *CMSetName) Reset() { - *x = CMSetName{} - if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[77] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CMSetName) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CMSetName) ProtoMessage() {} - -func (x *CMSetName) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[77] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use CMSetName.ProtoReflect.Descriptor instead. -func (*CMSetName) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{77} -} - -func (x *CMSetName) GetName() string { - if x != nil && x.Name != nil { - return *x.Name - } - return "" -} - -// 回复修改公会名称 -type SMSetName struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Errcode *int32 `protobuf:"varint,1,opt,name=errcode" json:"errcode,omitempty"` - Errmsg *string `protobuf:"bytes,2,opt,name=errmsg" json:"errmsg,omitempty"` -} - -func (x *SMSetName) Reset() { - *x = SMSetName{} - if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[78] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *SMSetName) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*SMSetName) ProtoMessage() {} - -func (x *SMSetName) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[78] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use SMSetName.ProtoReflect.Descriptor instead. -func (*SMSetName) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{78} -} - -func (x *SMSetName) GetErrcode() int32 { - if x != nil && x.Errcode != nil { - return *x.Errcode - } - return 0 -} - -func (x *SMSetName) GetErrmsg() string { - if x != nil && x.Errmsg != nil { - return *x.Errmsg - } - return "" -} - -// 请求修改公会头像 -type CMSetAvatar struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Avatar *int32 `protobuf:"varint,1,opt,name=avatar" json:"avatar,omitempty"` -} - -func (x *CMSetAvatar) Reset() { - *x = CMSetAvatar{} - if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[79] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CMSetAvatar) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CMSetAvatar) ProtoMessage() {} - -func (x *CMSetAvatar) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[79] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use CMSetAvatar.ProtoReflect.Descriptor instead. -func (*CMSetAvatar) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{79} -} - -func (x *CMSetAvatar) GetAvatar() int32 { +func (x *MFGuildMember) GetAvatar() int32 { if x != nil && x.Avatar != nil { return *x.Avatar } return 0 } -// 回复修改公会头像 -type SMSetAvatar struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Errcode *int32 `protobuf:"varint,1,opt,name=errcode" json:"errcode,omitempty"` - Errmsg *string `protobuf:"bytes,2,opt,name=errmsg" json:"errmsg,omitempty"` -} - -func (x *SMSetAvatar) Reset() { - *x = SMSetAvatar{} - if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[80] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *SMSetAvatar) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*SMSetAvatar) ProtoMessage() {} - -func (x *SMSetAvatar) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[80] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use SMSetAvatar.ProtoReflect.Descriptor instead. -func (*SMSetAvatar) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{80} -} - -func (x *SMSetAvatar) GetErrcode() int32 { - if x != nil && x.Errcode != nil { - return *x.Errcode +func (x *MFGuildMember) GetAvatarHead() int32 { + if x != nil && x.AvatarHead != nil { + return *x.AvatarHead } return 0 } -func (x *SMSetAvatar) GetErrmsg() string { - if x != nil && x.Errmsg != nil { - return *x.Errmsg - } - return "" -} - -// 请求设置公告 -type CMSetNotice struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Content *string `protobuf:"bytes,1,opt,name=content" json:"content,omitempty"` -} - -func (x *CMSetNotice) Reset() { - *x = CMSetNotice{} - if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[81] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CMSetNotice) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CMSetNotice) ProtoMessage() {} - -func (x *CMSetNotice) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[81] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use CMSetNotice.ProtoReflect.Descriptor instead. -func (*CMSetNotice) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{81} -} - -func (x *CMSetNotice) GetContent() string { - if x != nil && x.Content != nil { - return *x.Content - } - return "" -} - -// 回复设置公告 -type SMSetNotice struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Errcode *int32 `protobuf:"varint,1,opt,name=errcode" json:"errcode,omitempty"` - Errmsg *string `protobuf:"bytes,2,opt,name=errmsg" json:"errmsg,omitempty"` -} - -func (x *SMSetNotice) Reset() { - *x = SMSetNotice{} - if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[82] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *SMSetNotice) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*SMSetNotice) ProtoMessage() {} - -func (x *SMSetNotice) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[82] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use SMSetNotice.ProtoReflect.Descriptor instead. -func (*SMSetNotice) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{82} -} - -func (x *SMSetNotice) GetErrcode() int32 { - if x != nil && x.Errcode != nil { - return *x.Errcode +func (x *MFGuildMember) GetRank() int32 { + if x != nil && x.Rank != nil { + return *x.Rank } return 0 } -func (x *SMSetNotice) GetErrmsg() string { - if x != nil && x.Errmsg != nil { - return *x.Errmsg +func (x *MFGuildMember) GetOnlineStatus() int32 { + if x != nil && x.OnlineStatus != nil { + return *x.OnlineStatus } - return "" + return 0 +} + +func (x *MFGuildMember) GetLastLoginTime() int32 { + if x != nil && x.LastLoginTime != nil { + return *x.LastLoginTime + } + return 0 +} + +func (x *MFGuildMember) GetLevel() int32 { + if x != nil && x.Level != nil { + return *x.Level + } + return 0 +} + +func (x *MFGuildMember) GetStar() int32 { + if x != nil && x.Star != nil { + return *x.Star + } + return 0 } var File_cs_proto_proto protoreflect.FileDescriptor @@ -5131,173 +5258,186 @@ var file_cs_proto_proto_rawDesc = []byte{ 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, - 0x0d, 0x0a, 0x0b, 0x43, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x6b, + 0x0d, 0x0a, 0x0b, 0x43, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x6c, 0x0a, 0x0b, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x12, - 0x2a, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, - 0x2e, 0x63, 0x73, 0x2e, 0x4d, 0x46, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, - 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0xe7, 0x01, 0x0a, 0x10, - 0x4d, 0x46, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x55, 0x73, 0x65, 0x72, - 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12, - 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, - 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x76, 0x61, - 0x74, 0x61, 0x72, 0x12, 0x1f, 0x0a, 0x0b, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x5f, 0x68, 0x65, - 0x61, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, - 0x48, 0x65, 0x61, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x23, 0x0a, 0x0d, 0x6f, 0x6e, 0x6c, 0x69, - 0x6e, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x0c, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x26, 0x0a, - 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6c, 0x61, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x69, - 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x3d, 0x0a, 0x09, 0x43, 0x4d, 0x41, 0x70, 0x70, 0x72, 0x6f, - 0x76, 0x65, 0x12, 0x30, 0x0a, 0x14, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x6e, 0x74, 0x5f, - 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x12, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x6e, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x49, 0x64, 0x22, 0x3d, 0x0a, 0x09, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, - 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, - 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, - 0x6d, 0x73, 0x67, 0x22, 0x3c, 0x0a, 0x08, 0x43, 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x12, - 0x30, 0x0a, 0x14, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x6e, 0x74, 0x5f, 0x61, 0x63, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x61, - 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x6e, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, - 0x64, 0x22, 0x3c, 0x0a, 0x08, 0x53, 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x18, 0x0a, - 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, - 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, - 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, - 0x0e, 0x0a, 0x0c, 0x43, 0x4d, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x22, - 0x40, 0x0a, 0x0c, 0x53, 0x4d, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x12, - 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, - 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, - 0x67, 0x22, 0x3d, 0x0a, 0x0f, 0x43, 0x4d, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x4d, 0x65, - 0x6d, 0x62, 0x65, 0x72, 0x12, 0x2a, 0x0a, 0x10, 0x64, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x41, - 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, - 0x64, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, - 0x22, 0x43, 0x0a, 0x0f, 0x53, 0x4d, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x4d, 0x65, 0x6d, - 0x62, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, - 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, - 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x5e, 0x0a, 0x10, 0x43, 0x4d, 0x53, 0x65, 0x74, 0x4d, 0x65, - 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6d, 0x65, 0x6d, - 0x62, 0x65, 0x72, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0f, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, - 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, - 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x44, 0x0a, 0x10, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4d, 0x65, - 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, - 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, - 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x3d, 0x0a, 0x0f, 0x43, - 0x4d, 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x2a, - 0x0a, 0x10, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, - 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x0f, 0x53, 0x4d, - 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x18, 0x0a, - 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, - 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, - 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, - 0x3a, 0x0a, 0x0e, 0x43, 0x4d, 0x44, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, - 0x72, 0x12, 0x28, 0x0a, 0x0f, 0x64, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x64, 0x65, 0x6d, 0x6f, - 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x42, 0x0a, 0x0e, 0x53, - 0x4d, 0x44, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x18, 0x0a, - 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, - 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, - 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, - 0x14, 0x0a, 0x12, 0x43, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, - 0x73, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x68, 0x0a, 0x12, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, - 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, - 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, - 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x12, 0x20, 0x0a, - 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x63, - 0x73, 0x2e, 0x4d, 0x46, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, - 0x0b, 0x0a, 0x09, 0x43, 0x4d, 0x44, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x64, 0x22, 0x3d, 0x0a, 0x09, - 0x53, 0x4d, 0x44, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, - 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, - 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x3f, 0x0a, 0x0e, 0x43, - 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x12, 0x19, 0x0a, - 0x08, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x07, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x82, 0x01, 0x0a, - 0x0e, 0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x12, - 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, - 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, - 0x67, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x07, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x23, 0x0a, 0x06, - 0x67, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x63, - 0x73, 0x2e, 0x4d, 0x46, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x06, 0x67, 0x75, 0x69, 0x6c, 0x64, - 0x73, 0x22, 0x94, 0x03, 0x0a, 0x07, 0x4d, 0x46, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x12, 0x17, 0x0a, - 0x07, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, - 0x61, 0x75, 0x74, 0x6f, 0x49, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x5f, - 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x49, - 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, - 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, - 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, - 0x74, 0x69, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x74, 0x69, - 0x63, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x6a, 0x6f, 0x69, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x64, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6a, 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x12, - 0x26, 0x0a, 0x0f, 0x6a, 0x6f, 0x69, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x64, 0x5f, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6a, 0x6f, 0x69, 0x6e, 0x43, 0x6f, - 0x6e, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, - 0x5f, 0x73, 0x74, 0x61, 0x72, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x6f, - 0x74, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x72, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, - 0x6c, 0x5f, 0x6b, 0x69, 0x6c, 0x6c, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, - 0x6f, 0x74, 0x61, 0x6c, 0x4b, 0x69, 0x6c, 0x6c, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x63, 0x68, 0x69, - 0x63, 0x6b, 0x65, 0x6e, 0x5f, 0x64, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x73, 0x18, 0x0b, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x0e, 0x63, 0x68, 0x69, 0x63, 0x6b, 0x65, 0x6e, 0x44, 0x69, 0x6e, 0x6e, 0x65, - 0x72, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x5f, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x6d, 0x65, 0x6d, 0x62, 0x65, - 0x72, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x65, 0x6d, 0x62, 0x65, - 0x72, 0x73, 0x5f, 0x6d, 0x61, 0x78, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6d, 0x65, - 0x6d, 0x62, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x78, 0x22, 0x0d, 0x0a, 0x0b, 0x43, 0x4d, 0x47, 0x75, - 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x73, 0x22, 0x6d, 0x0a, 0x0b, 0x53, 0x4d, 0x47, 0x75, 0x69, - 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, + 0x2b, 0x0a, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x11, 0x2e, 0x63, 0x73, 0x2e, 0x4d, 0x46, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, + 0x62, 0x65, 0x72, 0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x22, 0x3d, 0x0a, 0x09, + 0x43, 0x4d, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x12, 0x30, 0x0a, 0x14, 0x61, 0x70, 0x70, + 0x6c, 0x69, 0x63, 0x61, 0x6e, 0x74, 0x5f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, + 0x6e, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x3d, 0x0a, 0x09, 0x53, + 0x4d, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, + 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, + 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x3c, 0x0a, 0x08, 0x43, 0x4d, + 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x30, 0x0a, 0x14, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, + 0x61, 0x6e, 0x74, 0x5f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x6e, 0x74, 0x41, + 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x3c, 0x0a, 0x08, 0x53, 0x4d, 0x52, 0x65, + 0x6a, 0x65, 0x63, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, + 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x0e, 0x0a, 0x0c, 0x43, 0x4d, 0x4c, 0x65, 0x61, 0x76, + 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x22, 0x40, 0x0a, 0x0c, 0x53, 0x4d, 0x4c, 0x65, 0x61, 0x76, + 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x12, 0x2c, 0x0a, 0x09, 0x67, 0x75, 0x69, 0x6c, - 0x64, 0x4c, 0x6f, 0x67, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x73, - 0x2e, 0x4d, 0x46, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x52, 0x09, 0x67, 0x75, 0x69, - 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x73, 0x22, 0x7b, 0x0a, 0x0a, 0x4d, 0x46, 0x47, 0x75, 0x69, 0x6c, - 0x64, 0x4c, 0x6f, 0x67, 0x12, 0x19, 0x0a, 0x08, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x64, 0x12, - 0x1d, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x19, - 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x07, 0x6c, 0x6f, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, - 0x65, 0x6e, 0x74, 0x22, 0x1f, 0x0a, 0x09, 0x43, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, - 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3d, 0x0a, 0x09, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x61, 0x6d, - 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x3d, 0x0a, 0x0f, 0x43, 0x4d, 0x44, 0x69, + 0x73, 0x6d, 0x69, 0x73, 0x73, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x2a, 0x0a, 0x10, 0x64, + 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x64, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x41, 0x63, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x0f, 0x53, 0x4d, 0x44, 0x69, 0x73, + 0x6d, 0x69, 0x73, 0x73, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, + 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, + 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x5e, 0x0a, 0x10, + 0x43, 0x4d, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, + 0x12, 0x28, 0x0a, 0x0f, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6d, 0x65, 0x6d, 0x62, 0x65, + 0x72, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x6d, 0x65, + 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x0b, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x44, 0x0a, 0x10, + 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, + 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, + 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, + 0x73, 0x67, 0x22, 0x3d, 0x0a, 0x0f, 0x43, 0x4d, 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4d, + 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x2a, 0x0a, 0x10, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, + 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x10, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, + 0x64, 0x22, 0x43, 0x0a, 0x0f, 0x53, 0x4d, 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, + 0x6d, 0x62, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, + 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x3a, 0x0a, 0x0e, 0x43, 0x4d, 0x44, 0x65, 0x6d, 0x6f, + 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x28, 0x0a, 0x0f, 0x64, 0x65, 0x6d, 0x6f, + 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0f, 0x64, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, + 0x49, 0x64, 0x22, 0x42, 0x0a, 0x0e, 0x53, 0x4d, 0x44, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, + 0x6d, 0x62, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, + 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x14, 0x0a, 0x12, 0x43, 0x4d, 0x47, 0x75, 0x69, 0x6c, + 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x73, 0x0a, 0x12, + 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x4c, 0x69, + 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, + 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, + 0x72, 0x6d, 0x73, 0x67, 0x12, 0x2b, 0x0a, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x18, + 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x63, 0x73, 0x2e, 0x4d, 0x46, 0x47, 0x75, 0x69, + 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, + 0x73, 0x22, 0x0b, 0x0a, 0x09, 0x43, 0x4d, 0x44, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x64, 0x22, 0x3d, + 0x0a, 0x09, 0x53, 0x4d, 0x44, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x65, + 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, + 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x3f, 0x0a, + 0x0e, 0x43, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x12, + 0x19, 0x0a, 0x08, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x07, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x82, + 0x01, 0x0a, 0x0e, 0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, + 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, - 0x6d, 0x73, 0x67, 0x22, 0x25, 0x0a, 0x0b, 0x43, 0x4d, 0x53, 0x65, 0x74, 0x41, 0x76, 0x61, 0x74, - 0x61, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x22, 0x3f, 0x0a, 0x0b, 0x53, 0x4d, - 0x53, 0x65, 0x74, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, - 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, - 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x27, 0x0a, 0x0b, 0x43, - 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, - 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x22, 0x3f, 0x0a, 0x0b, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x74, - 0x69, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, - 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, - 0x72, 0x72, 0x6d, 0x73, 0x67, 0x2a, 0x22, 0x0a, 0x0a, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, - 0x74, 0x5f, 0x65, 0x12, 0x14, 0x0a, 0x0c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x65, 0x72, 0x73, - 0x69, 0x6f, 0x6e, 0x10, 0xd1, 0xa2, 0xd5, 0xc4, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x63, - 0x73, + 0x6d, 0x73, 0x67, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x23, + 0x0a, 0x06, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, + 0x2e, 0x63, 0x73, 0x2e, 0x4d, 0x46, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x06, 0x67, 0x75, 0x69, + 0x6c, 0x64, 0x73, 0x22, 0x0d, 0x0a, 0x0b, 0x43, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, + 0x67, 0x73, 0x22, 0x6d, 0x0a, 0x0b, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, + 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, + 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, + 0x6d, 0x73, 0x67, 0x12, 0x2c, 0x0a, 0x09, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x73, + 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x73, 0x2e, 0x4d, 0x46, 0x47, 0x75, + 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x52, 0x09, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, + 0x73, 0x22, 0x7b, 0x0a, 0x0a, 0x4d, 0x46, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x12, + 0x19, 0x0a, 0x08, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x63, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, + 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x6c, 0x6f, 0x67, + 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x6f, 0x67, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x22, 0x1f, + 0x0a, 0x09, 0x43, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, + 0x3d, 0x0a, 0x09, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, + 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, + 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x25, + 0x0a, 0x0b, 0x43, 0x4d, 0x53, 0x65, 0x74, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x16, 0x0a, + 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, + 0x76, 0x61, 0x74, 0x61, 0x72, 0x22, 0x3f, 0x0a, 0x0b, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x41, 0x76, + 0x61, 0x74, 0x61, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, + 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x27, 0x0a, 0x0b, 0x43, 0x4d, 0x53, 0x65, 0x74, 0x4e, + 0x6f, 0x74, 0x69, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x22, + 0x3f, 0x0a, 0x0b, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x12, 0x18, + 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, + 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, + 0x22, 0x54, 0x0a, 0x0d, 0x43, 0x4d, 0x53, 0x65, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x6e, + 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x6a, 0x6f, 0x69, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6a, 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x12, 0x26, + 0x0a, 0x0f, 0x6a, 0x6f, 0x69, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x64, 0x5f, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6a, 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x6e, + 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x41, 0x0a, 0x0d, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4a, + 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, + 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, + 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x9c, 0x03, 0x0a, 0x07, 0x4d, 0x46, + 0x47, 0x75, 0x69, 0x6c, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x75, 0x74, 0x6f, 0x49, 0x64, 0x12, 0x19, + 0x0a, 0x08, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a, + 0x09, 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x08, 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, + 0x61, 0x74, 0x61, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, + 0x61, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x6a, 0x6f, + 0x69, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6a, + 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x12, 0x26, 0x0a, 0x0f, 0x6a, 0x6f, 0x69, 0x6e, 0x5f, + 0x63, 0x6f, 0x6e, 0x64, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x0d, 0x6a, 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, + 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x73, 0x18, 0x09, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x72, 0x73, + 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x6b, 0x69, 0x6c, 0x6c, 0x73, 0x18, + 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x4b, 0x69, 0x6c, 0x6c, + 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x63, 0x68, 0x69, 0x63, 0x6b, 0x65, 0x6e, 0x5f, 0x64, 0x69, 0x6e, + 0x6e, 0x65, 0x72, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x63, 0x68, 0x69, 0x63, + 0x6b, 0x65, 0x6e, 0x44, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x61, + 0x78, 0x5f, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x0a, 0x6d, 0x61, 0x78, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x12, 0x2b, 0x0a, 0x07, 0x6d, + 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x63, + 0x73, 0x2e, 0x4d, 0x46, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, + 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x22, 0x8e, 0x02, 0x0a, 0x0d, 0x4d, 0x46, 0x47, + 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x63, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, + 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, + 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, + 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x1f, 0x0a, + 0x0b, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x0a, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x48, 0x65, 0x61, 0x64, 0x12, 0x12, + 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, + 0x6e, 0x6b, 0x12, 0x23, 0x0a, 0x0d, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x73, 0x74, 0x61, + 0x74, 0x75, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, + 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x26, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x5f, + 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x0d, 0x6c, 0x61, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, + 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x0b, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x2a, 0x22, 0x0a, 0x0a, 0x43, 0x6f, 0x6e, + 0x73, 0x74, 0x61, 0x6e, 0x74, 0x5f, 0x65, 0x12, 0x14, 0x0a, 0x0c, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0xd1, 0xa2, 0xd5, 0xc4, 0x07, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x63, 0x73, } var ( @@ -5313,7 +5453,7 @@ func file_cs_proto_proto_rawDescGZIP() []byte { } var file_cs_proto_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_cs_proto_proto_msgTypes = make([]protoimpl.MessageInfo, 83) +var file_cs_proto_proto_msgTypes = make([]protoimpl.MessageInfo, 85) var file_cs_proto_proto_goTypes = []interface{}{ (ConstantE)(0), // 0: cs.Constant_e (*CMPing)(nil), // 1: cs.CMPing @@ -5368,37 +5508,39 @@ var file_cs_proto_proto_goTypes = []interface{}{ (*SMApplyToGuild)(nil), // 50: cs.SMApplyToGuild (*CMApplyList)(nil), // 51: cs.CMApplyList (*SMApplyList)(nil), // 52: cs.SMApplyList - (*MFGuildApplyUser)(nil), // 53: cs.MFGuildApplyUser - (*CMApprove)(nil), // 54: cs.CMApprove - (*SMApprove)(nil), // 55: cs.SMApprove - (*CMReject)(nil), // 56: cs.CMReject - (*SMReject)(nil), // 57: cs.SMReject - (*CMLeaveGuild)(nil), // 58: cs.CMLeaveGuild - (*SMLeaveGuild)(nil), // 59: cs.SMLeaveGuild - (*CMDismissMember)(nil), // 60: cs.CMDismissMember - (*SMDismissMember)(nil), // 61: cs.SMDismissMember - (*CMSetMemberLevel)(nil), // 62: cs.CMSetMemberLevel - (*SMSetMemberLevel)(nil), // 63: cs.SMSetMemberLevel - (*CMPromoteMember)(nil), // 64: cs.CMPromoteMember - (*SMPromoteMember)(nil), // 65: cs.SMPromoteMember - (*CMDemoteMember)(nil), // 66: cs.CMDemoteMember - (*SMDemoteMember)(nil), // 67: cs.SMDemoteMember - (*CMGuildMembersList)(nil), // 68: cs.CMGuildMembersList - (*SMGuildMembersList)(nil), // 69: cs.SMGuildMembersList - (*CMDisband)(nil), // 70: cs.CMDisband - (*SMDisband)(nil), // 71: cs.SMDisband - (*CMSearchGuilds)(nil), // 72: cs.CMSearchGuilds - (*SMSearchGuilds)(nil), // 73: cs.SMSearchGuilds - (*MFGuild)(nil), // 74: cs.MFGuild - (*CMGuildLogs)(nil), // 75: cs.CMGuildLogs - (*SMGuildLogs)(nil), // 76: cs.SMGuildLogs - (*MFGuildLog)(nil), // 77: cs.MFGuildLog - (*CMSetName)(nil), // 78: cs.CMSetName - (*SMSetName)(nil), // 79: cs.SMSetName - (*CMSetAvatar)(nil), // 80: cs.CMSetAvatar - (*SMSetAvatar)(nil), // 81: cs.SMSetAvatar - (*CMSetNotice)(nil), // 82: cs.CMSetNotice - (*SMSetNotice)(nil), // 83: cs.SMSetNotice + (*CMApprove)(nil), // 53: cs.CMApprove + (*SMApprove)(nil), // 54: cs.SMApprove + (*CMReject)(nil), // 55: cs.CMReject + (*SMReject)(nil), // 56: cs.SMReject + (*CMLeaveGuild)(nil), // 57: cs.CMLeaveGuild + (*SMLeaveGuild)(nil), // 58: cs.SMLeaveGuild + (*CMDismissMember)(nil), // 59: cs.CMDismissMember + (*SMDismissMember)(nil), // 60: cs.SMDismissMember + (*CMSetMemberLevel)(nil), // 61: cs.CMSetMemberLevel + (*SMSetMemberLevel)(nil), // 62: cs.SMSetMemberLevel + (*CMPromoteMember)(nil), // 63: cs.CMPromoteMember + (*SMPromoteMember)(nil), // 64: cs.SMPromoteMember + (*CMDemoteMember)(nil), // 65: cs.CMDemoteMember + (*SMDemoteMember)(nil), // 66: cs.SMDemoteMember + (*CMGuildMembersList)(nil), // 67: cs.CMGuildMembersList + (*SMGuildMembersList)(nil), // 68: cs.SMGuildMembersList + (*CMDisband)(nil), // 69: cs.CMDisband + (*SMDisband)(nil), // 70: cs.SMDisband + (*CMSearchGuilds)(nil), // 71: cs.CMSearchGuilds + (*SMSearchGuilds)(nil), // 72: cs.SMSearchGuilds + (*CMGuildLogs)(nil), // 73: cs.CMGuildLogs + (*SMGuildLogs)(nil), // 74: cs.SMGuildLogs + (*MFGuildLog)(nil), // 75: cs.MFGuildLog + (*CMSetName)(nil), // 76: cs.CMSetName + (*SMSetName)(nil), // 77: cs.SMSetName + (*CMSetAvatar)(nil), // 78: cs.CMSetAvatar + (*SMSetAvatar)(nil), // 79: cs.SMSetAvatar + (*CMSetNotice)(nil), // 80: cs.CMSetNotice + (*SMSetNotice)(nil), // 81: cs.SMSetNotice + (*CMSetJoinCond)(nil), // 82: cs.CMSetJoinCond + (*SMSetJoinCond)(nil), // 83: cs.SMSetJoinCond + (*MFGuild)(nil), // 84: cs.MFGuild + (*MFGuildMember)(nil), // 85: cs.MFGuildMember } var file_cs_proto_proto_depIdxs = []int32{ 34, // 0: cs.SMSearchUser.users:type_name -> cs.MFUser @@ -5409,18 +5551,19 @@ var file_cs_proto_proto_depIdxs = []int32{ 5, // 5: cs.CMReadMsgAndOpenChatNotify.last_ids:type_name -> cs.MFPair64 44, // 6: cs.SMChatMsgNotify.msg_list:type_name -> cs.MFChatMsg 5, // 7: cs.SMUpdateChatChannelLastId.last_ids:type_name -> cs.MFPair64 - 74, // 8: cs.SMGuildInfo.guild:type_name -> cs.MFGuild - 74, // 9: cs.SMGuildInfo.random_guilds:type_name -> cs.MFGuild - 74, // 10: cs.SMCreateGuild.guild:type_name -> cs.MFGuild - 53, // 11: cs.SMApplyList.users:type_name -> cs.MFGuildApplyUser - 34, // 12: cs.SMGuildMembersList.users:type_name -> cs.MFUser - 74, // 13: cs.SMSearchGuilds.guilds:type_name -> cs.MFGuild - 77, // 14: cs.SMGuildLogs.guildLogs:type_name -> cs.MFGuildLog - 15, // [15:15] is the sub-list for method output_type - 15, // [15:15] is the sub-list for method input_type - 15, // [15:15] is the sub-list for extension type_name - 15, // [15:15] is the sub-list for extension extendee - 0, // [0:15] is the sub-list for field type_name + 84, // 8: cs.SMGuildInfo.guild:type_name -> cs.MFGuild + 84, // 9: cs.SMGuildInfo.random_guilds:type_name -> cs.MFGuild + 84, // 10: cs.SMCreateGuild.guild:type_name -> cs.MFGuild + 85, // 11: cs.SMApplyList.members:type_name -> cs.MFGuildMember + 85, // 12: cs.SMGuildMembersList.members:type_name -> cs.MFGuildMember + 84, // 13: cs.SMSearchGuilds.guilds:type_name -> cs.MFGuild + 75, // 14: cs.SMGuildLogs.guildLogs:type_name -> cs.MFGuildLog + 85, // 15: cs.MFGuild.members:type_name -> cs.MFGuildMember + 16, // [16:16] is the sub-list for method output_type + 16, // [16:16] is the sub-list for method input_type + 16, // [16:16] is the sub-list for extension type_name + 16, // [16:16] is the sub-list for extension extendee + 0, // [0:16] is the sub-list for field type_name } func init() { file_cs_proto_proto_init() } @@ -6054,18 +6197,6 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MFGuildApplyUser); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_cs_proto_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMApprove); i { case 0: return &v.state @@ -6077,7 +6208,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMApprove); i { case 0: return &v.state @@ -6089,7 +6220,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMReject); i { case 0: return &v.state @@ -6101,7 +6232,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMReject); i { case 0: return &v.state @@ -6113,7 +6244,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMLeaveGuild); i { case 0: return &v.state @@ -6125,7 +6256,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMLeaveGuild); i { case 0: return &v.state @@ -6137,7 +6268,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[59].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMDismissMember); i { case 0: return &v.state @@ -6149,7 +6280,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[60].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[59].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMDismissMember); i { case 0: return &v.state @@ -6161,7 +6292,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[61].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[60].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMSetMemberLevel); i { case 0: return &v.state @@ -6173,7 +6304,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[62].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[61].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMSetMemberLevel); i { case 0: return &v.state @@ -6185,7 +6316,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[63].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[62].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMPromoteMember); i { case 0: return &v.state @@ -6197,7 +6328,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[64].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[63].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMPromoteMember); i { case 0: return &v.state @@ -6209,7 +6340,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[65].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[64].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMDemoteMember); i { case 0: return &v.state @@ -6221,7 +6352,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[66].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[65].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMDemoteMember); i { case 0: return &v.state @@ -6233,7 +6364,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[67].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[66].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMGuildMembersList); i { case 0: return &v.state @@ -6245,7 +6376,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[68].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[67].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMGuildMembersList); i { case 0: return &v.state @@ -6257,7 +6388,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[69].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[68].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMDisband); i { case 0: return &v.state @@ -6269,7 +6400,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[70].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[69].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMDisband); i { case 0: return &v.state @@ -6281,7 +6412,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[71].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[70].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMSearchGuilds); i { case 0: return &v.state @@ -6293,7 +6424,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[72].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[71].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMSearchGuilds); i { case 0: return &v.state @@ -6305,19 +6436,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[73].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MFGuild); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_cs_proto_proto_msgTypes[74].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[72].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMGuildLogs); i { case 0: return &v.state @@ -6329,7 +6448,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[75].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[73].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMGuildLogs); i { case 0: return &v.state @@ -6341,7 +6460,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[76].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[74].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MFGuildLog); i { case 0: return &v.state @@ -6353,7 +6472,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[77].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[75].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMSetName); i { case 0: return &v.state @@ -6365,7 +6484,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[78].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[76].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMSetName); i { case 0: return &v.state @@ -6377,7 +6496,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[79].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[77].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMSetAvatar); i { case 0: return &v.state @@ -6389,7 +6508,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[80].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[78].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMSetAvatar); i { case 0: return &v.state @@ -6401,7 +6520,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[81].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[79].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMSetNotice); i { case 0: return &v.state @@ -6413,7 +6532,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[82].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[80].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMSetNotice); i { case 0: return &v.state @@ -6425,6 +6544,54 @@ func file_cs_proto_proto_init() { return nil } } + file_cs_proto_proto_msgTypes[81].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CMSetJoinCond); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_cs_proto_proto_msgTypes[82].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SMSetJoinCond); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_cs_proto_proto_msgTypes[83].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*MFGuild); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_cs_proto_proto_msgTypes[84].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*MFGuildMember); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -6432,7 +6599,7 @@ func file_cs_proto_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_cs_proto_proto_rawDesc, NumEnums: 1, - NumMessages: 83, + NumMessages: 85, NumExtensions: 0, NumServices: 0, }, diff --git a/server/imserver/guildmgr.go b/server/imserver/guildmgr.go index 1cfe1abf..bb07da69 100644 --- a/server/imserver/guildmgr.go +++ b/server/imserver/guildmgr.go @@ -838,6 +838,27 @@ func (gm *GuildMgr) SetNotice(operatorAccountId string, notice *string, cb func( }) } +// SetJoinCond 请求设置公会加入条件 +func (gm *GuildMgr) SetJoinCond(operatorAccountId string, joinCond, joinCondValue int32, cb func(errCode int32, errMsg string)) { + guild, ok := gm.CheckGuildAndPermission(operatorAccountId) + if !ok { + return + } + updateFields := [][]string{ + {"join_cond", q5.ToString(joinCond)}, + {"join_cond_value", q5.ToString(joinCondValue)}, + } + gm.updateGuild(guild, updateFields, func(err error) { + if err != nil { + cb(ERR_CODE_UPDATE_GUILD_DB_FAIL, err.Error()) + return + } + guild.JoinCond = joinCond + guild.JoinCondValue = joinCondValue + cb(ERR_CODE_OK, "SetJoinCond OK") + }) +} + // WriteLog 记录公会日志 func (gm *GuildMgr) WriteLog(guildId int64, accountId string, logType int32, content string) { guild := gm.GetGuild(guildId) diff --git a/server/imserver/player.go b/server/imserver/player.go index 702c6df7..b59caa14 100644 --- a/server/imserver/player.go +++ b/server/imserver/player.go @@ -343,19 +343,24 @@ func (p *Player) CMGuildInfo(hdr *f5.MsgHdr, msg *cs.CMGuildInfo) { guild := guildMgr.GetGuildByAccountId(p.accountId) if guild == nil { rspMsg.Guild = nil - rspMsg.RandomGuilds = p.FillGuild(guildMgr.RandomGuilds()) + rspMsg.RandomGuilds = p.FillGuilds(guildMgr.RandomGuilds()) wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg) return } - membersCount := q5.ToInt32(guild.GetMembersCount()) + rspGuild := &cs.MFGuild{ - AutoId: &guild.AutoId, - GuildId: &guild.GuildId, - Name: &guild.Name, - LeaderId: &guild.LeaderId, - MembersCount: &membersCount, - MembersMax: &guild.MembersMax, - Notice: &guild.Notice, + AutoId: &guild.AutoId, + GuildId: &guild.GuildId, + Name: &guild.Name, + LeaderId: &guild.LeaderId, + Avatar: &guild.Avatar, + Notice: &guild.Notice, + JoinCond: &guild.JoinCond, + JoinCondValue: &guild.JoinCondValue, + TotalStars: &guild.TotalStars, + TotalKills: &guild.TotalKills, + ChickenDinners: &guild.ChickenDinners, + MaxMembers: &guild.MembersMax, } rspMsg.Guild = rspGuild rspMsg.RandomGuilds = nil @@ -372,23 +377,7 @@ func (p *Player) CMCreateGuild(hdr *f5.MsgHdr, msg *cs.CMCreateGuild) { rspMsg.Errcode = &errCode rspMsg.Errmsg = &errMsg } else { - memberCount := q5.ToInt32(guild.GetMembersCount()) - rspGuild := &cs.MFGuild{ - AutoId: &guild.AutoId, - GuildId: &guild.GuildId, - Name: &guild.Name, - LeaderId: &guild.LeaderId, - Avatar: &guild.Avatar, - Notice: &guild.Notice, - JoinCond: &guild.JoinCond, - JoinCondValue: &guild.JoinCondValue, - TotalStars: &guild.TotalStars, - TotalKills: &guild.TotalKills, - ChickenDinners: &guild.ChickenDinners, - MembersCount: &memberCount, - MembersMax: &guild.MembersMax, - } - rspMsg.Guild = rspGuild + rspMsg.Guild = p.FillMFGuild(guild) } wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg) }) @@ -422,8 +411,10 @@ func (p *Player) CMApplyList(hdr *f5.MsgHdr, msg *cs.CMApplyList) { if profile == nil { continue } - user := &cs.MFGuildApplyUser{ + defaultLevel := q5.ToInt32(GuildMemberLevelDefault) + member := &cs.MFGuildMember{ AccountId: &profile.AccountId, + Level: &defaultLevel, Username: &profile.Username, Avatar: &profile.Avatar, AvatarHead: &profile.AvatarHead, @@ -431,7 +422,7 @@ func (p *Player) CMApplyList(hdr *f5.MsgHdr, msg *cs.CMApplyList) { OnlineStatus: &profile.OnlineStatus, LastLoginTime: &profile.LastLoginTime, } - rspMsg.Users = append(rspMsg.Users, user) + rspMsg.Members = append(rspMsg.Members, member) } } wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg) @@ -603,13 +594,50 @@ func (p *Player) CMSetName(hdr *f5.MsgHdr, msg *cs.CMSetName) { }) } +// CMSetJoinCond 设置公会加入条件 +func (p *Player) CMSetJoinCond(hdr *f5.MsgHdr, msg *cs.CMSetJoinCond) { + guildMgr.SetJoinCond( + p.accountId, + msg.GetJoinCond(), + msg.GetJoinCondValue(), + func(errCode int32, errMsg string) { + rspMsg := new(cs.SMSetJoinCond) + if errCode != 0 { + rspMsg.Errcode = &errCode + rspMsg.Errmsg = &errMsg + } + wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg) + }) +} + +// CMGuildMembersList 公会成员列表 +func (p *Player) CMGuildMembersList(hdr *f5.MsgHdr, msg *cs.CMGuildMembersList) { + rspMsg := new(cs.SMGuildMembersList) + + guild := guildMgr.GetGuildByAccountId(p.accountId) + if guild == nil { + errCode := q5.ToInt32(ERR_CODE_CREATE_GUILD_DB_FAIL) + errMsg := "No guild" + rspMsg.Errcode = &errCode + rspMsg.Errmsg = &errMsg + } else { + for _, member := range guild.Members { + guildMember := p.FillMFGuildMember(member) + if guildMember != nil { + rspMsg.Members = append(rspMsg.Members, guildMember) + } + } + } + + wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg) +} + // CMSearchGuilds 搜索公会 func (p *Player) CMSearchGuilds(hdr *f5.MsgHdr, msg *cs.CMSearchGuilds) { sinceId := msg.GetSinceId() name := msg.GetName() - rspMsg := new(cs.SMSearchGuilds) - rspMsg.Guilds = p.FillGuild(guildMgr.SearchGuilds(sinceId, name)) + rspMsg.Guilds = p.FillGuilds(guildMgr.SearchGuilds(sinceId, name)) f5.GetSysLog().Info("CMSearchGuilds name[%s], result:%d \n", msg.GetName(), len(rspMsg.Guilds)) wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg) } @@ -634,21 +662,59 @@ func (p *Player) CMGuildLogs(hdr *f5.MsgHdr, msg *cs.CMGuildLogs) { wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg) } -// FillGuild 填充公共列表 -func (p *Player) FillGuild(guilds []*Guild) []*cs.MFGuild { +func (p *Player) FillMFGuildMember(member *GuildMember) *cs.MFGuildMember { + profile := cacheMgr.GetPlayerProfile(member.AccountId) + if profile == nil { + return nil + } + guildMember := &cs.MFGuildMember{ + AccountId: &member.AccountId, + Level: &member.Level, + Username: &profile.Username, + Avatar: &profile.Avatar, + AvatarHead: &profile.AvatarHead, + Rank: &profile.Rank, + OnlineStatus: &profile.OnlineStatus, + LastLoginTime: &profile.LastLoginTime, + } + return guildMember +} + +// FillMFGuild 填充公会 +func (p *Player) FillMFGuild(guild *Guild) *cs.MFGuild { + var guildMembers []*cs.MFGuildMember + for _, member := range guild.Members { + guildMember := p.FillMFGuildMember(member) + if guildMember == nil { + continue + } + guildMembers = append(guildMembers, guildMember) + } + + var resGuild *cs.MFGuild + resGuild = &cs.MFGuild{ + AutoId: &guild.AutoId, + GuildId: &guild.GuildId, + Name: &guild.Name, + LeaderId: &guild.LeaderId, + Avatar: &guild.Avatar, + Notice: &guild.Notice, + JoinCond: &guild.JoinCond, + JoinCondValue: &guild.JoinCondValue, + TotalStars: &guild.TotalStars, + TotalKills: &guild.TotalKills, + ChickenDinners: &guild.ChickenDinners, + MaxMembers: &guild.MembersMax, + Members: guildMembers, + } + return resGuild +} + +// FillGuilds 填充公会列表 +func (p *Player) FillGuilds(guilds []*Guild) []*cs.MFGuild { var resGuilds []*cs.MFGuild for _, g := range guilds { - membersCount := q5.ToInt32(len(g.Members)) - membersMax := q5.ToInt32(g.MembersMax) - guild := &cs.MFGuild{ - AutoId: &g.AutoId, - GuildId: &g.GuildId, - Name: &g.Name, - LeaderId: &g.LeaderId, - MembersCount: &membersCount, - MembersMax: &membersMax, - Notice: &g.Notice, - } + guild := p.FillMFGuild(g) resGuilds = append(resGuilds, guild) } return resGuilds diff --git a/server/imserver/proto/cs_msgid.proto b/server/imserver/proto/cs_msgid.proto index 7e3cf509..7d783f48 100644 --- a/server/imserver/proto/cs_msgid.proto +++ b/server/imserver/proto/cs_msgid.proto @@ -48,6 +48,7 @@ enum CMMessageId_e _CMGuildMembersList = 135; _CMSetName = 136; _CMSetAvatar = 137; + _CMSetJoinCond = 138; } enum SMMessageId_e @@ -88,6 +89,7 @@ enum SMMessageId_e _SMGuildMembersList = 135; _SMSetName = 136; _SMSetAvatar = 137; + _SMSetJoinCond = 138; // 聊天相关 _SMUpdateChatRedPointNotify = 200; diff --git a/server/imserver/proto/cs_proto.proto b/server/imserver/proto/cs_proto.proto index bc9a33b1..424b8333 100644 --- a/server/imserver/proto/cs_proto.proto +++ b/server/imserver/proto/cs_proto.proto @@ -384,7 +384,6 @@ message SMCreateGuild { optional int32 errcode = 1; optional string errmsg = 2; -// optional int64 guild_id = 3; optional MFGuild guild = 3; } @@ -409,17 +408,7 @@ message SMApplyList { optional string errcode = 1; optional string errmsg = 2; - repeated MFGuildApplyUser users = 3; -} - -message MFGuildApplyUser { - optional string account_id = 1; - optional string username = 2; - optional int32 avatar = 3; - optional int32 avatar_head = 4; - optional int32 rank = 5; - optional int32 online_status = 6; - optional int32 last_login_time = 7; + repeated MFGuildMember members = 3; } // 请求批准申请加入公会 @@ -522,7 +511,7 @@ message SMGuildMembersList { optional int32 errcode = 1; optional string errmsg = 2; - repeated MFUser users = 3; + repeated MFGuildMember members = 3; } // 请求解散公会 @@ -554,22 +543,6 @@ message SMSearchGuilds repeated MFGuild guilds = 4; } -message MFGuild { - optional int64 auto_id = 1; - optional int64 guild_id = 2; - optional string name = 3; - optional string leader_id = 4; - optional int32 avatar = 5; - optional string notice = 6; - optional int32 join_cond = 7; // 公会加入条件 default:0, free:1 , 2 ,star: 3 - optional int32 join_cond_value = 8; // star value - optional int32 total_stars = 9; // 公会统计信息, 总星星数量 - optional int32 total_kills = 10; // 公会统计信息, 单局总击杀数 - optional int32 chicken_dinners = 11; // 公会统计信息, 单局第一名数 - optional int32 members_count = 12; // 成员数 - optional int32 members_max = 13; // 成员上限 -} - // 请求公会日志 message CMGuildLogs{} @@ -625,4 +598,46 @@ message SMSetNotice { optional int32 errcode = 1; optional string errmsg = 2; +} + +// 请求设置公会加入条件 +message CMSetJoinCond +{ + optional int32 join_cond = 1; // default: 0, free:1, star: 2 + optional int32 join_cond_value = 2; // only cond star, value: +} + +// 回复设置公会加入条件 +message SMSetJoinCond +{ + optional int32 errcode = 1; + optional string errmsg = 2; +} + +message MFGuild { + optional int64 auto_id = 1; + optional int64 guild_id = 2; + optional string name = 3; + optional string leader_id = 4; + optional int32 avatar = 5; + optional string notice = 6; + optional int32 join_cond = 7; // 公会加入条件 default:0, free:1, star: 2 + optional int32 join_cond_value = 8; // star value + optional int32 total_stars = 9; // 公会统计信息, 总星星数量 + optional int32 total_kills = 10; // 公会统计信息, 单局总击杀数 + optional int32 chicken_dinners = 11; // 公会统计信息, 单局第一名数 + optional int32 max_members = 13; // 成员上限 + repeated MFGuildMember members = 14; +} + +message MFGuildMember { + optional string account_id = 1; + optional string username = 2; + optional int32 avatar = 3; + optional int32 avatar_head = 4; + optional int32 rank = 7; + optional int32 online_status = 8; + optional int32 last_login_time = 9; + optional int32 level = 10; + optional int32 star = 11; } \ No newline at end of file