From fcdf6c0c611191b13a922f7bdbfbbc3f5f1489df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B7=E5=8B=87?= Date: Wed, 20 Sep 2023 18:06:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=85=AC=E4=BC=9A=E6=88=90?= =?UTF-8?q?=E5=91=98=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/imserver/cs/cs.auto_gen.go | 8 + server/imserver/cs/cs_msgid.pb.go | 13 +- server/imserver/cs/cs_proto.pb.go | 957 +++++++++++++++++---------- server/imserver/guildmgr.go | 52 +- server/imserver/player.go | 106 ++- server/imserver/proto/cs_msgid.proto | 2 + server/imserver/proto/cs_proto.proto | 24 + 7 files changed, 763 insertions(+), 399 deletions(-) diff --git a/server/imserver/cs/cs.auto_gen.go b/server/imserver/cs/cs.auto_gen.go index 01211edb..1dcd5034 100644 --- a/server/imserver/cs/cs.auto_gen.go +++ b/server/imserver/cs/cs.auto_gen.go @@ -365,6 +365,10 @@ func (this *SMApplyToGuild) GetNetMsgId() uint16 { return uint16(SMMessageIdE__SMApplyToGuild) } +func (this *SMApplyToGuildNotify) GetNetMsgId() uint16 { + return uint16(SMMessageIdE__SMApplyToGuildNotify) +} + func (this *CMApplyList) GetNetMsgId() uint16 { return uint16(CMMessageIdE__CMApplyList) } @@ -401,6 +405,10 @@ func (this *SMLeaveGuild) GetNetMsgId() uint16 { return uint16(SMMessageIdE__SMLeaveGuild) } +func (this *SMLeaveGuildNotify) GetNetMsgId() uint16 { + return uint16(SMMessageIdE__SMLeaveGuildNotify) +} + func (this *CMDismissMember) GetNetMsgId() uint16 { return uint16(CMMessageIdE__CMDismissMember) } diff --git a/server/imserver/cs/cs_msgid.pb.go b/server/imserver/cs/cs_msgid.pb.go index 8aaa7663..a7faf347 100644 --- a/server/imserver/cs/cs_msgid.pb.go +++ b/server/imserver/cs/cs_msgid.pb.go @@ -229,6 +229,8 @@ const ( SMMessageIdE__SMApproveJoinGuildNotify SMMessageIdE = 1010 SMMessageIdE__SMDismissMemberNotify SMMessageIdE = 1011 SMMessageIdE__SMSetMemberLevelNotify SMMessageIdE = 1012 + SMMessageIdE__SMApplyToGuildNotify SMMessageIdE = 1013 + SMMessageIdE__SMLeaveGuildNotify SMMessageIdE = 1014 ) // Enum value maps for SMMessageIdE. @@ -275,6 +277,8 @@ var ( 1010: "_SMApproveJoinGuildNotify", 1011: "_SMDismissMemberNotify", 1012: "_SMSetMemberLevelNotify", + 1013: "_SMApplyToGuildNotify", + 1014: "_SMLeaveGuildNotify", } SMMessageIdE_value = map[string]int32{ "_SMPing": 101, @@ -318,6 +322,8 @@ var ( "_SMApproveJoinGuildNotify": 1010, "_SMDismissMemberNotify": 1011, "_SMSetMemberLevelNotify": 1012, + "_SMApplyToGuildNotify": 1013, + "_SMLeaveGuildNotify": 1014, } ) @@ -412,7 +418,7 @@ var file_cs_msgid_proto_rawDesc = []byte{ 0x53, 0x65, 0x74, 0x41, 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, 0x12, 0x1a, 0x0a, 0x15, 0x5f, 0x43, 0x4d, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, - 0x64, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x8b, 0x01, 0x2a, 0xc1, 0x07, + 0x64, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x8b, 0x01, 0x2a, 0xf7, 0x07, 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, @@ -473,7 +479,10 @@ var file_cs_msgid_proto_rawDesc = []byte{ 0x6d, 0x69, 0x73, 0x73, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xf3, 0x07, 0x12, 0x1c, 0x0a, 0x17, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xf4, - 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x63, 0x73, + 0x07, 0x12, 0x1a, 0x0a, 0x15, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x54, 0x6f, 0x47, + 0x75, 0x69, 0x6c, 0x64, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xf5, 0x07, 0x12, 0x18, 0x0a, + 0x13, 0x5f, 0x53, 0x4d, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4e, 0x6f, + 0x74, 0x69, 0x66, 0x79, 0x10, 0xf6, 0x07, 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 1056e932..37e18a83 100644 --- a/server/imserver/cs/cs_proto.pb.go +++ b/server/imserver/cs/cs_proto.pb.go @@ -3081,6 +3081,78 @@ func (x *SMApplyToGuild) GetErrmsg() string { return "" } +// 收到申请加入公会 +type SMApplyToGuildNotify 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"` + Name *string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"` + AccountId *string `protobuf:"bytes,3,opt,name=accountId" json:"accountId,omitempty"` + Username *string `protobuf:"bytes,4,opt,name=username" json:"username,omitempty"` +} + +func (x *SMApplyToGuildNotify) Reset() { + *x = SMApplyToGuildNotify{} + if protoimpl.UnsafeEnabled { + mi := &file_cs_proto_proto_msgTypes[52] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SMApplyToGuildNotify) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SMApplyToGuildNotify) ProtoMessage() {} + +func (x *SMApplyToGuildNotify) 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 SMApplyToGuildNotify.ProtoReflect.Descriptor instead. +func (*SMApplyToGuildNotify) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{52} +} + +func (x *SMApplyToGuildNotify) GetGuildId() int64 { + if x != nil && x.GuildId != nil { + return *x.GuildId + } + return 0 +} + +func (x *SMApplyToGuildNotify) GetName() string { + if x != nil && x.Name != nil { + return *x.Name + } + return "" +} + +func (x *SMApplyToGuildNotify) GetAccountId() string { + if x != nil && x.AccountId != nil { + return *x.AccountId + } + return "" +} + +func (x *SMApplyToGuildNotify) GetUsername() string { + if x != nil && x.Username != nil { + return *x.Username + } + return "" +} + // 请求申请者列表 type CMApplyList struct { state protoimpl.MessageState @@ -3091,7 +3163,7 @@ type CMApplyList struct { func (x *CMApplyList) Reset() { *x = CMApplyList{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[52] + mi := &file_cs_proto_proto_msgTypes[53] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3104,7 +3176,7 @@ func (x *CMApplyList) String() string { func (*CMApplyList) ProtoMessage() {} func (x *CMApplyList) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[52] + mi := &file_cs_proto_proto_msgTypes[53] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3117,7 +3189,7 @@ func (x *CMApplyList) ProtoReflect() protoreflect.Message { // Deprecated: Use CMApplyList.ProtoReflect.Descriptor instead. func (*CMApplyList) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{52} + return file_cs_proto_proto_rawDescGZIP(), []int{53} } // 回复申请者列表 @@ -3134,7 +3206,7 @@ type SMApplyList struct { func (x *SMApplyList) Reset() { *x = SMApplyList{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[53] + mi := &file_cs_proto_proto_msgTypes[54] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3147,7 +3219,7 @@ func (x *SMApplyList) String() string { func (*SMApplyList) ProtoMessage() {} func (x *SMApplyList) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[53] + mi := &file_cs_proto_proto_msgTypes[54] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3160,7 +3232,7 @@ func (x *SMApplyList) ProtoReflect() protoreflect.Message { // Deprecated: Use SMApplyList.ProtoReflect.Descriptor instead. func (*SMApplyList) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{53} + return file_cs_proto_proto_rawDescGZIP(), []int{54} } func (x *SMApplyList) GetErrcode() int32 { @@ -3196,7 +3268,7 @@ type CMApprove struct { func (x *CMApprove) Reset() { *x = CMApprove{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[54] + mi := &file_cs_proto_proto_msgTypes[55] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3209,7 +3281,7 @@ func (x *CMApprove) String() string { func (*CMApprove) ProtoMessage() {} func (x *CMApprove) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[54] + mi := &file_cs_proto_proto_msgTypes[55] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3222,7 +3294,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{54} + return file_cs_proto_proto_rawDescGZIP(), []int{55} } func (x *CMApprove) GetApplicantAccountId() string { @@ -3245,7 +3317,7 @@ type SMApprove struct { func (x *SMApprove) Reset() { *x = SMApprove{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[55] + mi := &file_cs_proto_proto_msgTypes[56] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3258,7 +3330,7 @@ func (x *SMApprove) String() string { func (*SMApprove) ProtoMessage() {} func (x *SMApprove) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[55] + mi := &file_cs_proto_proto_msgTypes[56] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3271,7 +3343,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{55} + return file_cs_proto_proto_rawDescGZIP(), []int{56} } func (x *SMApprove) GetErrcode() int32 { @@ -3294,14 +3366,16 @@ type SMApproveJoinGuildNotify struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - GuildId *int64 `protobuf:"varint,1,opt,name=guild_id,json=guildId" json:"guild_id,omitempty"` - Name *string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"` + GuildId *int64 `protobuf:"varint,1,opt,name=guild_id,json=guildId" json:"guild_id,omitempty"` + Name *string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"` + AccountId *string `protobuf:"bytes,3,opt,name=accountId" json:"accountId,omitempty"` + Username *string `protobuf:"bytes,4,opt,name=username" json:"username,omitempty"` } func (x *SMApproveJoinGuildNotify) Reset() { *x = SMApproveJoinGuildNotify{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[56] + mi := &file_cs_proto_proto_msgTypes[57] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3314,7 +3388,7 @@ func (x *SMApproveJoinGuildNotify) String() string { func (*SMApproveJoinGuildNotify) ProtoMessage() {} func (x *SMApproveJoinGuildNotify) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[56] + mi := &file_cs_proto_proto_msgTypes[57] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3327,7 +3401,7 @@ func (x *SMApproveJoinGuildNotify) ProtoReflect() protoreflect.Message { // Deprecated: Use SMApproveJoinGuildNotify.ProtoReflect.Descriptor instead. func (*SMApproveJoinGuildNotify) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{56} + return file_cs_proto_proto_rawDescGZIP(), []int{57} } func (x *SMApproveJoinGuildNotify) GetGuildId() int64 { @@ -3344,6 +3418,20 @@ func (x *SMApproveJoinGuildNotify) GetName() string { return "" } +func (x *SMApproveJoinGuildNotify) GetAccountId() string { + if x != nil && x.AccountId != nil { + return *x.AccountId + } + return "" +} + +func (x *SMApproveJoinGuildNotify) GetUsername() string { + if x != nil && x.Username != nil { + return *x.Username + } + return "" +} + // 请求拒绝加入公会 type CMReject struct { state protoimpl.MessageState @@ -3356,7 +3444,7 @@ type CMReject struct { func (x *CMReject) Reset() { *x = CMReject{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[57] + mi := &file_cs_proto_proto_msgTypes[58] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3369,7 +3457,7 @@ func (x *CMReject) String() string { func (*CMReject) ProtoMessage() {} func (x *CMReject) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[57] + mi := &file_cs_proto_proto_msgTypes[58] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3382,7 +3470,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{57} + return file_cs_proto_proto_rawDescGZIP(), []int{58} } func (x *CMReject) GetApplicantAccountId() string { @@ -3405,7 +3493,7 @@ type SMReject struct { func (x *SMReject) Reset() { *x = SMReject{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[58] + mi := &file_cs_proto_proto_msgTypes[59] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3418,7 +3506,7 @@ func (x *SMReject) String() string { func (*SMReject) ProtoMessage() {} func (x *SMReject) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[58] + mi := &file_cs_proto_proto_msgTypes[59] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3431,7 +3519,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{58} + return file_cs_proto_proto_rawDescGZIP(), []int{59} } func (x *SMReject) GetErrcode() int32 { @@ -3458,7 +3546,7 @@ type CMLeaveGuild struct { func (x *CMLeaveGuild) Reset() { *x = CMLeaveGuild{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[59] + mi := &file_cs_proto_proto_msgTypes[60] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3471,7 +3559,7 @@ func (x *CMLeaveGuild) String() string { func (*CMLeaveGuild) ProtoMessage() {} func (x *CMLeaveGuild) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[59] + mi := &file_cs_proto_proto_msgTypes[60] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3484,7 +3572,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{59} + return file_cs_proto_proto_rawDescGZIP(), []int{60} } // 回复离开公会 @@ -3500,7 +3588,7 @@ type SMLeaveGuild struct { func (x *SMLeaveGuild) Reset() { *x = SMLeaveGuild{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[60] + mi := &file_cs_proto_proto_msgTypes[61] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3513,7 +3601,7 @@ func (x *SMLeaveGuild) String() string { func (*SMLeaveGuild) ProtoMessage() {} func (x *SMLeaveGuild) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[60] + mi := &file_cs_proto_proto_msgTypes[61] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3526,7 +3614,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{60} + return file_cs_proto_proto_rawDescGZIP(), []int{61} } func (x *SMLeaveGuild) GetErrcode() int32 { @@ -3543,6 +3631,78 @@ func (x *SMLeaveGuild) GetErrmsg() string { return "" } +// 收到离开公会 +type SMLeaveGuildNotify 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"` + Name *string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"` + AccountId *string `protobuf:"bytes,3,opt,name=accountId" json:"accountId,omitempty"` + Username *string `protobuf:"bytes,4,opt,name=username" json:"username,omitempty"` +} + +func (x *SMLeaveGuildNotify) Reset() { + *x = SMLeaveGuildNotify{} + if protoimpl.UnsafeEnabled { + mi := &file_cs_proto_proto_msgTypes[62] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SMLeaveGuildNotify) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SMLeaveGuildNotify) ProtoMessage() {} + +func (x *SMLeaveGuildNotify) ProtoReflect() protoreflect.Message { + mi := &file_cs_proto_proto_msgTypes[62] + 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 SMLeaveGuildNotify.ProtoReflect.Descriptor instead. +func (*SMLeaveGuildNotify) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{62} +} + +func (x *SMLeaveGuildNotify) GetGuildId() int64 { + if x != nil && x.GuildId != nil { + return *x.GuildId + } + return 0 +} + +func (x *SMLeaveGuildNotify) GetName() string { + if x != nil && x.Name != nil { + return *x.Name + } + return "" +} + +func (x *SMLeaveGuildNotify) GetAccountId() string { + if x != nil && x.AccountId != nil { + return *x.AccountId + } + return "" +} + +func (x *SMLeaveGuildNotify) GetUsername() string { + if x != nil && x.Username != nil { + return *x.Username + } + return "" +} + // 请求开除成员 type CMDismissMember struct { state protoimpl.MessageState @@ -3555,7 +3715,7 @@ type CMDismissMember struct { func (x *CMDismissMember) Reset() { *x = CMDismissMember{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[61] + mi := &file_cs_proto_proto_msgTypes[63] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3568,7 +3728,7 @@ func (x *CMDismissMember) String() string { func (*CMDismissMember) ProtoMessage() {} func (x *CMDismissMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[61] + mi := &file_cs_proto_proto_msgTypes[63] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3581,7 +3741,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{61} + return file_cs_proto_proto_rawDescGZIP(), []int{63} } func (x *CMDismissMember) GetDismissAccountId() string { @@ -3604,7 +3764,7 @@ type SMDismissMember struct { func (x *SMDismissMember) Reset() { *x = SMDismissMember{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[62] + mi := &file_cs_proto_proto_msgTypes[64] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3617,7 +3777,7 @@ func (x *SMDismissMember) String() string { func (*SMDismissMember) ProtoMessage() {} func (x *SMDismissMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[62] + mi := &file_cs_proto_proto_msgTypes[64] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3630,7 +3790,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{62} + return file_cs_proto_proto_rawDescGZIP(), []int{64} } func (x *SMDismissMember) GetErrcode() int32 { @@ -3653,14 +3813,16 @@ type SMDismissMemberNotify struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - GuildId *int64 `protobuf:"varint,1,opt,name=guild_id,json=guildId" json:"guild_id,omitempty"` - Name *string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"` + GuildId *int64 `protobuf:"varint,1,opt,name=guild_id,json=guildId" json:"guild_id,omitempty"` + Name *string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"` + AccountId *string `protobuf:"bytes,3,opt,name=accountId" json:"accountId,omitempty"` + Username *string `protobuf:"bytes,4,opt,name=username" json:"username,omitempty"` } func (x *SMDismissMemberNotify) Reset() { *x = SMDismissMemberNotify{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[63] + mi := &file_cs_proto_proto_msgTypes[65] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3673,7 +3835,7 @@ func (x *SMDismissMemberNotify) String() string { func (*SMDismissMemberNotify) ProtoMessage() {} func (x *SMDismissMemberNotify) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[63] + mi := &file_cs_proto_proto_msgTypes[65] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3686,7 +3848,7 @@ func (x *SMDismissMemberNotify) ProtoReflect() protoreflect.Message { // Deprecated: Use SMDismissMemberNotify.ProtoReflect.Descriptor instead. func (*SMDismissMemberNotify) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{63} + return file_cs_proto_proto_rawDescGZIP(), []int{65} } func (x *SMDismissMemberNotify) GetGuildId() int64 { @@ -3703,6 +3865,20 @@ func (x *SMDismissMemberNotify) GetName() string { return "" } +func (x *SMDismissMemberNotify) GetAccountId() string { + if x != nil && x.AccountId != nil { + return *x.AccountId + } + return "" +} + +func (x *SMDismissMemberNotify) GetUsername() string { + if x != nil && x.Username != nil { + return *x.Username + } + return "" +} + // 请求设置公会成员等级 type CMSetMemberLevel struct { state protoimpl.MessageState @@ -3716,7 +3892,7 @@ type CMSetMemberLevel struct { func (x *CMSetMemberLevel) Reset() { *x = CMSetMemberLevel{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[64] + mi := &file_cs_proto_proto_msgTypes[66] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3729,7 +3905,7 @@ func (x *CMSetMemberLevel) String() string { func (*CMSetMemberLevel) ProtoMessage() {} func (x *CMSetMemberLevel) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[64] + mi := &file_cs_proto_proto_msgTypes[66] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3742,7 +3918,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{64} + return file_cs_proto_proto_rawDescGZIP(), []int{66} } func (x *CMSetMemberLevel) GetMemberAccountId() string { @@ -3772,7 +3948,7 @@ type SMSetMemberLevel struct { func (x *SMSetMemberLevel) Reset() { *x = SMSetMemberLevel{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[65] + mi := &file_cs_proto_proto_msgTypes[67] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3785,7 +3961,7 @@ func (x *SMSetMemberLevel) String() string { func (*SMSetMemberLevel) ProtoMessage() {} func (x *SMSetMemberLevel) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[65] + mi := &file_cs_proto_proto_msgTypes[67] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3798,7 +3974,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{65} + return file_cs_proto_proto_rawDescGZIP(), []int{67} } func (x *SMSetMemberLevel) GetErrcode() int32 { @@ -3824,12 +4000,14 @@ type SMSetMemberLevelNotify struct { GuildId *int64 `protobuf:"varint,1,opt,name=guild_id,json=guildId" json:"guild_id,omitempty"` Name *string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"` MemberLevel *int32 `protobuf:"varint,3,opt,name=memberLevel" json:"memberLevel,omitempty"` + AccountId *string `protobuf:"bytes,4,opt,name=accountId" json:"accountId,omitempty"` + Username *string `protobuf:"bytes,5,opt,name=username" json:"username,omitempty"` } func (x *SMSetMemberLevelNotify) Reset() { *x = SMSetMemberLevelNotify{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[66] + mi := &file_cs_proto_proto_msgTypes[68] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3842,7 +4020,7 @@ func (x *SMSetMemberLevelNotify) String() string { func (*SMSetMemberLevelNotify) ProtoMessage() {} func (x *SMSetMemberLevelNotify) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[66] + mi := &file_cs_proto_proto_msgTypes[68] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3855,7 +4033,7 @@ func (x *SMSetMemberLevelNotify) ProtoReflect() protoreflect.Message { // Deprecated: Use SMSetMemberLevelNotify.ProtoReflect.Descriptor instead. func (*SMSetMemberLevelNotify) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{66} + return file_cs_proto_proto_rawDescGZIP(), []int{68} } func (x *SMSetMemberLevelNotify) GetGuildId() int64 { @@ -3879,6 +4057,20 @@ func (x *SMSetMemberLevelNotify) GetMemberLevel() int32 { return 0 } +func (x *SMSetMemberLevelNotify) GetAccountId() string { + if x != nil && x.AccountId != nil { + return *x.AccountId + } + return "" +} + +func (x *SMSetMemberLevelNotify) GetUsername() string { + if x != nil && x.Username != nil { + return *x.Username + } + return "" +} + // 请求公会成员列表 type CMGuildMembersList struct { state protoimpl.MessageState @@ -3889,7 +4081,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[69] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3902,7 +4094,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[69] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3915,7 +4107,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{69} } // 回复公会成员列表 @@ -3932,7 +4124,7 @@ type SMGuildMembersList struct { func (x *SMGuildMembersList) Reset() { *x = SMGuildMembersList{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[68] + mi := &file_cs_proto_proto_msgTypes[70] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3945,7 +4137,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[70] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3958,7 +4150,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{70} } func (x *SMGuildMembersList) GetErrcode() int32 { @@ -3992,7 +4184,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[71] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4005,7 +4197,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[71] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4018,7 +4210,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{71} } // 回复解散公会 @@ -4034,7 +4226,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[72] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4047,7 +4239,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[72] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4060,7 +4252,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{72} } func (x *SMDisband) GetErrcode() int32 { @@ -4090,7 +4282,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[73] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4103,7 +4295,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[73] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4116,7 +4308,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{73} } func (x *CMSearchGuilds) GetSinceId() int64 { @@ -4148,7 +4340,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[74] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4161,7 +4353,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[74] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4174,7 +4366,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{74} } func (x *SMSearchGuilds) GetErrcode() int32 { @@ -4215,7 +4407,7 @@ type CMGuildLogs struct { func (x *CMGuildLogs) Reset() { *x = CMGuildLogs{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[73] + mi := &file_cs_proto_proto_msgTypes[75] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4228,7 +4420,7 @@ func (x *CMGuildLogs) String() string { func (*CMGuildLogs) ProtoMessage() {} func (x *CMGuildLogs) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[73] + mi := &file_cs_proto_proto_msgTypes[75] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4241,7 +4433,7 @@ func (x *CMGuildLogs) ProtoReflect() protoreflect.Message { // Deprecated: Use CMGuildLogs.ProtoReflect.Descriptor instead. func (*CMGuildLogs) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{73} + return file_cs_proto_proto_rawDescGZIP(), []int{75} } // 回复公会日志 @@ -4258,7 +4450,7 @@ type SMGuildLogs struct { func (x *SMGuildLogs) Reset() { *x = SMGuildLogs{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[74] + mi := &file_cs_proto_proto_msgTypes[76] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4271,7 +4463,7 @@ func (x *SMGuildLogs) String() string { func (*SMGuildLogs) ProtoMessage() {} func (x *SMGuildLogs) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[74] + mi := &file_cs_proto_proto_msgTypes[76] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4284,7 +4476,7 @@ func (x *SMGuildLogs) ProtoReflect() protoreflect.Message { // Deprecated: Use SMGuildLogs.ProtoReflect.Descriptor instead. func (*SMGuildLogs) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{74} + return file_cs_proto_proto_rawDescGZIP(), []int{76} } func (x *SMGuildLogs) GetErrcode() int32 { @@ -4322,7 +4514,7 @@ type MFGuildLog struct { func (x *MFGuildLog) Reset() { *x = MFGuildLog{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[75] + mi := &file_cs_proto_proto_msgTypes[77] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4335,7 +4527,7 @@ func (x *MFGuildLog) String() string { func (*MFGuildLog) ProtoMessage() {} func (x *MFGuildLog) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[75] + mi := &file_cs_proto_proto_msgTypes[77] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4348,7 +4540,7 @@ func (x *MFGuildLog) ProtoReflect() protoreflect.Message { // Deprecated: Use MFGuildLog.ProtoReflect.Descriptor instead. func (*MFGuildLog) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{75} + return file_cs_proto_proto_rawDescGZIP(), []int{77} } func (x *MFGuildLog) GetGuildId() int64 { @@ -4391,7 +4583,7 @@ type CMSetName struct { func (x *CMSetName) Reset() { *x = CMSetName{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[76] + mi := &file_cs_proto_proto_msgTypes[78] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4404,7 +4596,7 @@ func (x *CMSetName) String() string { func (*CMSetName) ProtoMessage() {} func (x *CMSetName) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[76] + mi := &file_cs_proto_proto_msgTypes[78] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4417,7 +4609,7 @@ func (x *CMSetName) ProtoReflect() protoreflect.Message { // Deprecated: Use CMSetName.ProtoReflect.Descriptor instead. func (*CMSetName) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{76} + return file_cs_proto_proto_rawDescGZIP(), []int{78} } func (x *CMSetName) GetName() string { @@ -4440,7 +4632,7 @@ type SMSetName struct { func (x *SMSetName) Reset() { *x = SMSetName{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[77] + mi := &file_cs_proto_proto_msgTypes[79] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4453,7 +4645,7 @@ func (x *SMSetName) String() string { func (*SMSetName) ProtoMessage() {} func (x *SMSetName) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[77] + mi := &file_cs_proto_proto_msgTypes[79] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4466,7 +4658,7 @@ func (x *SMSetName) ProtoReflect() protoreflect.Message { // Deprecated: Use SMSetName.ProtoReflect.Descriptor instead. func (*SMSetName) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{77} + return file_cs_proto_proto_rawDescGZIP(), []int{79} } func (x *SMSetName) GetErrcode() int32 { @@ -4495,7 +4687,7 @@ type CMSetAvatar struct { func (x *CMSetAvatar) Reset() { *x = CMSetAvatar{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[78] + mi := &file_cs_proto_proto_msgTypes[80] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4508,7 +4700,7 @@ func (x *CMSetAvatar) String() string { func (*CMSetAvatar) ProtoMessage() {} func (x *CMSetAvatar) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[78] + mi := &file_cs_proto_proto_msgTypes[80] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4521,7 +4713,7 @@ func (x *CMSetAvatar) ProtoReflect() protoreflect.Message { // Deprecated: Use CMSetAvatar.ProtoReflect.Descriptor instead. func (*CMSetAvatar) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{78} + return file_cs_proto_proto_rawDescGZIP(), []int{80} } func (x *CMSetAvatar) GetAvatar() int32 { @@ -4544,7 +4736,7 @@ type SMSetAvatar struct { func (x *SMSetAvatar) Reset() { *x = SMSetAvatar{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[79] + mi := &file_cs_proto_proto_msgTypes[81] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4557,7 +4749,7 @@ func (x *SMSetAvatar) String() string { func (*SMSetAvatar) ProtoMessage() {} func (x *SMSetAvatar) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[79] + mi := &file_cs_proto_proto_msgTypes[81] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4570,7 +4762,7 @@ func (x *SMSetAvatar) ProtoReflect() protoreflect.Message { // Deprecated: Use SMSetAvatar.ProtoReflect.Descriptor instead. func (*SMSetAvatar) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{79} + return file_cs_proto_proto_rawDescGZIP(), []int{81} } func (x *SMSetAvatar) GetErrcode() int32 { @@ -4599,7 +4791,7 @@ type CMSetNotice struct { func (x *CMSetNotice) Reset() { *x = CMSetNotice{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[80] + mi := &file_cs_proto_proto_msgTypes[82] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4612,7 +4804,7 @@ func (x *CMSetNotice) String() string { func (*CMSetNotice) ProtoMessage() {} func (x *CMSetNotice) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[80] + mi := &file_cs_proto_proto_msgTypes[82] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4625,7 +4817,7 @@ func (x *CMSetNotice) ProtoReflect() protoreflect.Message { // Deprecated: Use CMSetNotice.ProtoReflect.Descriptor instead. func (*CMSetNotice) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{80} + return file_cs_proto_proto_rawDescGZIP(), []int{82} } func (x *CMSetNotice) GetContent() string { @@ -4648,7 +4840,7 @@ type SMSetNotice struct { func (x *SMSetNotice) Reset() { *x = SMSetNotice{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[81] + mi := &file_cs_proto_proto_msgTypes[83] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4661,7 +4853,7 @@ func (x *SMSetNotice) String() string { func (*SMSetNotice) ProtoMessage() {} func (x *SMSetNotice) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[81] + mi := &file_cs_proto_proto_msgTypes[83] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4674,7 +4866,7 @@ func (x *SMSetNotice) ProtoReflect() protoreflect.Message { // Deprecated: Use SMSetNotice.ProtoReflect.Descriptor instead. func (*SMSetNotice) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{81} + return file_cs_proto_proto_rawDescGZIP(), []int{83} } func (x *SMSetNotice) GetErrcode() int32 { @@ -4704,7 +4896,7 @@ type CMSetJoinCond struct { func (x *CMSetJoinCond) Reset() { *x = CMSetJoinCond{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[82] + mi := &file_cs_proto_proto_msgTypes[84] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4717,7 +4909,7 @@ func (x *CMSetJoinCond) String() string { func (*CMSetJoinCond) ProtoMessage() {} func (x *CMSetJoinCond) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[82] + mi := &file_cs_proto_proto_msgTypes[84] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4730,7 +4922,7 @@ func (x *CMSetJoinCond) ProtoReflect() protoreflect.Message { // Deprecated: Use CMSetJoinCond.ProtoReflect.Descriptor instead. func (*CMSetJoinCond) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{82} + return file_cs_proto_proto_rawDescGZIP(), []int{84} } func (x *CMSetJoinCond) GetJoinCond() int32 { @@ -4760,7 +4952,7 @@ type SMSetJoinCond struct { func (x *SMSetJoinCond) Reset() { *x = SMSetJoinCond{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[83] + mi := &file_cs_proto_proto_msgTypes[85] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4773,7 +4965,7 @@ func (x *SMSetJoinCond) String() string { func (*SMSetJoinCond) ProtoMessage() {} func (x *SMSetJoinCond) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[83] + mi := &file_cs_proto_proto_msgTypes[85] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4786,7 +4978,7 @@ func (x *SMSetJoinCond) ProtoReflect() protoreflect.Message { // Deprecated: Use SMSetJoinCond.ProtoReflect.Descriptor instead. func (*SMSetJoinCond) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{83} + return file_cs_proto_proto_rawDescGZIP(), []int{85} } func (x *SMSetJoinCond) GetErrcode() int32 { @@ -4826,7 +5018,7 @@ type MFGuild struct { func (x *MFGuild) Reset() { *x = MFGuild{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[84] + mi := &file_cs_proto_proto_msgTypes[86] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4839,7 +5031,7 @@ func (x *MFGuild) String() string { func (*MFGuild) ProtoMessage() {} func (x *MFGuild) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[84] + mi := &file_cs_proto_proto_msgTypes[86] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4852,7 +5044,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{84} + return file_cs_proto_proto_rawDescGZIP(), []int{86} } func (x *MFGuild) GetAutoId() int64 { @@ -4965,7 +5157,7 @@ type MFGuildMember struct { func (x *MFGuildMember) Reset() { *x = MFGuildMember{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[85] + mi := &file_cs_proto_proto_msgTypes[87] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4978,7 +5170,7 @@ func (x *MFGuildMember) String() string { func (*MFGuildMember) ProtoMessage() {} func (x *MFGuildMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[85] + mi := &file_cs_proto_proto_msgTypes[87] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4991,7 +5183,7 @@ func (x *MFGuildMember) ProtoReflect() protoreflect.Message { // Deprecated: Use MFGuildMember.ProtoReflect.Descriptor instead. func (*MFGuildMember) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{85} + return file_cs_proto_proto_rawDescGZIP(), []int{87} } func (x *MFGuildMember) GetAccountId() string { @@ -5346,186 +5538,213 @@ var file_cs_proto_proto_rawDesc = []byte{ 0x79, 0x54, 0x6f, 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, 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, + 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x7f, 0x0a, 0x14, 0x53, 0x4d, + 0x41, 0x70, 0x70, 0x6c, 0x79, 0x54, 0x6f, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4e, 0x6f, 0x74, 0x69, + 0x66, 0x79, 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, 0x12, 0x0a, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x03, + 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, 0x04, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x22, 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, 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, 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, 0x83, 0x01, 0x0a, 0x18, 0x53, 0x4d, 0x41, 0x70, 0x70, + 0x72, 0x6f, 0x76, 0x65, 0x4a, 0x6f, 0x69, 0x6e, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4e, 0x6f, 0x74, + 0x69, 0x66, 0x79, 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, 0x12, + 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, + 0x03, 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, 0x04, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 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, 0x7d, 0x0a, 0x12, 0x53, 0x4d, + 0x4c, 0x65, 0x61, 0x76, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, + 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, 0x12, 0x0a, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, + 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x03, 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, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 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, 0x80, 0x01, + 0x0a, 0x15, 0x53, 0x4d, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x4d, 0x65, 0x6d, 0x62, 0x65, + 0x72, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 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, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x49, 0x64, 0x18, 0x03, 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, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, + 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, 0xa3, 0x01, 0x0a, 0x16, 0x53, 0x4d, 0x53, 0x65, 0x74, + 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x4e, 0x6f, 0x74, 0x69, 0x66, + 0x79, 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, 0x12, 0x0a, 0x04, + 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, + 0x12, 0x20, 0x0a, 0x0b, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, + 0x65, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, + 0x04, 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, 0x05, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 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, 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, 0x49, 0x0a, 0x18, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x72, 0x6f, - 0x76, 0x65, 0x4a, 0x6f, 0x69, 0x6e, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4e, 0x6f, 0x74, 0x69, 0x66, - 0x79, 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, 0x12, 0x0a, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 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, 0x46, 0x0a, 0x15, 0x53, 0x4d, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x4d, - 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 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, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 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, 0x69, 0x0a, 0x16, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4c, - 0x65, 0x76, 0x65, 0x6c, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 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, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x6d, 0x65, 0x6d, - 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, - 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 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, 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, + 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, 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, + 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, 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 ( @@ -5541,7 +5760,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, 86) +var file_cs_proto_proto_msgTypes = make([]protoimpl.MessageInfo, 88) var file_cs_proto_proto_goTypes = []interface{}{ (ConstantE)(0), // 0: cs.Constant_e (*CMPing)(nil), // 1: cs.CMPing @@ -5596,40 +5815,42 @@ var file_cs_proto_proto_goTypes = []interface{}{ (*SMCreateGuild)(nil), // 50: cs.SMCreateGuild (*CMApplyToGuild)(nil), // 51: cs.CMApplyToGuild (*SMApplyToGuild)(nil), // 52: cs.SMApplyToGuild - (*CMApplyList)(nil), // 53: cs.CMApplyList - (*SMApplyList)(nil), // 54: cs.SMApplyList - (*CMApprove)(nil), // 55: cs.CMApprove - (*SMApprove)(nil), // 56: cs.SMApprove - (*SMApproveJoinGuildNotify)(nil), // 57: cs.SMApproveJoinGuildNotify - (*CMReject)(nil), // 58: cs.CMReject - (*SMReject)(nil), // 59: cs.SMReject - (*CMLeaveGuild)(nil), // 60: cs.CMLeaveGuild - (*SMLeaveGuild)(nil), // 61: cs.SMLeaveGuild - (*CMDismissMember)(nil), // 62: cs.CMDismissMember - (*SMDismissMember)(nil), // 63: cs.SMDismissMember - (*SMDismissMemberNotify)(nil), // 64: cs.SMDismissMemberNotify - (*CMSetMemberLevel)(nil), // 65: cs.CMSetMemberLevel - (*SMSetMemberLevel)(nil), // 66: cs.SMSetMemberLevel - (*SMSetMemberLevelNotify)(nil), // 67: cs.SMSetMemberLevelNotify - (*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 - (*CMGuildLogs)(nil), // 74: cs.CMGuildLogs - (*SMGuildLogs)(nil), // 75: cs.SMGuildLogs - (*MFGuildLog)(nil), // 76: cs.MFGuildLog - (*CMSetName)(nil), // 77: cs.CMSetName - (*SMSetName)(nil), // 78: cs.SMSetName - (*CMSetAvatar)(nil), // 79: cs.CMSetAvatar - (*SMSetAvatar)(nil), // 80: cs.SMSetAvatar - (*CMSetNotice)(nil), // 81: cs.CMSetNotice - (*SMSetNotice)(nil), // 82: cs.SMSetNotice - (*CMSetJoinCond)(nil), // 83: cs.CMSetJoinCond - (*SMSetJoinCond)(nil), // 84: cs.SMSetJoinCond - (*MFGuild)(nil), // 85: cs.MFGuild - (*MFGuildMember)(nil), // 86: cs.MFGuildMember + (*SMApplyToGuildNotify)(nil), // 53: cs.SMApplyToGuildNotify + (*CMApplyList)(nil), // 54: cs.CMApplyList + (*SMApplyList)(nil), // 55: cs.SMApplyList + (*CMApprove)(nil), // 56: cs.CMApprove + (*SMApprove)(nil), // 57: cs.SMApprove + (*SMApproveJoinGuildNotify)(nil), // 58: cs.SMApproveJoinGuildNotify + (*CMReject)(nil), // 59: cs.CMReject + (*SMReject)(nil), // 60: cs.SMReject + (*CMLeaveGuild)(nil), // 61: cs.CMLeaveGuild + (*SMLeaveGuild)(nil), // 62: cs.SMLeaveGuild + (*SMLeaveGuildNotify)(nil), // 63: cs.SMLeaveGuildNotify + (*CMDismissMember)(nil), // 64: cs.CMDismissMember + (*SMDismissMember)(nil), // 65: cs.SMDismissMember + (*SMDismissMemberNotify)(nil), // 66: cs.SMDismissMemberNotify + (*CMSetMemberLevel)(nil), // 67: cs.CMSetMemberLevel + (*SMSetMemberLevel)(nil), // 68: cs.SMSetMemberLevel + (*SMSetMemberLevelNotify)(nil), // 69: cs.SMSetMemberLevelNotify + (*CMGuildMembersList)(nil), // 70: cs.CMGuildMembersList + (*SMGuildMembersList)(nil), // 71: cs.SMGuildMembersList + (*CMDisband)(nil), // 72: cs.CMDisband + (*SMDisband)(nil), // 73: cs.SMDisband + (*CMSearchGuilds)(nil), // 74: cs.CMSearchGuilds + (*SMSearchGuilds)(nil), // 75: cs.SMSearchGuilds + (*CMGuildLogs)(nil), // 76: cs.CMGuildLogs + (*SMGuildLogs)(nil), // 77: cs.SMGuildLogs + (*MFGuildLog)(nil), // 78: cs.MFGuildLog + (*CMSetName)(nil), // 79: cs.CMSetName + (*SMSetName)(nil), // 80: cs.SMSetName + (*CMSetAvatar)(nil), // 81: cs.CMSetAvatar + (*SMSetAvatar)(nil), // 82: cs.SMSetAvatar + (*CMSetNotice)(nil), // 83: cs.CMSetNotice + (*SMSetNotice)(nil), // 84: cs.SMSetNotice + (*CMSetJoinCond)(nil), // 85: cs.CMSetJoinCond + (*SMSetJoinCond)(nil), // 86: cs.SMSetJoinCond + (*MFGuild)(nil), // 87: cs.MFGuild + (*MFGuildMember)(nil), // 88: cs.MFGuildMember } var file_cs_proto_proto_depIdxs = []int32{ 34, // 0: cs.SMSearchUser.users:type_name -> cs.MFUser @@ -5640,14 +5861,14 @@ 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 - 85, // 8: cs.SMGuildInfo.guild:type_name -> cs.MFGuild - 85, // 9: cs.SMRecommendGuildList.recommend_guilds:type_name -> cs.MFGuild - 85, // 10: cs.SMCreateGuild.guild:type_name -> cs.MFGuild - 86, // 11: cs.SMApplyList.members:type_name -> cs.MFGuildMember - 86, // 12: cs.SMGuildMembersList.members:type_name -> cs.MFGuildMember - 85, // 13: cs.SMSearchGuilds.guilds:type_name -> cs.MFGuild - 76, // 14: cs.SMGuildLogs.guildLogs:type_name -> cs.MFGuildLog - 86, // 15: cs.MFGuild.members:type_name -> cs.MFGuildMember + 87, // 8: cs.SMGuildInfo.guild:type_name -> cs.MFGuild + 87, // 9: cs.SMRecommendGuildList.recommend_guilds:type_name -> cs.MFGuild + 87, // 10: cs.SMCreateGuild.guild:type_name -> cs.MFGuild + 88, // 11: cs.SMApplyList.members:type_name -> cs.MFGuildMember + 88, // 12: cs.SMGuildMembersList.members:type_name -> cs.MFGuildMember + 87, // 13: cs.SMSearchGuilds.guilds:type_name -> cs.MFGuild + 78, // 14: cs.SMGuildLogs.guildLogs:type_name -> cs.MFGuildLog + 88, // 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 @@ -6286,7 +6507,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMApplyList); i { + switch v := v.(*SMApplyToGuildNotify); i { case 0: return &v.state case 1: @@ -6298,7 +6519,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMApplyList); i { + switch v := v.(*CMApplyList); i { case 0: return &v.state case 1: @@ -6310,7 +6531,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMApprove); i { + switch v := v.(*SMApplyList); i { case 0: return &v.state case 1: @@ -6322,7 +6543,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMApprove); i { + switch v := v.(*CMApprove); i { case 0: return &v.state case 1: @@ -6334,7 +6555,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMApproveJoinGuildNotify); i { + switch v := v.(*SMApprove); i { case 0: return &v.state case 1: @@ -6346,7 +6567,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMReject); i { + switch v := v.(*SMApproveJoinGuildNotify); i { case 0: return &v.state case 1: @@ -6358,7 +6579,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMReject); i { + switch v := v.(*CMReject); i { case 0: return &v.state case 1: @@ -6370,7 +6591,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[59].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMLeaveGuild); i { + switch v := v.(*SMReject); i { case 0: return &v.state case 1: @@ -6382,7 +6603,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[60].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMLeaveGuild); i { + switch v := v.(*CMLeaveGuild); i { case 0: return &v.state case 1: @@ -6394,7 +6615,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[61].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMDismissMember); i { + switch v := v.(*SMLeaveGuild); i { case 0: return &v.state case 1: @@ -6406,7 +6627,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[62].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMDismissMember); i { + switch v := v.(*SMLeaveGuildNotify); i { case 0: return &v.state case 1: @@ -6418,7 +6639,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[63].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMDismissMemberNotify); i { + switch v := v.(*CMDismissMember); i { case 0: return &v.state case 1: @@ -6430,7 +6651,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[64].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMSetMemberLevel); i { + switch v := v.(*SMDismissMember); i { case 0: return &v.state case 1: @@ -6442,7 +6663,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[65].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMSetMemberLevel); i { + switch v := v.(*SMDismissMemberNotify); i { case 0: return &v.state case 1: @@ -6454,7 +6675,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[66].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMSetMemberLevelNotify); i { + switch v := v.(*CMSetMemberLevel); i { case 0: return &v.state case 1: @@ -6466,7 +6687,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[67].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMGuildMembersList); i { + switch v := v.(*SMSetMemberLevel); i { case 0: return &v.state case 1: @@ -6478,7 +6699,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[68].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMGuildMembersList); i { + switch v := v.(*SMSetMemberLevelNotify); i { case 0: return &v.state case 1: @@ -6490,7 +6711,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[69].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMDisband); i { + switch v := v.(*CMGuildMembersList); i { case 0: return &v.state case 1: @@ -6502,7 +6723,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[70].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMDisband); i { + switch v := v.(*SMGuildMembersList); i { case 0: return &v.state case 1: @@ -6514,7 +6735,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[71].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMSearchGuilds); i { + switch v := v.(*CMDisband); i { case 0: return &v.state case 1: @@ -6526,7 +6747,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[72].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMSearchGuilds); i { + switch v := v.(*SMDisband); i { case 0: return &v.state case 1: @@ -6538,7 +6759,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[73].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMGuildLogs); i { + switch v := v.(*CMSearchGuilds); i { case 0: return &v.state case 1: @@ -6550,7 +6771,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[74].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMGuildLogs); i { + switch v := v.(*SMSearchGuilds); i { case 0: return &v.state case 1: @@ -6562,7 +6783,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[75].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MFGuildLog); i { + switch v := v.(*CMGuildLogs); i { case 0: return &v.state case 1: @@ -6574,7 +6795,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[76].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMSetName); i { + switch v := v.(*SMGuildLogs); i { case 0: return &v.state case 1: @@ -6586,7 +6807,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[77].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMSetName); i { + switch v := v.(*MFGuildLog); i { case 0: return &v.state case 1: @@ -6598,7 +6819,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[78].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMSetAvatar); i { + switch v := v.(*CMSetName); i { case 0: return &v.state case 1: @@ -6610,7 +6831,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[79].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMSetAvatar); i { + switch v := v.(*SMSetName); i { case 0: return &v.state case 1: @@ -6622,7 +6843,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[80].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMSetNotice); i { + switch v := v.(*CMSetAvatar); i { case 0: return &v.state case 1: @@ -6634,7 +6855,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[81].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMSetNotice); i { + switch v := v.(*SMSetAvatar); i { case 0: return &v.state case 1: @@ -6646,7 +6867,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[82].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMSetJoinCond); i { + switch v := v.(*CMSetNotice); i { case 0: return &v.state case 1: @@ -6658,7 +6879,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[83].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMSetJoinCond); i { + switch v := v.(*SMSetNotice); i { case 0: return &v.state case 1: @@ -6670,7 +6891,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[84].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MFGuild); i { + switch v := v.(*CMSetJoinCond); i { case 0: return &v.state case 1: @@ -6682,6 +6903,30 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[85].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[86].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[87].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MFGuildMember); i { case 0: return &v.state @@ -6700,7 +6945,7 @@ func file_cs_proto_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_cs_proto_proto_rawDesc, NumEnums: 1, - NumMessages: 86, + NumMessages: 88, NumExtensions: 0, NumServices: 0, }, diff --git a/server/imserver/guildmgr.go b/server/imserver/guildmgr.go index 3d13f461..ce724968 100644 --- a/server/imserver/guildmgr.go +++ b/server/imserver/guildmgr.go @@ -136,20 +136,20 @@ func (gm *GuildMgr) CreateGuild(avatar int32, name *string, leaderId string, } // ApplyToGuild 申请加入公会 -func (gm *GuildMgr) ApplyToGuild(guildId int64, applicantAccountId string, cb func(errCode int32, errMsg string)) { +func (gm *GuildMgr) ApplyToGuild(guildId int64, applicantAccountId string, cb func(errCode int32, errMsg string, guild *Guild)) { guild := gm.GetGuild(guildId) if guild == nil { - cb(ERR_CODE_GUILD_NO_EXISTS, "ApplyToGuild guild no exists") + cb(ERR_CODE_GUILD_NO_EXISTS, "ApplyToGuild guild no exists", nil) return } // 是否加入其他公会 if gm.CheckJoinGuild(applicantAccountId) { - cb(ERR_CODE_JOINED_GUILD, "ApplyToGuild joined guild") + cb(ERR_CODE_JOINED_GUILD, "ApplyToGuild joined guild", nil) return } if guild.IsFull() { - cb(ERR_CODE_GUILD_MEMBER_FULL, "ApplyToGuild guild member full") + cb(ERR_CODE_GUILD_MEMBER_FULL, "ApplyToGuild guild member full", nil) return } // 可直接加入 @@ -161,11 +161,11 @@ func (gm *GuildMgr) ApplyToGuild(guildId int64, applicantAccountId string, cb fu if guild.JoinCond == JoinCondStar { profile := cacheMgr.GetPlayerProfile(applicantAccountId) if profile == nil { - cb(ERR_CODE_GUILD_MEMBER_NO_EXISTS, "applicantAccountId no exists") + cb(ERR_CODE_GUILD_MEMBER_NO_EXISTS, "applicantAccountId no exists", nil) return } if profile.Star < guild.JoinCondValue { - cb(ERR_CODE_APPLY_GUILD_FAIL, "ApplyToGuild Fail, user star error") + cb(ERR_CODE_APPLY_GUILD_FAIL, "ApplyToGuild Fail, user star error", nil) return } gm.JoinGuild(guild, applicantAccountId, cb) @@ -193,7 +193,7 @@ func (gm *GuildMgr) ApplyToGuild(guildId int64, applicantAccountId string, cb fu insertKv, func(err error, lastInsertId int64, rowsAffected int64) { if err != nil || rowsAffected <= 0 { - cb(ERR_CODE_UPDATE_GUILD_PENDING_REQUEST_DB_FAIL, "ApplyToGuild guild pending request db error") + cb(ERR_CODE_UPDATE_GUILD_PENDING_REQUEST_DB_FAIL, "ApplyToGuild guild pending request db error", nil) return } @@ -214,7 +214,7 @@ func (gm *GuildMgr) ApplyToGuild(guildId int64, applicantAccountId string, cb fu EVENT_APPLY, prop, ) - cb(ERR_CODE_OK, "ApplyToGuild ok") + cb(ERR_CODE_OK, "ApplyToGuild ok", guild) }) } @@ -350,19 +350,19 @@ func (gm *GuildMgr) Reject(operatorAccountId, accountId string, cb func(errCode } // JoinGuild 直接加入公会 -func (gm *GuildMgr) JoinGuild(guild *Guild, accountId string, cb func(errCode int32, errMsg string)) { +func (gm *GuildMgr) JoinGuild(guild *Guild, accountId string, cb func(errCode int32, errMsg string, guild *Guild)) { newMember := GuildMember{AccountId: accountId, Level: GuildMemberLevelDefault} guildId := guild.GuildId gm.upsertGuildMember(guildId, &newMember, func(err error) { if err != nil { - cb(ERR_CODE_UPDATE_GUILD_MEMBER_DB_FAIL, "JoinGuild Fail, upsertGuildMember") + cb(ERR_CODE_UPDATE_GUILD_MEMBER_DB_FAIL, "JoinGuild Fail, upsertGuildMember", nil) return } guild.AddMember(&newMember) gm.AddUserGuild(accountId, guildId) - cb(ERR_CODE_OK, "ApplyToGuild OK") + cb(ERR_CODE_OK, "ApplyToGuild OK", guild) user := friendMgr.GetUser(accountId) cacheMgr.LoadPlayerProfile(user, func(playerProfile *PlayerProfile) {}) @@ -382,15 +382,15 @@ func (gm *GuildMgr) JoinGuild(guild *Guild, accountId string, cb func(errCode in } // LeaveGuild 离开公会 -func (gm *GuildMgr) LeaveGuild(accountId string, cb func(errCode int32, errMsg string)) { +func (gm *GuildMgr) LeaveGuild(accountId string, cb func(errCode int32, errMsg string, guild *Guild)) { guild := gm.GetGuildByAccountId(accountId) if guild == nil { - cb(ERR_CODE_GUILD_NO_EXISTS, "no join guild]") + cb(ERR_CODE_GUILD_NO_EXISTS, "no join guild]", nil) return } member := guild.GetMember(accountId) if member == nil { - cb(ERR_CODE_GUILD_MEMBER_NO_EXISTS, "LeaveGuild member no exists") + cb(ERR_CODE_GUILD_MEMBER_NO_EXISTS, "LeaveGuild member no exists", nil) return } membersCount := guild.GetMembersCount() @@ -404,7 +404,7 @@ func (gm *GuildMgr) LeaveGuild(accountId string, cb func(errCode int32, errMsg s if accountId == guild.LeaderId { newLeader := guild.NewLeader(accountId) if newLeader == nil { - cb(ERR_CODE_UPDATE_GUILD_DB_FAIL, "error") + cb(ERR_CODE_UPDATE_GUILD_DB_FAIL, "error", nil) return } f5.GetSysLog().Info("LeaveGuild guildId:%d, newLeader:%s", guild.GuildId, newLeader.AccountId) @@ -414,7 +414,7 @@ func (gm *GuildMgr) LeaveGuild(accountId string, cb func(errCode int32, errMsg s } gm.updateGuild(guild, updateFields, func(err error) { if err != nil { - cb(ERR_CODE_UPDATE_GUILD_DB_FAIL, err.Error()) + cb(ERR_CODE_UPDATE_GUILD_DB_FAIL, err.Error(), nil) return } guild.LeaderId = newLeader.AccountId @@ -424,7 +424,7 @@ func (gm *GuildMgr) LeaveGuild(accountId string, cb func(errCode int32, errMsg s gm.updateGuildMember(guild, newLeader.AccountId, newMemberFields, func(err error) { if err != nil { - cb(ERR_CODE_UPDATE_GUILD_MEMBER_DB_FAIL, err.Error()) + cb(ERR_CODE_UPDATE_GUILD_MEMBER_DB_FAIL, err.Error(), nil) return } }) @@ -435,7 +435,7 @@ func (gm *GuildMgr) LeaveGuild(accountId string, cb func(errCode int32, errMsg s gm.updateGuildMember(guild, member.AccountId, fields, func(err error) { if err != nil { - cb(ERR_CODE_UPDATE_GUILD_MEMBER_DB_FAIL, err.Error()) + cb(ERR_CODE_UPDATE_GUILD_MEMBER_DB_FAIL, err.Error(), nil) return } @@ -457,7 +457,7 @@ func (gm *GuildMgr) LeaveGuild(accountId string, cb func(errCode int32, errMsg s EVENT_LEAVE, prop, ) - cb(ERR_CODE_OK, "LeaveGuild OK") + cb(ERR_CODE_OK, "LeaveGuild OK", guild) }) } @@ -671,16 +671,16 @@ func (gm *GuildMgr) SetMemberLevel(operatorAccountId, accountId string, newLevel } // Disband 解散公会 -func (gm *GuildMgr) Disband(operatorAccountId string, cb func(errCode int32, errMsg string)) { +func (gm *GuildMgr) Disband(operatorAccountId string, cb func(errCode int32, errMsg string, guild *Guild)) { guild := gm.GetGuildByAccountId(operatorAccountId) if guild == nil { - cb(ERR_CODE_GUILD_NO_EXISTS, "Disband guild no exists") + cb(ERR_CODE_GUILD_NO_EXISTS, "Disband guild no exists", nil) return } // 仅会长可操作 if operatorAccountId != guild.LeaderId { - cb(ERR_CODE_GUILD_NO_LEADER_PERM, "Disband only leader perm") + cb(ERR_CODE_GUILD_NO_LEADER_PERM, "Disband only leader perm", nil) return } guildId := guild.GuildId @@ -692,18 +692,18 @@ func (gm *GuildMgr) Disband(operatorAccountId string, cb func(errCode int32, err } gm.updateGuild(guild, updateFields, func(err error) { if err != nil { - cb(ERR_CODE_UPDATE_GUILD_DB_FAIL, err.Error()) + cb(ERR_CODE_UPDATE_GUILD_DB_FAIL, err.Error(), nil) return } fields := [][]string{{"is_leave_guild", q5.ToString(1)}} gm.updateGuildMembers(guildId, fields, func(err error) { if err != nil { - cb(ERR_CODE_UPDATE_GUILD_MEMBER_DB_FAIL, err.Error()) + cb(ERR_CODE_UPDATE_GUILD_MEMBER_DB_FAIL, err.Error(), nil) return } gm.updateAllPendingReqs(guildId, PendingReqIsJoinGuildStatusDisband, func(err error) { if err != nil { - cb(ERR_CODE_UPDATE_GUILD_PENDING_REQUEST_DB_FAIL, err.Error()) + cb(ERR_CODE_UPDATE_GUILD_PENDING_REQUEST_DB_FAIL, err.Error(), nil) return } logContent := fmt.Sprintf("GuildDisbanded[%d-%s]", guildId, guildName) @@ -729,7 +729,7 @@ func (gm *GuildMgr) Disband(operatorAccountId string, cb func(errCode int32, err prop, ) - cb(ERR_CODE_OK, "Disband ok") + cb(ERR_CODE_OK, "Disband ok", guild) }) }) }) diff --git a/server/imserver/player.go b/server/imserver/player.go index 05c936be..a94d6fa8 100644 --- a/server/imserver/player.go +++ b/server/imserver/player.go @@ -320,13 +320,33 @@ func (p *Player) CMCreateGuild(hdr *f5.MsgHdr, msg *cs.CMCreateGuild) { func (p *Player) CMApplyToGuild(hdr *f5.MsgHdr, msg *cs.CMApplyToGuild) { guildMgr.ApplyToGuild( msg.GetGuildId(), p.accountId, - func(errCode int32, errMsg string) { + func(errCode int32, errMsg string, guild *Guild) { rspMsg := new(cs.SMApplyToGuild) if errCode != 0 { rspMsg.Errcode = &errCode rspMsg.Errmsg = &errMsg } p.SendMsg(rspMsg) + if guild != nil { + // 成员通知消息 + rspNotify := new(cs.SMApplyToGuildNotify) + rspNotify.GuildId = &guild.GuildId + rspNotify.Name = &guild.Name + + rspNotify.AccountId = &p.accountId + playerProfile := cacheMgr.GetPlayerProfile(p.accountId) + if playerProfile != nil { + rspNotify.Username = &playerProfile.Username + } + + for targetAccountId := range guild.Members { + target := playerMgr.GetPlayerByAccountId(targetAccountId) + if target == nil { + continue + } + target.SendMsg(rspNotify) + } + } }, ) } @@ -366,11 +386,22 @@ func (p *Player) CMApprove(hdr *f5.MsgHdr, msg *cs.CMApprove) { } p.SendMsg(rspMsg) if guild != nil { - target := playerMgr.GetPlayerByAccountId(msg.GetApplicantAccountId()) - if target != nil { - rspNotify := new(cs.SMApproveJoinGuildNotify) - rspNotify.GuildId = &guild.GuildId - rspNotify.Name = &guild.Name + // 成员通知消息 + rspNotify := new(cs.SMApproveJoinGuildNotify) + rspNotify.GuildId = &guild.GuildId + rspNotify.Name = &guild.Name + + rspNotify.AccountId = msg.ApplicantAccountId + playerProfile := cacheMgr.GetPlayerProfile(msg.GetApplicantAccountId()) + if playerProfile != nil { + rspNotify.Username = &playerProfile.Username + } + + for targetAccountId := range guild.Members { + target := playerMgr.GetPlayerByAccountId(targetAccountId) + if target == nil { + continue + } target.SendMsg(rspNotify) } } @@ -397,13 +428,33 @@ func (p *Player) CMReject(hdr *f5.MsgHdr, msg *cs.CMReject) { func (p *Player) CMLeaveGuild(hdr *f5.MsgHdr, msg *cs.CMLeaveGuild) { guildMgr.LeaveGuild( p.accountId, - func(errCode int32, errMsg string) { + func(errCode int32, errMsg string, guild *Guild) { rspMsg := new(cs.SMLeaveGuild) if errCode != 0 { rspMsg.Errcode = &errCode rspMsg.Errmsg = &errMsg } p.SendMsg(rspMsg) + if guild != nil { + // 成员通知消息 + rspNotify := new(cs.SMLeaveGuildNotify) + rspNotify.GuildId = &guild.GuildId + rspNotify.Name = &guild.Name + + rspNotify.AccountId = &p.accountId + playerProfile := cacheMgr.GetPlayerProfile(p.accountId) + if playerProfile != nil { + rspNotify.Username = &playerProfile.Username + } + + for targetAccountId := range guild.Members { + target := playerMgr.GetPlayerByAccountId(targetAccountId) + if target == nil { + continue + } + target.SendMsg(rspNotify) + } + } }, ) } @@ -421,13 +472,28 @@ func (p *Player) CMDismissMember(hdr *f5.MsgHdr, msg *cs.CMDismissMember) { } p.SendMsg(rspMsg) if guild != nil { - target := playerMgr.GetPlayerByAccountId(msg.GetDismissAccountId()) - if target != nil { - rspNotify := new(cs.SMDismissMemberNotify) - rspNotify.GuildId = &guild.GuildId - rspNotify.Name = &guild.Name + // 成员通知消息 + rspNotify := new(cs.SMDismissMemberNotify) + rspNotify.GuildId = &guild.GuildId + rspNotify.Name = &guild.Name + rspNotify.AccountId = msg.DismissAccountId + playerProfile := cacheMgr.GetPlayerProfile(msg.GetDismissAccountId()) + if playerProfile != nil { + rspNotify.Username = &playerProfile.Username + } + + for targetAccountId := range guild.Members { + target := playerMgr.GetPlayerByAccountId(targetAccountId) + if target == nil { + continue + } target.SendMsg(rspNotify) } + + dismissAccount := playerMgr.GetPlayerByAccountId(msg.GetDismissAccountId()) + if dismissAccount != nil { + dismissAccount.SendMsg(rspNotify) + } } }, ) @@ -447,12 +513,22 @@ func (p *Player) CMSetMemberLevel(hdr *f5.MsgHdr, msg *cs.CMSetMemberLevel) { } p.SendMsg(rspMsg) if guild != nil { - target := playerMgr.GetPlayerByAccountId(msg.GetMemberAccountId()) - if target != nil { + for range guild.Members { + target := playerMgr.GetPlayerByAccountId(msg.GetMemberAccountId()) + if target == nil { + continue + } + // 通知消息 rspNotify := new(cs.SMSetMemberLevelNotify) rspNotify.GuildId = &guild.GuildId rspNotify.Name = &guild.Name rspNotify.MemberLevel = msg.MemberLevel + rspNotify.AccountId = msg.MemberAccountId + + playerProfile := cacheMgr.GetPlayerProfile(msg.GetMemberAccountId()) + if playerProfile != nil { + rspNotify.Username = &playerProfile.Username + } target.SendMsg(rspNotify) } } @@ -463,7 +539,7 @@ func (p *Player) CMSetMemberLevel(hdr *f5.MsgHdr, msg *cs.CMSetMemberLevel) { func (p *Player) CMDisband(hdr *f5.MsgHdr, msg *cs.CMDisband) { guildMgr.Disband( p.accountId, - func(errCode int32, errMsg string) { + func(errCode int32, errMsg string, guild *Guild) { rspMsg := new(cs.SMDisband) if errCode != 0 { rspMsg.Errcode = &errCode diff --git a/server/imserver/proto/cs_msgid.proto b/server/imserver/proto/cs_msgid.proto index 9b0e0856..d573159d 100644 --- a/server/imserver/proto/cs_msgid.proto +++ b/server/imserver/proto/cs_msgid.proto @@ -100,4 +100,6 @@ enum SMMessageId_e _SMApproveJoinGuildNotify = 1010; _SMDismissMemberNotify = 1011; _SMSetMemberLevelNotify = 1012; + _SMApplyToGuildNotify = 1013; + _SMLeaveGuildNotify = 1014; } diff --git a/server/imserver/proto/cs_proto.proto b/server/imserver/proto/cs_proto.proto index c0708ab6..ccbfda01 100644 --- a/server/imserver/proto/cs_proto.proto +++ b/server/imserver/proto/cs_proto.proto @@ -414,6 +414,15 @@ message SMApplyToGuild optional string errmsg = 2; } +// 收到申请加入公会 +message SMApplyToGuildNotify +{ + optional int64 guild_id = 1; + optional string name = 2; + optional string accountId = 3; + optional string username = 4; +} + // 请求申请者列表 message CMApplyList{} @@ -443,6 +452,8 @@ message SMApproveJoinGuildNotify { optional int64 guild_id = 1; optional string name = 2; + optional string accountId = 3; + optional string username = 4; } // 请求拒绝加入公会 @@ -468,6 +479,15 @@ message SMLeaveGuild optional string errmsg = 2; } +// 收到离开公会 +message SMLeaveGuildNotify +{ + optional int64 guild_id = 1; + optional string name = 2; + optional string accountId = 3; + optional string username = 4; +} + // 请求开除成员 message CMDismissMember { @@ -486,6 +506,8 @@ message SMDismissMemberNotify { optional int64 guild_id = 1; optional string name = 2; + optional string accountId = 3; + optional string username = 4; } // 请求设置公会成员等级 @@ -508,6 +530,8 @@ message SMSetMemberLevelNotify optional int64 guild_id = 1; optional string name = 2; optional int32 memberLevel = 3; + optional string accountId = 4; + optional string username = 5; } // 请求公会成员列表