From f6730e9cde8338ae4b625458f2180fc73b933a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B7=E5=8B=87?= Date: Tue, 19 Sep 2023 19:03:54 +0800 Subject: [PATCH] save --- server/imserver/cachedbmgr.go | 14 +- server/imserver/constant.go | 6 +- server/imserver/cs/cs.auto_gen.go | 48 -- server/imserver/cs/cs_msgid.pb.go | 158 +++--- server/imserver/cs/cs_proto.pb.go | 716 ++++++++------------------- server/imserver/friendsdbmgr.go | 8 +- server/imserver/guild.go | 97 ++-- server/imserver/guilddbmgr.go | 12 +- server/imserver/guildmgr.go | 233 +++------ server/imserver/handlermgr.go | 3 +- server/imserver/player.go | 36 +- server/imserver/playermgr.go | 8 + server/imserver/proto/cs_msgid.proto | 4 - server/imserver/proto/cs_proto.proto | 28 +- 14 files changed, 429 insertions(+), 942 deletions(-) diff --git a/server/imserver/cachedbmgr.go b/server/imserver/cachedbmgr.go index 121eed2d..bc158f24 100644 --- a/server/imserver/cachedbmgr.go +++ b/server/imserver/cachedbmgr.go @@ -40,11 +40,7 @@ func (cm *CacheMgr) GetProfileByAccountId(accountId string, cb func(err error, p } if rows.Next() { aId := q5.ToString(*rows.GetByIndex(0)) - player := playerMgr.GetPlayerByAccountId(aId) - var onlineStatue int32 = 0 - if player != nil { - onlineStatue = 1 - } + onlineStatue := playerMgr.GetOnlineStatus(aId) profile := &PlayerProfile{ AccountId: q5.ToString(*rows.GetByIndex(0)), Username: q5.ToString(*rows.GetByIndex(1)), @@ -73,11 +69,7 @@ func (cm *CacheMgr) loadUsersProfile(sql string) { } for rows.Next() { accountId := q5.ToString(*rows.GetByIndex(0)) - player := playerMgr.GetPlayerByAccountId(accountId) - var onlineStatue int32 = 0 - if player != nil { - onlineStatue = 1 - } + onlineStatus := playerMgr.GetOnlineStatus(accountId) profile := &PlayerProfile{ AccountId: accountId, Username: q5.ToString(*rows.GetByIndex(1)), @@ -86,7 +78,7 @@ func (cm *CacheMgr) loadUsersProfile(sql string) { Star: q5.ToInt32(*rows.GetByIndex(4)), Rank: q5.ToInt32(*rows.GetByIndex(5)), LastLoginTime: q5.ToInt32(*rows.GetByIndex(6)), - OnlineStatus: onlineStatue, + OnlineStatus: onlineStatus, } cm.AddCacheProfile(1, profile) } diff --git a/server/imserver/constant.go b/server/imserver/constant.go index 39abd745..069711da 100644 --- a/server/imserver/constant.go +++ b/server/imserver/constant.go @@ -56,8 +56,7 @@ const ( LogTypeApprove = 1 // 公会日志类型， 批准加入 LogTypeLeave = 2 LogTypeDismiss = 3 - LogTypePromote = 4 - LogTypeDemote = 5 + LogTypeChangeLevel = 4 LogTypeDisband = 6 GuildMemberLevelLeader = 1 // 成员等级, 会长 GuildMemberLevelViceLeader = 20 // 成员等级, 副会长 @@ -80,8 +79,6 @@ const ( EVENT_JOIN = "event_join" EVENT_LEAVE = "event_leave" EVENT_DISMISS_MEMBER = "event_dismiss_member" - EVENT_PROMOTE_MEMBER = "event_promote_member" - EVENT_DEMOTE_MEMBER = "event_demote_member" EVENT_SET_MEMBER_LEVEL = "event_set_member_level" EVENT_DISBAND = "event_disband" EVENT_SET_NOTICE = "event_set_notice" @@ -119,7 +116,6 @@ const ( ERR_CODE_GUILD_BLOCKED_LEADER = 12009 ERR_CODE_GUILD_OPERATOR_MEMBER_NO_PERM = 12010 ERR_CODE_GUILD_DISMISS_MEMBER_NO_PERM = 12011 - ERR_CODE_GUILD_DEMOTE_MEMBER_OK = 12012 ERR_CODE_CREATE_GUILD_DB_FAIL = 12013 ERR_CODE_CREATE_GUILD_MEMBER_DB_FAIL = 12014 ERR_CODE_UPDATE_GUILD_DB_FAIL = 12015 diff --git a/server/imserver/cs/cs.auto_gen.go b/server/imserver/cs/cs.auto_gen.go index 0fc8649b..14c6c78b 100644 --- a/server/imserver/cs/cs.auto_gen.go +++ b/server/imserver/cs/cs.auto_gen.go @@ -63,8 +63,6 @@ type MsgHandler interface { CMLeaveGuild(*f5.MsgHdr, *CMLeaveGuild) CMDismissMember(*f5.MsgHdr, *CMDismissMember) CMSetMemberLevel(*f5.MsgHdr, *CMSetMemberLevel) - CMPromoteMember(*f5.MsgHdr, *CMPromoteMember) - CMDemoteMember(*f5.MsgHdr, *CMDemoteMember) CMGuildMembersList(*f5.MsgHdr, *CMGuildMembersList) CMDisband(*f5.MsgHdr, *CMDisband) CMSearchGuilds(*f5.MsgHdr, *CMSearchGuilds) @@ -159,12 +157,6 @@ func (this *MsgHandlerImpl) CMDismissMember(hdr *f5.MsgHdr, msg *CMDismissMember func (this *MsgHandlerImpl) CMSetMemberLevel(hdr *f5.MsgHdr, msg *CMSetMemberLevel) { } -func (this *MsgHandlerImpl) CMPromoteMember(hdr *f5.MsgHdr, msg *CMPromoteMember) { -} - -func (this *MsgHandlerImpl) CMDemoteMember(hdr *f5.MsgHdr, msg *CMDemoteMember) { -} - func (this *MsgHandlerImpl) CMGuildMembersList(hdr *f5.MsgHdr, msg *CMGuildMembersList) { } @@ -425,22 +417,6 @@ func (this *SMSetMemberLevel) GetNetMsgId() uint16 { return uint16(SMMessageIdE__SMSetMemberLevel) } -func (this *CMPromoteMember) GetNetMsgId() uint16 { - return uint16(CMMessageIdE__CMPromoteMember) -} - -func (this *SMPromoteMember) GetNetMsgId() uint16 { - return uint16(SMMessageIdE__SMPromoteMember) -} - -func (this *CMDemoteMember) GetNetMsgId() uint16 { - return uint16(CMMessageIdE__CMDemoteMember) -} - -func (this *SMDemoteMember) GetNetMsgId() uint16 { - return uint16(SMMessageIdE__SMDemoteMember) -} - func (this *CMGuildMembersList) GetNetMsgId() uint16 { return uint16(CMMessageIdE__CMGuildMembersList) } @@ -843,30 +819,6 @@ func init() { }, } - handlers[int(CMMessageIdE__CMPromoteMember)] = &CsNetMsgHandler{ - MsgId: int(CMMessageIdE__CMPromoteMember), - ParseCb: func (data []byte) interface{} { - msg := &CMPromoteMember{} - proto.Unmarshal(data, msg) - return msg - }, - Cb: func (hdr *f5.MsgHdr, handler MsgHandler) { - handler.CMPromoteMember(hdr, hdr.Msg.(*CMPromoteMember)) - }, - } - - handlers[int(CMMessageIdE__CMDemoteMember)] = &CsNetMsgHandler{ - MsgId: int(CMMessageIdE__CMDemoteMember), - ParseCb: func (data []byte) interface{} { - msg := &CMDemoteMember{} - proto.Unmarshal(data, msg) - return msg - }, - Cb: func (hdr *f5.MsgHdr, handler MsgHandler) { - handler.CMDemoteMember(hdr, hdr.Msg.(*CMDemoteMember)) - }, - } - handlers[int(CMMessageIdE__CMGuildMembersList)] = &CsNetMsgHandler{ MsgId: int(CMMessageIdE__CMGuildMembersList), ParseCb: func (data []byte) interface{} { diff --git a/server/imserver/cs/cs_msgid.pb.go b/server/imserver/cs/cs_msgid.pb.go index fcf3b0ae..1b5192f2 100644 --- a/server/imserver/cs/cs_msgid.pb.go +++ b/server/imserver/cs/cs_msgid.pb.go @@ -52,8 +52,6 @@ const ( CMMessageIdE__CMReject CMMessageIdE = 124 CMMessageIdE__CMLeaveGuild CMMessageIdE = 125 CMMessageIdE__CMDismissMember CMMessageIdE = 126 - CMMessageIdE__CMPromoteMember CMMessageIdE = 127 - CMMessageIdE__CMDemoteMember CMMessageIdE = 128 CMMessageIdE__CMDisband CMMessageIdE = 129 CMMessageIdE__CMSearchGuilds CMMessageIdE = 130 CMMessageIdE__CMApplyList CMMessageIdE = 131 @@ -95,8 +93,6 @@ var ( 124: "_CMReject", 125: "_CMLeaveGuild", 126: "_CMDismissMember", - 127: "_CMPromoteMember", - 128: "_CMDemoteMember", 129: "_CMDisband", 130: "_CMSearchGuilds", 131: "_CMApplyList", @@ -135,8 +131,6 @@ var ( "_CMReject": 124, "_CMLeaveGuild": 125, "_CMDismissMember": 126, - "_CMPromoteMember": 127, - "_CMDemoteMember": 128, "_CMDisband": 129, "_CMSearchGuilds": 130, "_CMApplyList": 131, @@ -214,8 +208,6 @@ const ( SMMessageIdE__SMReject SMMessageIdE = 124 SMMessageIdE__SMLeaveGuild SMMessageIdE = 125 SMMessageIdE__SMDismissMember SMMessageIdE = 126 - SMMessageIdE__SMPromoteMember SMMessageIdE = 127 - SMMessageIdE__SMDemoteMember SMMessageIdE = 128 SMMessageIdE__SMDisband SMMessageIdE = 129 SMMessageIdE__SMSearchGuilds SMMessageIdE = 130 SMMessageIdE__SMApplyList SMMessageIdE = 131 @@ -262,8 +254,6 @@ var ( 124: "_SMReject", 125: "_SMLeaveGuild", 126: "_SMDismissMember", - 127: "_SMPromoteMember", - 128: "_SMDemoteMember", 129: "_SMDisband", 130: "_SMSearchGuilds", 131: "_SMApplyList", @@ -305,8 +295,6 @@ var ( "_SMReject": 124, "_SMLeaveGuild": 125, "_SMDismissMember": 126, - "_SMPromoteMember": 127, - "_SMDemoteMember": 128, "_SMDisband": 129, "_SMSearchGuilds": 130, "_SMApplyList": 131, @@ -368,7 +356,7 @@ var File_cs_msgid_proto protoreflect.FileDescriptor var file_cs_msgid_proto_rawDesc = []byte{ 0x0a, 0x0e, 0x63, 0x73, 0x5f, 0x6d, 0x73, 0x67, 0x69, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x12, 0x02, 0x63, 0x73, 0x2a, 0xd2, 0x06, 0x0a, 0x0d, 0x43, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, + 0x12, 0x02, 0x63, 0x73, 0x2a, 0xa6, 0x06, 0x0a, 0x0d, 0x43, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x64, 0x5f, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x5f, 0x43, 0x4d, 0x50, 0x69, 0x6e, 0x67, 0x10, 0x65, 0x12, 0x0c, 0x0a, 0x08, 0x5f, 0x43, 0x4d, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x10, 0x67, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x43, 0x4d, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, @@ -404,84 +392,78 @@ var file_cs_msgid_proto_rawDesc = []byte{ 0x0a, 0x09, 0x5f, 0x43, 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x10, 0x7c, 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x43, 0x4d, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, 0x7d, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x43, 0x4d, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x4d, 0x65, - 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7e, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x43, 0x4d, 0x50, 0x72, 0x6f, - 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7f, 0x12, 0x14, 0x0a, 0x0f, - 0x5f, 0x43, 0x4d, 0x44, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, - 0x80, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x43, 0x4d, 0x44, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x64, - 0x10, 0x81, 0x01, 0x12, 0x14, 0x0a, 0x0f, 0x5f, 0x43, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, - 0x47, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x10, 0x82, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x43, 0x4d, - 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x83, 0x01, 0x12, 0x11, 0x0a, 0x0c, - 0x5f, 0x43, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x73, 0x10, 0x84, 0x01, 0x12, - 0x11, 0x0a, 0x0c, 0x5f, 0x43, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x10, - 0x85, 0x01, 0x12, 0x16, 0x0a, 0x11, 0x5f, 0x43, 0x4d, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x62, - 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x10, 0x86, 0x01, 0x12, 0x18, 0x0a, 0x13, 0x5f, 0x43, - 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x4c, 0x69, 0x73, - 0x74, 0x10, 0x87, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x43, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x61, - 0x6d, 0x65, 0x10, 0x88, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x43, 0x4d, 0x53, 0x65, 0x74, 0x41, - 0x76, 0x61, 0x74, 0x61, 0x72, 0x10, 0x89, 0x01, 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, 0xb2, 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, 0x08, 0x5f, 0x53, 0x4d, - 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x10, 0x67, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x52, 0x65, - 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x10, 0x68, 0x12, 0x1c, 0x0a, 0x18, 0x5f, 0x53, 0x4d, - 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, 0x42, 0x79, 0x41, 0x63, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x49, 0x64, 0x10, 0x69, 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x53, 0x65, - 0x61, 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, 0x10, 0x6a, 0x12, 0x17, 0x0a, 0x13, 0x5f, 0x53, - 0x4d, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x10, 0x6b, 0x12, 0x1a, 0x0a, 0x16, 0x5f, 0x53, 0x4d, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, - 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6c, 0x12, - 0x1a, 0x0a, 0x16, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x46, 0x72, 0x69, 0x65, - 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6d, 0x12, 0x1f, 0x0a, 0x1b, 0x5f, - 0x53, 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x46, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6e, 0x12, 0x11, 0x0a, 0x0d, - 0x5f, 0x53, 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x10, 0x6f, 0x12, - 0x17, 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, - 0x6e, 0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x70, 0x12, 0x13, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x41, - 0x64, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, 0x71, 0x12, 0x16, 0x0a, - 0x12, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, - 0x69, 0x73, 0x74, 0x10, 0x72, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x42, 0x6c, 0x61, 0x63, - 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, 0x74, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x47, 0x75, - 0x69, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0x78, 0x12, 0x12, 0x0a, 0x0e, 0x5f, 0x53, 0x4d, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, 0x79, 0x12, 0x13, 0x0a, - 0x0f, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x54, 0x6f, 0x47, 0x75, 0x69, 0x6c, 0x64, - 0x10, 0x7a, 0x12, 0x0e, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, - 0x10, 0x7b, 0x12, 0x0d, 0x0a, 0x09, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x10, - 0x7c, 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x47, 0x75, 0x69, - 0x6c, 0x64, 0x10, 0x7d, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x44, 0x69, 0x73, 0x6d, 0x69, - 0x73, 0x73, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7e, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x53, - 0x4d, 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7f, - 0x12, 0x14, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x44, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, - 0x62, 0x65, 0x72, 0x10, 0x80, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x44, 0x69, 0x73, - 0x62, 0x61, 0x6e, 0x64, 0x10, 0x81, 0x01, 0x12, 0x14, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x53, 0x65, + 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7e, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x43, 0x4d, 0x44, 0x69, 0x73, + 0x62, 0x61, 0x6e, 0x64, 0x10, 0x81, 0x01, 0x12, 0x14, 0x0a, 0x0f, 0x5f, 0x43, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x10, 0x82, 0x01, 0x12, 0x11, 0x0a, - 0x0c, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x83, 0x01, - 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x73, - 0x10, 0x84, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x74, - 0x69, 0x63, 0x65, 0x10, 0x85, 0x01, 0x12, 0x16, 0x0a, 0x11, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, + 0x0c, 0x5f, 0x43, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x83, 0x01, + 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x43, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x73, + 0x10, 0x84, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x43, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x74, + 0x69, 0x63, 0x65, 0x10, 0x85, 0x01, 0x12, 0x16, 0x0a, 0x11, 0x5f, 0x43, 0x4d, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x10, 0x86, 0x01, 0x12, 0x18, - 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, - 0x73, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x87, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x53, - 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x10, 0x88, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, + 0x0a, 0x13, 0x5f, 0x43, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, + 0x73, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x87, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x43, 0x4d, 0x53, + 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x10, 0x88, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x43, 0x4d, 0x53, 0x65, 0x74, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x10, 0x89, 0x01, 0x12, 0x13, 0x0a, 0x0e, - 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x10, 0x8a, - 0x01, 0x12, 0x1a, 0x0a, 0x15, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, - 0x64, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x8b, 0x01, 0x12, 0x20, 0x0a, - 0x1b, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, - 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xe8, 0x07, 0x12, - 0x15, 0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x43, 0x68, 0x61, 0x74, 0x4d, 0x73, 0x67, 0x4e, 0x6f, 0x74, - 0x69, 0x66, 0x79, 0x10, 0xe9, 0x07, 0x12, 0x1c, 0x0a, 0x17, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x52, 0x65, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, - 0x79, 0x10, 0xea, 0x07, 0x12, 0x27, 0x0a, 0x22, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x64, 0x50, - 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xeb, 0x07, 0x12, 0x1f, 0x0a, - 0x1a, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68, - 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4c, 0x61, 0x73, 0x74, 0x49, 0x64, 0x10, 0xec, 0x07, 0x12, 0x1e, - 0x0a, 0x19, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x4a, 0x6f, 0x69, 0x6e, - 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xf2, 0x07, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x63, 0x73, + 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, 0x86, 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, + 0x08, 0x5f, 0x53, 0x4d, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x10, 0x67, 0x12, 0x10, 0x0a, 0x0c, 0x5f, + 0x53, 0x4d, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x10, 0x68, 0x12, 0x1c, 0x0a, + 0x18, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, 0x42, 0x79, + 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x10, 0x69, 0x12, 0x11, 0x0a, 0x0d, 0x5f, + 0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, 0x10, 0x6a, 0x12, 0x17, + 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6b, 0x12, 0x1a, 0x0a, 0x16, 0x5f, 0x53, 0x4d, 0x41, 0x63, + 0x63, 0x65, 0x70, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x10, 0x6c, 0x12, 0x1a, 0x0a, 0x16, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6d, 0x12, + 0x1f, 0x0a, 0x1b, 0x5f, 0x53, 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, + 0x67, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6e, + 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x10, 0x6f, 0x12, 0x17, 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x70, 0x12, 0x13, 0x0a, 0x0f, + 0x5f, 0x53, 0x4d, 0x41, 0x64, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, + 0x71, 0x12, 0x16, 0x0a, 0x12, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x42, 0x6c, + 0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, 0x72, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, + 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, 0x74, 0x12, 0x10, 0x0a, 0x0c, 0x5f, + 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0x78, 0x12, 0x12, 0x0a, + 0x0e, 0x5f, 0x53, 0x4d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, + 0x79, 0x12, 0x13, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x54, 0x6f, 0x47, + 0x75, 0x69, 0x6c, 0x64, 0x10, 0x7a, 0x12, 0x0e, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, + 0x72, 0x6f, 0x76, 0x65, 0x10, 0x7b, 0x12, 0x0d, 0x0a, 0x09, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6a, + 0x65, 0x63, 0x74, 0x10, 0x7c, 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x4c, 0x65, 0x61, 0x76, + 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, 0x7d, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x44, + 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7e, 0x12, 0x0f, + 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x44, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x64, 0x10, 0x81, 0x01, 0x12, + 0x14, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, + 0x64, 0x73, 0x10, 0x82, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, + 0x79, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x83, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x47, + 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x73, 0x10, 0x84, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, + 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x10, 0x85, 0x01, 0x12, 0x16, + 0x0a, 0x11, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, + 0x76, 0x65, 0x6c, 0x10, 0x86, 0x01, 0x12, 0x18, 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69, + 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x87, 0x01, + 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x10, 0x88, + 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x41, 0x76, 0x61, 0x74, 0x61, + 0x72, 0x10, 0x89, 0x01, 0x12, 0x13, 0x0a, 0x0e, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4a, 0x6f, + 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x10, 0x8a, 0x01, 0x12, 0x1a, 0x0a, 0x15, 0x5f, 0x53, 0x4d, + 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x69, + 0x73, 0x74, 0x10, 0x8b, 0x01, 0x12, 0x20, 0x0a, 0x1b, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, + 0x74, 0x69, 0x66, 0x79, 0x10, 0xe8, 0x07, 0x12, 0x15, 0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x43, 0x68, + 0x61, 0x74, 0x4d, 0x73, 0x67, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xe9, 0x07, 0x12, 0x1c, + 0x0a, 0x17, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x64, 0x50, 0x6f, + 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xea, 0x07, 0x12, 0x27, 0x0a, 0x22, + 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, + 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, + 0x66, 0x79, 0x10, 0xeb, 0x07, 0x12, 0x1f, 0x0a, 0x1a, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4c, 0x61, 0x73, + 0x74, 0x49, 0x64, 0x10, 0xec, 0x07, 0x12, 0x1e, 0x0a, 0x19, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, + 0x72, 0x6f, 0x76, 0x65, 0x4a, 0x6f, 0x69, 0x6e, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4e, 0x6f, 0x74, + 0x69, 0x66, 0x79, 0x10, 0xf2, 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 d65c258c..425e9982 100644 --- a/server/imserver/cs/cs_proto.pb.go +++ b/server/imserver/cs/cs_proto.pb.go @@ -3126,7 +3126,7 @@ type SMApplyList struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Errcode *string `protobuf:"bytes,1,opt,name=errcode" json:"errcode,omitempty"` + Errcode *int32 `protobuf:"varint,1,opt,name=errcode" json:"errcode,omitempty"` Errmsg *string `protobuf:"bytes,2,opt,name=errmsg" json:"errmsg,omitempty"` Members []*MFGuildMember `protobuf:"bytes,3,rep,name=members" json:"members,omitempty"` } @@ -3163,11 +3163,11 @@ func (*SMApplyList) Descriptor() ([]byte, []int) { return file_cs_proto_proto_rawDescGZIP(), []int{53} } -func (x *SMApplyList) GetErrcode() string { +func (x *SMApplyList) GetErrcode() int32 { if x != nil && x.Errcode != nil { return *x.Errcode } - return "" + return 0 } func (x *SMApplyList) GetErrmsg() string { @@ -3759,214 +3759,6 @@ func (x *SMSetMemberLevel) GetErrmsg() string { return "" } -// 请求提升成员为干部 -type CMPromoteMember struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - PromoteAccountId *string `protobuf:"bytes,1,opt,name=promoteAccountId" json:"promoteAccountId,omitempty"` -} - -func (x *CMPromoteMember) Reset() { - *x = CMPromoteMember{} - if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[65] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CMPromoteMember) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CMPromoteMember) ProtoMessage() {} - -func (x *CMPromoteMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[65] - 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 CMPromoteMember.ProtoReflect.Descriptor instead. -func (*CMPromoteMember) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{65} -} - -func (x *CMPromoteMember) GetPromoteAccountId() string { - if x != nil && x.PromoteAccountId != nil { - return *x.PromoteAccountId - } - return "" -} - -// 回复提升成员为干部 -type SMPromoteMember struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Errcode *int32 `protobuf:"varint,1,opt,name=errcode" json:"errcode,omitempty"` - Errmsg *string `protobuf:"bytes,2,opt,name=errmsg" json:"errmsg,omitempty"` -} - -func (x *SMPromoteMember) Reset() { - *x = SMPromoteMember{} - if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[66] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *SMPromoteMember) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*SMPromoteMember) ProtoMessage() {} - -func (x *SMPromoteMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[66] - 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 SMPromoteMember.ProtoReflect.Descriptor instead. -func (*SMPromoteMember) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{66} -} - -func (x *SMPromoteMember) GetErrcode() int32 { - if x != nil && x.Errcode != nil { - return *x.Errcode - } - return 0 -} - -func (x *SMPromoteMember) GetErrmsg() string { - if x != nil && x.Errmsg != nil { - return *x.Errmsg - } - return "" -} - -// 请求解除成员干部身份 -type CMDemoteMember struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - DemoteAccountId *string `protobuf:"bytes,1,opt,name=demoteAccountId" json:"demoteAccountId,omitempty"` -} - -func (x *CMDemoteMember) Reset() { - *x = CMDemoteMember{} - if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[67] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CMDemoteMember) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CMDemoteMember) ProtoMessage() {} - -func (x *CMDemoteMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[67] - 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 CMDemoteMember.ProtoReflect.Descriptor instead. -func (*CMDemoteMember) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{67} -} - -func (x *CMDemoteMember) GetDemoteAccountId() string { - if x != nil && x.DemoteAccountId != nil { - return *x.DemoteAccountId - } - return "" -} - -// 回复解除成员干部身份 -type SMDemoteMember struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Errcode *int32 `protobuf:"varint,1,opt,name=errcode" json:"errcode,omitempty"` - Errmsg *string `protobuf:"bytes,2,opt,name=errmsg" json:"errmsg,omitempty"` -} - -func (x *SMDemoteMember) Reset() { - *x = SMDemoteMember{} - if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[68] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *SMDemoteMember) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*SMDemoteMember) ProtoMessage() {} - -func (x *SMDemoteMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[68] - 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 SMDemoteMember.ProtoReflect.Descriptor instead. -func (*SMDemoteMember) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{68} -} - -func (x *SMDemoteMember) GetErrcode() int32 { - if x != nil && x.Errcode != nil { - return *x.Errcode - } - return 0 -} - -func (x *SMDemoteMember) GetErrmsg() string { - if x != nil && x.Errmsg != nil { - return *x.Errmsg - } - return "" -} - // 请求公会成员列表 type CMGuildMembersList struct { state protoimpl.MessageState @@ -3977,7 +3769,7 @@ type CMGuildMembersList struct { func (x *CMGuildMembersList) Reset() { *x = CMGuildMembersList{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[69] + mi := &file_cs_proto_proto_msgTypes[65] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3990,7 +3782,7 @@ func (x *CMGuildMembersList) String() string { func (*CMGuildMembersList) ProtoMessage() {} func (x *CMGuildMembersList) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[69] + mi := &file_cs_proto_proto_msgTypes[65] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4003,7 +3795,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{69} + return file_cs_proto_proto_rawDescGZIP(), []int{65} } // 回复公会成员列表 @@ -4020,7 +3812,7 @@ type SMGuildMembersList struct { func (x *SMGuildMembersList) Reset() { *x = SMGuildMembersList{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[70] + mi := &file_cs_proto_proto_msgTypes[66] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4033,7 +3825,7 @@ func (x *SMGuildMembersList) String() string { func (*SMGuildMembersList) ProtoMessage() {} func (x *SMGuildMembersList) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[70] + mi := &file_cs_proto_proto_msgTypes[66] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4046,7 +3838,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{70} + return file_cs_proto_proto_rawDescGZIP(), []int{66} } func (x *SMGuildMembersList) GetErrcode() int32 { @@ -4080,7 +3872,7 @@ type CMDisband struct { func (x *CMDisband) Reset() { *x = CMDisband{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[71] + mi := &file_cs_proto_proto_msgTypes[67] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4093,7 +3885,7 @@ func (x *CMDisband) String() string { func (*CMDisband) ProtoMessage() {} func (x *CMDisband) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[71] + mi := &file_cs_proto_proto_msgTypes[67] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4106,7 +3898,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{71} + return file_cs_proto_proto_rawDescGZIP(), []int{67} } // 回复解散公会 @@ -4122,7 +3914,7 @@ type SMDisband struct { func (x *SMDisband) Reset() { *x = SMDisband{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[72] + mi := &file_cs_proto_proto_msgTypes[68] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4135,7 +3927,7 @@ func (x *SMDisband) String() string { func (*SMDisband) ProtoMessage() {} func (x *SMDisband) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[72] + mi := &file_cs_proto_proto_msgTypes[68] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4148,7 +3940,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{72} + return file_cs_proto_proto_rawDescGZIP(), []int{68} } func (x *SMDisband) GetErrcode() int32 { @@ -4178,7 +3970,7 @@ type CMSearchGuilds struct { func (x *CMSearchGuilds) Reset() { *x = CMSearchGuilds{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[73] + mi := &file_cs_proto_proto_msgTypes[69] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4191,7 +3983,7 @@ func (x *CMSearchGuilds) String() string { func (*CMSearchGuilds) ProtoMessage() {} func (x *CMSearchGuilds) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[73] + mi := &file_cs_proto_proto_msgTypes[69] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4204,7 +3996,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{73} + return file_cs_proto_proto_rawDescGZIP(), []int{69} } func (x *CMSearchGuilds) GetSinceId() int64 { @@ -4236,7 +4028,7 @@ type SMSearchGuilds struct { func (x *SMSearchGuilds) Reset() { *x = SMSearchGuilds{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[74] + mi := &file_cs_proto_proto_msgTypes[70] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4249,7 +4041,7 @@ func (x *SMSearchGuilds) String() string { func (*SMSearchGuilds) ProtoMessage() {} func (x *SMSearchGuilds) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[74] + mi := &file_cs_proto_proto_msgTypes[70] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4262,7 +4054,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{74} + return file_cs_proto_proto_rawDescGZIP(), []int{70} } func (x *SMSearchGuilds) GetErrcode() int32 { @@ -4303,7 +4095,7 @@ type CMGuildLogs struct { func (x *CMGuildLogs) Reset() { *x = CMGuildLogs{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[75] + mi := &file_cs_proto_proto_msgTypes[71] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4316,7 +4108,7 @@ func (x *CMGuildLogs) String() string { func (*CMGuildLogs) ProtoMessage() {} func (x *CMGuildLogs) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[75] + mi := &file_cs_proto_proto_msgTypes[71] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4329,7 +4121,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{75} + return file_cs_proto_proto_rawDescGZIP(), []int{71} } // 回复公会日志 @@ -4346,7 +4138,7 @@ type SMGuildLogs struct { func (x *SMGuildLogs) Reset() { *x = SMGuildLogs{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[76] + mi := &file_cs_proto_proto_msgTypes[72] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4359,7 +4151,7 @@ func (x *SMGuildLogs) String() string { func (*SMGuildLogs) ProtoMessage() {} func (x *SMGuildLogs) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[76] + mi := &file_cs_proto_proto_msgTypes[72] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4372,7 +4164,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{76} + return file_cs_proto_proto_rawDescGZIP(), []int{72} } func (x *SMGuildLogs) GetErrcode() int32 { @@ -4410,7 +4202,7 @@ type MFGuildLog struct { func (x *MFGuildLog) Reset() { *x = MFGuildLog{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[77] + mi := &file_cs_proto_proto_msgTypes[73] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4423,7 +4215,7 @@ func (x *MFGuildLog) String() string { func (*MFGuildLog) ProtoMessage() {} func (x *MFGuildLog) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[77] + mi := &file_cs_proto_proto_msgTypes[73] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4436,7 +4228,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{77} + return file_cs_proto_proto_rawDescGZIP(), []int{73} } func (x *MFGuildLog) GetGuildId() int64 { @@ -4479,7 +4271,7 @@ type CMSetName struct { func (x *CMSetName) Reset() { *x = CMSetName{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[78] + mi := &file_cs_proto_proto_msgTypes[74] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4492,7 +4284,7 @@ func (x *CMSetName) String() string { func (*CMSetName) ProtoMessage() {} func (x *CMSetName) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[78] + mi := &file_cs_proto_proto_msgTypes[74] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4505,7 +4297,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{78} + return file_cs_proto_proto_rawDescGZIP(), []int{74} } func (x *CMSetName) GetName() string { @@ -4528,7 +4320,7 @@ type SMSetName struct { func (x *SMSetName) Reset() { *x = SMSetName{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[79] + mi := &file_cs_proto_proto_msgTypes[75] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4541,7 +4333,7 @@ func (x *SMSetName) String() string { func (*SMSetName) ProtoMessage() {} func (x *SMSetName) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[79] + mi := &file_cs_proto_proto_msgTypes[75] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4554,7 +4346,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{79} + return file_cs_proto_proto_rawDescGZIP(), []int{75} } func (x *SMSetName) GetErrcode() int32 { @@ -4583,7 +4375,7 @@ type CMSetAvatar struct { func (x *CMSetAvatar) Reset() { *x = CMSetAvatar{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[80] + mi := &file_cs_proto_proto_msgTypes[76] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4596,7 +4388,7 @@ func (x *CMSetAvatar) String() string { func (*CMSetAvatar) ProtoMessage() {} func (x *CMSetAvatar) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[80] + mi := &file_cs_proto_proto_msgTypes[76] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4609,7 +4401,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{80} + return file_cs_proto_proto_rawDescGZIP(), []int{76} } func (x *CMSetAvatar) GetAvatar() int32 { @@ -4632,7 +4424,7 @@ type SMSetAvatar struct { func (x *SMSetAvatar) Reset() { *x = SMSetAvatar{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[81] + mi := &file_cs_proto_proto_msgTypes[77] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4645,7 +4437,7 @@ func (x *SMSetAvatar) String() string { func (*SMSetAvatar) ProtoMessage() {} func (x *SMSetAvatar) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[81] + mi := &file_cs_proto_proto_msgTypes[77] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4658,7 +4450,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{81} + return file_cs_proto_proto_rawDescGZIP(), []int{77} } func (x *SMSetAvatar) GetErrcode() int32 { @@ -4687,7 +4479,7 @@ type CMSetNotice struct { func (x *CMSetNotice) Reset() { *x = CMSetNotice{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[82] + mi := &file_cs_proto_proto_msgTypes[78] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4700,7 +4492,7 @@ func (x *CMSetNotice) String() string { func (*CMSetNotice) ProtoMessage() {} func (x *CMSetNotice) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[82] + mi := &file_cs_proto_proto_msgTypes[78] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4713,7 +4505,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{82} + return file_cs_proto_proto_rawDescGZIP(), []int{78} } func (x *CMSetNotice) GetContent() string { @@ -4736,7 +4528,7 @@ type SMSetNotice struct { func (x *SMSetNotice) Reset() { *x = SMSetNotice{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[83] + mi := &file_cs_proto_proto_msgTypes[79] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4749,7 +4541,7 @@ func (x *SMSetNotice) String() string { func (*SMSetNotice) ProtoMessage() {} func (x *SMSetNotice) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[83] + mi := &file_cs_proto_proto_msgTypes[79] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4762,7 +4554,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{83} + return file_cs_proto_proto_rawDescGZIP(), []int{79} } func (x *SMSetNotice) GetErrcode() int32 { @@ -4792,7 +4584,7 @@ type CMSetJoinCond struct { func (x *CMSetJoinCond) Reset() { *x = CMSetJoinCond{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[84] + mi := &file_cs_proto_proto_msgTypes[80] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4805,7 +4597,7 @@ func (x *CMSetJoinCond) String() string { func (*CMSetJoinCond) ProtoMessage() {} func (x *CMSetJoinCond) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[84] + mi := &file_cs_proto_proto_msgTypes[80] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4818,7 +4610,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{84} + return file_cs_proto_proto_rawDescGZIP(), []int{80} } func (x *CMSetJoinCond) GetJoinCond() int32 { @@ -4848,7 +4640,7 @@ type SMSetJoinCond struct { func (x *SMSetJoinCond) Reset() { *x = SMSetJoinCond{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[85] + mi := &file_cs_proto_proto_msgTypes[81] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4861,7 +4653,7 @@ func (x *SMSetJoinCond) String() string { func (*SMSetJoinCond) ProtoMessage() {} func (x *SMSetJoinCond) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[85] + mi := &file_cs_proto_proto_msgTypes[81] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4874,7 +4666,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{85} + return file_cs_proto_proto_rawDescGZIP(), []int{81} } func (x *SMSetJoinCond) GetErrcode() int32 { @@ -4914,7 +4706,7 @@ type MFGuild struct { func (x *MFGuild) Reset() { *x = MFGuild{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[86] + mi := &file_cs_proto_proto_msgTypes[82] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4927,7 +4719,7 @@ func (x *MFGuild) String() string { func (*MFGuild) ProtoMessage() {} func (x *MFGuild) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[86] + mi := &file_cs_proto_proto_msgTypes[82] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4940,7 +4732,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{86} + return file_cs_proto_proto_rawDescGZIP(), []int{82} } func (x *MFGuild) GetAutoId() int64 { @@ -5053,7 +4845,7 @@ type MFGuildMember struct { func (x *MFGuildMember) Reset() { *x = MFGuildMember{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[87] + mi := &file_cs_proto_proto_msgTypes[83] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5066,7 +4858,7 @@ func (x *MFGuildMember) String() string { func (*MFGuildMember) ProtoMessage() {} func (x *MFGuildMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[87] + mi := &file_cs_proto_proto_msgTypes[83] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5079,7 +4871,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{87} + return file_cs_proto_proto_rawDescGZIP(), []int{83} } func (x *MFGuildMember) GetAccountId() string { @@ -5437,7 +5229,7 @@ var file_cs_proto_proto_rawDesc = []byte{ 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, - 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, + 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, @@ -5486,139 +5278,123 @@ var file_cs_proto_proto_rawDesc = []byte{ 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x3d, 0x0a, 0x0f, 0x43, 0x4d, 0x50, 0x72, - 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x2a, 0x0a, 0x10, 0x70, - 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x63, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x0f, 0x53, 0x4d, 0x50, 0x72, 0x6f, - 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, - 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, - 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x3a, 0x0a, 0x0e, - 0x43, 0x4d, 0x44, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x28, - 0x0a, 0x0f, 0x64, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x64, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, - 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x42, 0x0a, 0x0e, 0x53, 0x4d, 0x44, 0x65, - 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, - 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, - 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x14, 0x0a, 0x12, - 0x43, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x4c, 0x69, - 0x73, 0x74, 0x22, 0x73, 0x0a, 0x12, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, - 0x62, 0x65, 0x72, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, - 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, - 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x12, 0x2b, 0x0a, 0x07, 0x6d, 0x65, - 0x6d, 0x62, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x63, 0x73, - 0x2e, 0x4d, 0x46, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x07, - 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x22, 0x0b, 0x0a, 0x09, 0x43, 0x4d, 0x44, 0x69, 0x73, - 0x62, 0x61, 0x6e, 0x64, 0x22, 0x3d, 0x0a, 0x09, 0x53, 0x4d, 0x44, 0x69, 0x73, 0x62, 0x61, 0x6e, - 0x64, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, - 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, - 0x6d, 0x73, 0x67, 0x22, 0x3f, 0x0a, 0x0e, 0x43, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, - 0x75, 0x69, 0x6c, 0x64, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x5f, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x49, 0x64, - 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x82, 0x01, 0x0a, 0x0e, 0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, - 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, - 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, - 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 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, + 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x22, 0x14, 0x0a, 0x12, 0x43, 0x4d, 0x47, 0x75, + 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x73, + 0x0a, 0x12, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, + 0x4c, 0x69, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 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, + 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, - 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, + 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 ( @@ -5634,7 +5410,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, 88) +var file_cs_proto_proto_msgTypes = make([]protoimpl.MessageInfo, 84) var file_cs_proto_proto_goTypes = []interface{}{ (ConstantE)(0), // 0: cs.Constant_e (*CMPing)(nil), // 1: cs.CMPing @@ -5702,29 +5478,25 @@ var file_cs_proto_proto_goTypes = []interface{}{ (*SMDismissMember)(nil), // 63: cs.SMDismissMember (*CMSetMemberLevel)(nil), // 64: cs.CMSetMemberLevel (*SMSetMemberLevel)(nil), // 65: cs.SMSetMemberLevel - (*CMPromoteMember)(nil), // 66: cs.CMPromoteMember - (*SMPromoteMember)(nil), // 67: cs.SMPromoteMember - (*CMDemoteMember)(nil), // 68: cs.CMDemoteMember - (*SMDemoteMember)(nil), // 69: cs.SMDemoteMember - (*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 + (*CMGuildMembersList)(nil), // 66: cs.CMGuildMembersList + (*SMGuildMembersList)(nil), // 67: cs.SMGuildMembersList + (*CMDisband)(nil), // 68: cs.CMDisband + (*SMDisband)(nil), // 69: cs.SMDisband + (*CMSearchGuilds)(nil), // 70: cs.CMSearchGuilds + (*SMSearchGuilds)(nil), // 71: cs.SMSearchGuilds + (*CMGuildLogs)(nil), // 72: cs.CMGuildLogs + (*SMGuildLogs)(nil), // 73: cs.SMGuildLogs + (*MFGuildLog)(nil), // 74: cs.MFGuildLog + (*CMSetName)(nil), // 75: cs.CMSetName + (*SMSetName)(nil), // 76: cs.SMSetName + (*CMSetAvatar)(nil), // 77: cs.CMSetAvatar + (*SMSetAvatar)(nil), // 78: cs.SMSetAvatar + (*CMSetNotice)(nil), // 79: cs.CMSetNotice + (*SMSetNotice)(nil), // 80: cs.SMSetNotice + (*CMSetJoinCond)(nil), // 81: cs.CMSetJoinCond + (*SMSetJoinCond)(nil), // 82: cs.SMSetJoinCond + (*MFGuild)(nil), // 83: cs.MFGuild + (*MFGuildMember)(nil), // 84: cs.MFGuildMember } var file_cs_proto_proto_depIdxs = []int32{ 34, // 0: cs.SMSearchUser.users:type_name -> cs.MFUser @@ -5735,14 +5507,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 - 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 + 83, // 8: cs.SMGuildInfo.guild:type_name -> cs.MFGuild + 83, // 9: cs.SMRecommendGuildList.recommend_guilds:type_name -> cs.MFGuild + 83, // 10: cs.SMCreateGuild.guild:type_name -> cs.MFGuild + 84, // 11: cs.SMApplyList.members:type_name -> cs.MFGuildMember + 84, // 12: cs.SMGuildMembersList.members:type_name -> cs.MFGuildMember + 83, // 13: cs.SMSearchGuilds.guilds:type_name -> cs.MFGuild + 74, // 14: cs.SMGuildLogs.guildLogs:type_name -> cs.MFGuildLog + 84, // 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 @@ -6537,54 +6309,6 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[65].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMPromoteMember); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_cs_proto_proto_msgTypes[66].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMPromoteMember); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_cs_proto_proto_msgTypes[67].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMDemoteMember); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_cs_proto_proto_msgTypes[68].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMDemoteMember); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_cs_proto_proto_msgTypes[69].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMGuildMembersList); i { case 0: return &v.state @@ -6596,7 +6320,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[70].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[66].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMGuildMembersList); i { case 0: return &v.state @@ -6608,7 +6332,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[71].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[67].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMDisband); i { case 0: return &v.state @@ -6620,7 +6344,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[72].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[68].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMDisband); i { case 0: return &v.state @@ -6632,7 +6356,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[73].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[69].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMSearchGuilds); i { case 0: return &v.state @@ -6644,7 +6368,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[74].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[70].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMSearchGuilds); i { case 0: return &v.state @@ -6656,7 +6380,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[75].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[71].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMGuildLogs); i { case 0: return &v.state @@ -6668,7 +6392,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[76].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[72].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMGuildLogs); i { case 0: return &v.state @@ -6680,7 +6404,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[77].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[73].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MFGuildLog); i { case 0: return &v.state @@ -6692,7 +6416,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[78].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[74].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMSetName); i { case 0: return &v.state @@ -6704,7 +6428,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[79].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[75].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMSetName); i { case 0: return &v.state @@ -6716,7 +6440,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[80].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[76].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMSetAvatar); i { case 0: return &v.state @@ -6728,7 +6452,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[81].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[77].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMSetAvatar); i { case 0: return &v.state @@ -6740,7 +6464,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[82].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[78].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMSetNotice); i { case 0: return &v.state @@ -6752,7 +6476,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[83].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[79].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMSetNotice); i { case 0: return &v.state @@ -6764,7 +6488,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[84].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[80].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CMSetJoinCond); i { case 0: return &v.state @@ -6776,7 +6500,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[85].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[81].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SMSetJoinCond); i { case 0: return &v.state @@ -6788,7 +6512,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[86].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[82].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MFGuild); i { case 0: return &v.state @@ -6800,7 +6524,7 @@ func file_cs_proto_proto_init() { return nil } } - file_cs_proto_proto_msgTypes[87].Exporter = func(v interface{}, i int) interface{} { + file_cs_proto_proto_msgTypes[83].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MFGuildMember); i { case 0: return &v.state @@ -6819,7 +6543,7 @@ func file_cs_proto_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_cs_proto_proto_rawDesc, NumEnums: 1, - NumMessages: 88, + NumMessages: 84, NumExtensions: 0, NumServices: 0, }, diff --git a/server/imserver/friendsdbmgr.go b/server/imserver/friendsdbmgr.go index 10cb1587..4a8cbcef 100644 --- a/server/imserver/friendsdbmgr.go +++ b/server/imserver/friendsdbmgr.go @@ -110,11 +110,7 @@ func (fm *FriendsMgr) findUsersByUsername(username string, sinceId int64, cb fun lastId = autoId } accountId := q5.ToString(*rows.GetByIndex(1)) - player := playerMgr.GetPlayerByAccountId(accountId) - var onlineStatue int32 = 0 - if player != nil { - onlineStatue = 1 - } + onlineStatus := playerMgr.GetOnlineStatus(accountId) profile := &PlayerProfile{ AccountId: q5.ToString(*rows.GetByIndex(1)), Username: q5.ToString(*rows.GetByIndex(2)), @@ -123,7 +119,7 @@ func (fm *FriendsMgr) findUsersByUsername(username string, sinceId int64, cb fun Star: q5.ToInt32(*rows.GetByIndex(5)), Rank: q5.ToInt32(*rows.GetByIndex(6)), LastLoginTime: q5.ToInt32(*rows.GetByIndex(7)), - OnlineStatus: onlineStatue, + OnlineStatus: onlineStatus, } profiles = append(profiles, profile) } diff --git a/server/imserver/guild.go b/server/imserver/guild.go index f55177f1..de453473 100644 --- a/server/imserver/guild.go +++ b/server/imserver/guild.go @@ -1,25 +1,27 @@ package main +import "math/rand" + type GuildMember struct { AccountId string Level int32 // 1: 会长, 20: 副会长, 30: 精英, 40 成员 } type Guild struct { - AutoId int64 // 公会自增id - GuildId int64 // 公会id - Name string // 公会名称 - LeaderId string // 公会leader - Avatar int32 // 头像 - Notice string // 公告 - JoinCond int32 // 公会加入条件 - JoinCondValue int32 // 公会加入条件值 - TotalStars int32 // 公会统计信息, 总星星数量 - TotalKills int32 // 公会统计信息, 单局总击杀数 - ChickenDinners int32 // 公会统计信息, 单局第一名数 - MaxMembers int32 // 公会最大成员数 default 30 - Members []*GuildMember - PendingReqs map[string]int32 // pendingAccountId -> status 0,1,2,3 pending, accept, reject, leave + AutoId int64 // 公会自增id + GuildId int64 // 公会id + Name string // 公会名称 + LeaderId string // 公会leader + Avatar int32 // 头像 + Notice string // 公告 + JoinCond int32 // 公会加入条件 + JoinCondValue int32 // 公会加入条件值 + TotalStars int32 // 公会统计信息, 总星星数量 + TotalKills int32 // 公会统计信息, 单局总击杀数 + ChickenDinners int32 // 公会统计信息, 单局第一名数 + MaxMembers int32 // 公会最大成员数 default 30 + Members map[string]*GuildMember // accountId -> GuildMember + PendingReqs map[string]int32 // pendingAccountId -> status 0,1,2,3 pending, accept, reject, leave } // GuildLog 公会日志 @@ -44,32 +46,18 @@ func (g *Guild) GetMembersCount() int { return len(g.Members) } -func (g *Guild) GetMembers() []*GuildMember { - return g.Members -} - -// findMemberIndex 根据 AccountId 查找成员在 Members 切片中的索引 -func (g *Guild) findMemberIndex(accountId string) int { - for i, member := range g.Members { - if member.AccountId == accountId { - return i - } - } - return -1 -} - // GetMember 根据 AccountId 获取成员信息 func (g *Guild) GetMember(accountId string) *GuildMember { - index := g.findMemberIndex(accountId) - if index == -1 { - return nil + if member, exists := g.Members[accountId]; exists { + return member } - return g.Members[index] + return nil } // IsMember 是否是公会成员 func (g *Guild) IsMember(accountId string) bool { - return g.findMemberIndex(accountId) >= 0 + _, exists := g.Members[accountId] + return exists } // IsFull 成员是否已满 @@ -79,21 +67,13 @@ func (g *Guild) IsFull() bool { // AddMember 添加成员 func (g *Guild) AddMember(member *GuildMember) { - g.Members = append(g.Members, member) + accountId := member.AccountId + g.Members[accountId] = member } // RemoveMember 移除成员 func (g *Guild) RemoveMember(accountId string) { - if accountId == g.LeaderId { - return - } - index := g.findMemberIndex(accountId) - if index == -1 { - return - } - copy(g.Members[index:], g.Members[index+1:]) - g.Members[len(g.Members)-1] = nil - g.Members = g.Members[:len(g.Members)-1] + delete(g.Members, accountId) } func (g *Guild) SetNotice(notice *string) { @@ -128,3 +108,32 @@ func (gm *GuildMember) GetAccountId() string { func (g *Guild) IsInReq(accountId string) bool { return g.PendingReqs[accountId] == PendingReqIsJoinGuildStatusJoined } + +func (g *Guild) NewLeaderId() *GuildMember { + if len(g.Members) <= 0 { + return nil + } + + // 找到级别最高的成员 + highestLevel := int32(GuildMemberLevelDefault) + highestLevelMembers := make([]*GuildMember, 0) + for _, member := range g.Members { + if member.Level < highestLevel { + // 发现更高级别的成员，重置列表 + highestLevel = member.Level + highestLevelMembers = []*GuildMember{member} + } else if member.Level == highestLevel { + // 发现与当前最高级别相同的成员，添加到列表中 + highestLevelMembers = append(highestLevelMembers, member) + } + } + + if len(highestLevelMembers) <= 0 { + return nil + } + + newLeaderIndex := rand.Intn(len(highestLevelMembers)) + newLeader := highestLevelMembers[newLeaderIndex] + newLeader.Level = GuildMemberLevelLeader + return newLeader +} diff --git a/server/imserver/guilddbmgr.go b/server/imserver/guilddbmgr.go index 8a78f03a..0adbbd47 100644 --- a/server/imserver/guilddbmgr.go +++ b/server/imserver/guilddbmgr.go @@ -41,10 +41,9 @@ func (gm *GuildMgr) loadGuildFromDBResult(err error, rows *f5.DataSet) { } for rows.Next() { guildId := q5.ToInt64(*rows.GetByIndex(1)) - // append to gm.guilds - gm.guilds[guildId] = &Guild{ + guild := &Guild{ AutoId: q5.ToInt64(*rows.GetByIndex(0)), - GuildId: q5.ToInt64(*rows.GetByIndex(1)), + GuildId: guildId, Name: q5.ToString(*rows.GetByIndex(2)), LeaderId: q5.ToString(*rows.GetByIndex(3)), Avatar: q5.ToInt32(*rows.GetByIndex(4)), @@ -55,7 +54,11 @@ func (gm *GuildMgr) loadGuildFromDBResult(err error, rows *f5.DataSet) { TotalKills: q5.ToInt32(*rows.GetByIndex(9)), ChickenDinners: q5.ToInt32(*rows.GetByIndex(10)), MaxMembers: q5.ToInt32(*rows.GetByIndex(11)), + Members: make(map[string]*GuildMember, MaxMembers), + PendingReqs: make(map[string]int32, MaxPendingReqs), } + + gm.guilds[guildId] = guild gm.guildIds = append(gm.guildIds, guildId) } q5.UnSetBitFlag(&gm.loadedFlags, LoadGuildFlag) @@ -135,9 +138,6 @@ func (gm *GuildMgr) loadPendingReqsFromDBResult(err error, rows *f5.DataSet) { Status: PendingReqIsJoinGuildStatusDefault, } if guild, ok := gm.guilds[guildId]; ok { - if guild.PendingReqs == nil { - guild.PendingReqs = make(map[string]int32) - } guild.AddPendingReq(pendingReq) } } diff --git a/server/imserver/guildmgr.go b/server/imserver/guildmgr.go index 304df762..cf885495 100644 --- a/server/imserver/guildmgr.go +++ b/server/imserver/guildmgr.go @@ -6,7 +6,6 @@ import ( "fmt" "math/rand" "q5" - "sort" "time" ) @@ -112,6 +111,7 @@ func (gm *GuildMgr) CreateGuild(avatar int32, name *string, leaderId string, TotalKills: 0, ChickenDinners: 0, MaxMembers: MaxMembers, + Members: make(map[string]*GuildMember, MaxMembers), PendingReqs: make(map[string]int32, MaxPendingReqs), } guild.AddMember(newMember) @@ -154,8 +154,7 @@ func (gm *GuildMgr) ApplyToGuild(guildId int64, applicantAccountId string, cb fu } // 可直接加入 if guild.JoinCond == JoinCondFree { - gm.JoinGuild(guild, applicantAccountId) - cb(ERR_CODE_OK, "ApplyToGuild OK") + gm.JoinGuild(guild, applicantAccountId, cb) return } @@ -169,8 +168,7 @@ func (gm *GuildMgr) ApplyToGuild(guildId int64, applicantAccountId string, cb fu cb(ERR_CODE_APPLY_GUILD_FAIL, "ApplyToGuild Fail, user star error") return } - gm.JoinGuild(guild, applicantAccountId) - cb(ERR_CODE_OK, "ApplyToGuild OK") + gm.JoinGuild(guild, applicantAccountId, cb) return } @@ -216,7 +214,6 @@ func (gm *GuildMgr) ApplyToGuild(guildId int64, applicantAccountId string, cb fu EVENT_APPLY, prop, ) - cb(ERR_CODE_OK, "ApplyToGuild ok") }) } @@ -353,30 +350,34 @@ func (gm *GuildMgr) Reject(operatorAccountId, accountId string, cb func(errCode } // JoinGuild 直接加入公会 -func (gm *GuildMgr) JoinGuild(guild *Guild, accountId string) { +func (gm *GuildMgr) JoinGuild(guild *Guild, accountId string, cb func(errCode int32, errMsg string)) { newMember := GuildMember{AccountId: accountId, Level: GuildMemberLevelDefault} guildId := guild.GuildId gm.upsertGuildMember(guildId, &newMember, func(err error) { if err != nil { - guild.AddMember(&newMember) - gm.AddUserGuild(accountId, guildId) - - user := friendMgr.GetUser(accountId) - cacheMgr.LoadPlayerProfile(user, func(playerProfile *PlayerProfile) {}) - - // Add event - prop := make(map[string]string) - prop["guild_id"] = q5.ToString(guild.GuildId) - prop["members_count"] = q5.ToString(guild.GetMembersCount()) - f5.GetTgLog().AddTrackLog( - GAME_ID, - accountId, - "127.0.0.1", - EVENT_JOIN, - prop, - ) + cb(ERR_CODE_UPDATE_GUILD_MEMBER_DB_FAIL, "JoinGuild Fail, upsertGuildMember") + return } + guild.AddMember(&newMember) + gm.AddUserGuild(accountId, guildId) + + cb(ERR_CODE_OK, "ApplyToGuild OK") + + user := friendMgr.GetUser(accountId) + cacheMgr.LoadPlayerProfile(user, func(playerProfile *PlayerProfile) {}) + + // Add event + prop := make(map[string]string) + prop["guild_id"] = q5.ToString(guild.GuildId) + prop["members_count"] = q5.ToString(guild.GetMembersCount()) + f5.GetTgLog().AddTrackLog( + GAME_ID, + accountId, + "127.0.0.1", + EVENT_JOIN, + prop, + ) }) } @@ -384,7 +385,7 @@ func (gm *GuildMgr) JoinGuild(guild *Guild, accountId string) { func (gm *GuildMgr) LeaveGuild(accountId string, cb func(errCode int32, errMsg string)) { guild := gm.GetGuildByAccountId(accountId) if guild == nil { - cb(ERR_CODE_GUILD_NO_EXISTS, "LeaveGuild guild no exists") + cb(ERR_CODE_GUILD_NO_EXISTS, "no join guild]") return } member := guild.GetMember(accountId) @@ -404,7 +405,7 @@ func (gm *GuildMgr) LeaveGuild(accountId string, cb func(errCode int32, errMsg s // 重新选举公长 if accountId == guild.LeaderId { - newLeader := ElectNewGuildLeader(guild) + newLeader := guild.NewLeaderId() if newLeader == nil { cb(ERR_CODE_UPDATE_GUILD_DB_FAIL, "error") return @@ -440,8 +441,9 @@ func (gm *GuildMgr) LeaveGuild(accountId string, cb func(errCode int32, errMsg s guild.RemoveMember(accountId) gm.RemoveUserGuild(accountId) + // Add logs - logContent := fmt.Sprintf("LeaveGuild[%d-%s]", guild.GuildId, accountId) + logContent := fmt.Sprintf("MemberCount[%d]", guild.GetMembersCount()) gm.WriteLog(guild.GuildId, accountId, LogTypeLeave, logContent) // Add event @@ -455,7 +457,6 @@ func (gm *GuildMgr) LeaveGuild(accountId string, cb func(errCode int32, errMsg s EVENT_LEAVE, prop, ) - cb(ERR_CODE_OK, "LeaveGuild OK") }) } @@ -527,12 +528,12 @@ func (gm *GuildMgr) SetMemberLevel(operatorAccountId, accountId string, level in // 干部, 精英, 副会长 guild := gm.GetGuildByAccountId(operatorAccountId) if guild == nil { - cb(ERR_CODE_GUILD_NO_EXISTS, "PromoteMember guild no exists") + cb(ERR_CODE_GUILD_NO_EXISTS, "SetMemberLevel guild no exists") return } if accountId == guild.LeaderId || accountId == operatorAccountId { - cb(ERR_CODE_GUILD_BLOCKED_LEADER, "PromoteMember Blocked leader") + cb(ERR_CODE_GUILD_BLOCKED_LEADER, "SetMemberLevel no operate your self account") return } @@ -544,7 +545,7 @@ func (gm *GuildMgr) SetMemberLevel(operatorAccountId, accountId string, level in beforeLevel := member.Level if member.Level == level { - cb(ERR_CODE_GUILD_OPERATOR_MEMBER_NO_PERM, "LeaveGuild error") + cb(ERR_CODE_GUILD_OPERATOR_MEMBER_NO_PERM, "SetMemberLevel error") return } @@ -556,8 +557,34 @@ func (gm *GuildMgr) SetMemberLevel(operatorAccountId, accountId string, level in } member.Level = level + // 转让会长的操作 + if level == GuildMemberLevelLeader { + operatorMember := guild.GetMember(operatorAccountId) + operatorMember.Level = GuildMemberLevelDefault + + guild.LeaderId = member.AccountId + updateFields := [][]string{ + {"leader_account_id", q5.ToString(guild.LeaderId)}, + } + gm.updateGuild(guild, updateFields, func(err error) { + if err != nil { + cb(ERR_CODE_UPDATE_GUILD_DB_FAIL, err.Error()) + return + } + // 新会长 + newMemberFields := [][]string{{"level", q5.ToString(member.Level)}} + gm.updateGuildMember(guild, member.AccountId, newMemberFields, + func(err error) { + if err != nil { + cb(ERR_CODE_UPDATE_GUILD_MEMBER_DB_FAIL, err.Error()) + return + } + }) + }) + } + logContent := fmt.Sprintf("SetMemberLevel[%d-%s-%s-%d-%d]", guild.GuildId, operatorAccountId, accountId, beforeLevel, level) - gm.WriteLog(guild.GuildId, accountId, LogTypePromote, logContent) + gm.WriteLog(guild.GuildId, accountId, LogTypeChangeLevel, logContent) // Add event prop := make(map[string]string) @@ -578,123 +605,6 @@ func (gm *GuildMgr) SetMemberLevel(operatorAccountId, accountId string, level in }) } -// PromoteMember 提升成员为干部 -func (gm *GuildMgr) PromoteMember(operatorAccountId, accountId string, cb func(errCode int32, errMsg string)) { - // 干部, 精英, 副会长 - guild := gm.GetGuildByAccountId(operatorAccountId) - if guild == nil { - cb(ERR_CODE_GUILD_NO_EXISTS, "PromoteMember guild no exists") - return - } - - if accountId == guild.LeaderId || accountId == operatorAccountId { - cb(ERR_CODE_GUILD_BLOCKED_LEADER, "PromoteMember Blocked leader") - return - } - - // 仅会长操作 - if operatorAccountId != guild.LeaderId { - cb(ERR_CODE_GUILD_NO_LEADER_PERM, "PromoteMember only leader perm") - return - } - - member := guild.GetMember(accountId) - if member == nil { - cb(ERR_CODE_GUILD_MEMBER_NO_EXISTS, "LeaveGuild member no exists") - return - } - - if member.Level == GuildMemberLevelViceLeader { - cb(ERR_CODE_GUILD_OPERATOR_MEMBER_NO_PERM, "LeaveGuild error") - return - } - - fields := [][]string{{"level", q5.ToString(GuildMemberLevelViceLeader)}} - gm.updateGuildMember(guild, member.AccountId, fields, func(err error) { - if err != nil { - cb(ERR_CODE_UPDATE_GUILD_MEMBER_DB_FAIL, err.Error()) - return - } - - member.Level = GuildMemberLevelViceLeader - logContent := fmt.Sprintf("PromoteMember[%d-%s-%s]", guild.GuildId, operatorAccountId, accountId) - gm.WriteLog(guild.GuildId, accountId, LogTypePromote, logContent) - - // Add event - prop := make(map[string]string) - prop["guild_id"] = q5.ToString(guild.GuildId) - prop["accountId"] = q5.ToString(accountId) - prop["members_count"] = q5.ToString(guild.GetMembersCount()) - f5.GetTgLog().AddTrackLog( - GAME_ID, - operatorAccountId, - "127.0.0.1", - EVENT_PROMOTE_MEMBER, - prop, - ) - - cb(ERR_CODE_OK, "PromoteMember OK") - }) -} - -// DemoteMember 解除成员干部身份 -func (gm *GuildMgr) DemoteMember(operatorAccountId, accountId string, cb func(errCode int32, errMsg string)) { - guild := gm.GetGuildByAccountId(operatorAccountId) - if guild == nil { - cb(ERR_CODE_GUILD_NO_EXISTS, "DemoteMember guild no exists") - return - } - - if accountId == guild.LeaderId || accountId == operatorAccountId { - cb(ERR_CODE_GUILD_BLOCKED_LEADER, "DemoteMember Blocked leader") - return - } - - // 仅会长可操作 - if operatorAccountId != guild.LeaderId { - cb(ERR_CODE_GUILD_NO_LEADER_PERM, "DemoteMember only leader perm") - return - } - - member := guild.GetMember(accountId) - if member == nil { - cb(ERR_CODE_GUILD_MEMBER_NO_EXISTS, "DemoteMember member no exists") - return - } - - if member.Level == GuildMemberLevelDefault { - cb(ERR_CODE_GUILD_DEMOTE_MEMBER_OK, "DemoteMember member ok") - return - } - - fields := [][]string{{"level", q5.ToString(GuildMemberLevelDefault)}} - gm.updateGuildMember(guild, member.AccountId, fields, func(err error) { - if err != nil { - cb(ERR_CODE_UPDATE_GUILD_MEMBER_DB_FAIL, err.Error()) - return - } - - member.Level = GuildMemberLevelDefault - logContent := fmt.Sprintf("DemoteMember[%d-%s-%s]", guild.GuildId, operatorAccountId, accountId) - gm.WriteLog(guild.GuildId, accountId, LogTypeDemote, logContent) - - // Add event - prop := make(map[string]string) - prop["guild_id"] = q5.ToString(guild.GuildId) - prop["accountId"] = q5.ToString(accountId) - prop["members_count"] = q5.ToString(guild.GetMembersCount()) - f5.GetTgLog().AddTrackLog( - GAME_ID, - operatorAccountId, - "127.0.0.1", - EVENT_DEMOTE_MEMBER, - prop, - ) - - cb(ERR_CODE_OK, "DemoteMember OK") - }) -} - // Disband 解散公会 func (gm *GuildMgr) Disband(operatorAccountId string, cb func(errCode int32, errMsg string)) { guild := gm.GetGuildByAccountId(operatorAccountId) @@ -705,7 +615,7 @@ func (gm *GuildMgr) Disband(operatorAccountId string, cb func(errCode int32, err // 仅会长可操作 if operatorAccountId != guild.LeaderId { - cb(ERR_CODE_GUILD_NO_LEADER_PERM, "PromoteMember only leader perm") + cb(ERR_CODE_GUILD_NO_LEADER_PERM, "Disband only leader perm") return } guildId := guild.GuildId @@ -1011,26 +921,3 @@ func (gm *GuildMgr) GetGuildLogs(guildId int64) []*GuildLog { } return nil } - -func ElectNewGuildLeader(guild *Guild) *GuildMember { - sort.Slice(guild.Members, func(i, j int) bool { - return guild.Members[i].Level < guild.Members[j].Level - }) - // 找到级别最低的成员 - lowestLevel := guild.Members[0].Level - - var potentialLeaders []*GuildMember - for _, member := range guild.Members { - if member.Level == lowestLevel { - potentialLeaders = append(potentialLeaders, member) - } else { - break - } - } - - newLeader := potentialLeaders[rand.Intn(len(potentialLeaders))] - newLeader.Level = GuildMemberLevelLeader - return newLeader - //newLeader.Level = GuildMemberLevelLeader - //return newLeader.AccountId -} diff --git a/server/imserver/handlermgr.go b/server/imserver/handlermgr.go index bc2d8f64..e44c6586 100644 --- a/server/imserver/handlermgr.go +++ b/server/imserver/handlermgr.go @@ -35,10 +35,9 @@ func (this *HandlerMgr) init() { cs.RegHandlerId(int(cs.CMMessageIdE__CMReject), PLAYER_HANDLER_ID) cs.RegHandlerId(int(cs.CMMessageIdE__CMLeaveGuild), PLAYER_HANDLER_ID) cs.RegHandlerId(int(cs.CMMessageIdE__CMDismissMember), PLAYER_HANDLER_ID) - cs.RegHandlerId(int(cs.CMMessageIdE__CMPromoteMember), PLAYER_HANDLER_ID) - cs.RegHandlerId(int(cs.CMMessageIdE__CMDemoteMember), PLAYER_HANDLER_ID) cs.RegHandlerId(int(cs.CMMessageIdE__CMDisband), PLAYER_HANDLER_ID) cs.RegHandlerId(int(cs.CMMessageIdE__CMSearchGuilds), PLAYER_HANDLER_ID) + cs.RegHandlerId(int(cs.CMMessageIdE__CMApplyList), PLAYER_HANDLER_ID) cs.RegHandlerId(int(cs.CMMessageIdE__CMGuildMembersList), PLAYER_HANDLER_ID) cs.RegHandlerId(int(cs.CMMessageIdE__CMSetNotice), PLAYER_HANDLER_ID) cs.RegHandlerId(int(cs.CMMessageIdE__CMSetName), PLAYER_HANDLER_ID) diff --git a/server/imserver/player.go b/server/imserver/player.go index 3c2575bd..5613a333 100644 --- a/server/imserver/player.go +++ b/server/imserver/player.go @@ -440,36 +440,6 @@ func (p *Player) CMSetMemberLevel(hdr *f5.MsgHdr, msg *cs.CMSetMemberLevel) { }) } -// CMPromoteMember 提升成员为干部 -func (p *Player) CMPromoteMember(hdr *f5.MsgHdr, msg *cs.CMPromoteMember) { - guildMgr.PromoteMember( - p.accountId, - msg.GetPromoteAccountId(), - func(errCode int32, errMsg string) { - rspMsg := new(cs.SMPromoteMember) - if errCode != 0 { - rspMsg.Errcode = &errCode - rspMsg.Errmsg = &errMsg - } - p.SendMsg(rspMsg) - }) -} - -// CMDemoteMember 解除成员干部身份 -func (p *Player) CMDemoteMember(hdr *f5.MsgHdr, msg *cs.CMDemoteMember) { - guildMgr.DemoteMember( - p.accountId, - msg.GetDemoteAccountId(), - func(errCode int32, errMsg string) { - rspMsg := new(cs.SMDemoteMember) - if errCode != 0 { - rspMsg.Errcode = &errCode - rspMsg.Errmsg = &errMsg - } - p.SendMsg(rspMsg) - }) -} - // CMDisband 解散公会 func (p *Player) CMDisband(hdr *f5.MsgHdr, msg *cs.CMDisband) { guildMgr.Disband( @@ -621,6 +591,7 @@ func (p *Player) FillMFGuildMember(member *GuildMember) *cs.MFGuildMember { if profile == nil { return nil } + onlineStatus := playerMgr.GetOnlineStatus(member.AccountId) guildMember := &cs.MFGuildMember{ AccountId: &member.AccountId, Level: &member.Level, @@ -629,7 +600,7 @@ func (p *Player) FillMFGuildMember(member *GuildMember) *cs.MFGuildMember { AvatarHead: &profile.AvatarHead, Star: &profile.Star, Rank: &profile.Rank, - OnlineStatus: &profile.OnlineStatus, + OnlineStatus: &onlineStatus, LastLoginTime: &profile.LastLoginTime, } return guildMember @@ -688,6 +659,7 @@ func (p *Player) FillMFUser(profile *PlayerProfile) *cs.MFUser { guildId = guild.GuildId guildName = guild.Name } + onlineStatus := playerMgr.GetOnlineStatus(profile.AccountId) resUser := &cs.MFUser{ AccountId: &profile.AccountId, @@ -697,7 +669,7 @@ func (p *Player) FillMFUser(profile *PlayerProfile) *cs.MFUser { GuildId: &guildId, GuildName: &guildName, Rank: &profile.Rank, - OnlineStatus: &profile.OnlineStatus, + OnlineStatus: &onlineStatus, LastLoginTime: &profile.LastLoginTime, } return resUser diff --git a/server/imserver/playermgr.go b/server/imserver/playermgr.go index d84d83b4..785473f6 100644 --- a/server/imserver/playermgr.go +++ b/server/imserver/playermgr.go @@ -190,3 +190,11 @@ func (this *PlayerMgr) getPlayerBySocket(socket f5.WspCliConn) *Player { func (this *PlayerMgr) addSocketHash(wsp f5.WspCliConn, p *Player) { this.socketHash[wsp] = p } + +func (this *PlayerMgr) GetOnlineStatus(accountId string) int32 { + player := this.GetPlayerByAccountId(accountId) + if player != nil { + return OnlineStatus + } + return OnlineStatusOff +} diff --git a/server/imserver/proto/cs_msgid.proto b/server/imserver/proto/cs_msgid.proto index 5df079e1..c97e7a47 100644 --- a/server/imserver/proto/cs_msgid.proto +++ b/server/imserver/proto/cs_msgid.proto @@ -37,8 +37,6 @@ enum CMMessageId_e _CMReject = 124; _CMLeaveGuild = 125; _CMDismissMember = 126; - _CMPromoteMember = 127; - _CMDemoteMember = 128; _CMDisband = 129; _CMSearchGuilds = 130; _CMApplyList = 131; @@ -79,8 +77,6 @@ enum SMMessageId_e _SMReject = 124; _SMLeaveGuild = 125; _SMDismissMember = 126; - _SMPromoteMember = 127; - _SMDemoteMember = 128; _SMDisband = 129; _SMSearchGuilds = 130; _SMApplyList = 131; diff --git a/server/imserver/proto/cs_proto.proto b/server/imserver/proto/cs_proto.proto index d89b3ea1..04aa804c 100644 --- a/server/imserver/proto/cs_proto.proto +++ b/server/imserver/proto/cs_proto.proto @@ -420,7 +420,7 @@ message CMApplyList{} // 回复申请者列表 message SMApplyList { - optional string errcode = 1; + optional int32 errcode = 1; optional string errmsg = 2; repeated MFGuildMember members = 3; } @@ -496,32 +496,6 @@ message SMSetMemberLevel optional string errmsg = 2; } -// 请求提升成员为干部 -message CMPromoteMember -{ - optional string promoteAccountId = 1; -} - -// 回复提升成员为干部 -message SMPromoteMember -{ - optional int32 errcode = 1; - optional string errmsg = 2; -} - -// 请求解除成员干部身份 -message CMDemoteMember -{ - optional string demoteAccountId = 1; -} - -// 回复解除成员干部身份 -message SMDemoteMember -{ - optional int32 errcode = 1; - optional string errmsg = 2; -} - // 请求公会成员列表 message CMGuildMembersList {