server/game2006go
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2023-09-14 22:28:48 +08:00
commit b8796267fa
9 changed files with 710 additions and 526 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server/imserver/cs/cs.auto_gen.go
View File

@ -54,6 +54,7 @@ type MsgHandler interface {
CMSetCurrPrivateChatTarget(*f5.MsgHdr, *CMSetCurrPrivateChatTarget) CMSetCurrPrivateChatTarget(*f5.MsgHdr, *CMSetCurrPrivateChatTarget)
CMCloseChatNotify(*f5.MsgHdr, *CMCloseChatNotify) CMCloseChatNotify(*f5.MsgHdr, *CMCloseChatNotify)
CMGuildInfo(*f5.MsgHdr, *CMGuildInfo) CMGuildInfo(*f5.MsgHdr, *CMGuildInfo)
CMRecommendGuildList(*f5.MsgHdr, *CMRecommendGuildList)
CMCreateGuild(*f5.MsgHdr, *CMCreateGuild) CMCreateGuild(*f5.MsgHdr, *CMCreateGuild)
CMApplyToGuild(*f5.MsgHdr, *CMApplyToGuild) CMApplyToGuild(*f5.MsgHdr, *CMApplyToGuild)
CMApplyList(*f5.MsgHdr, *CMApplyList) CMApplyList(*f5.MsgHdr, *CMApplyList)
@ -131,6 +132,9 @@ func (this *MsgHandlerImpl) CMCloseChatNotify(hdr *f5.MsgHdr, msg *CMCloseChatNo
func (this *MsgHandlerImpl) CMGuildInfo(hdr *f5.MsgHdr, msg *CMGuildInfo) { func (this *MsgHandlerImpl) CMGuildInfo(hdr *f5.MsgHdr, msg *CMGuildInfo) {
} }
func (this *MsgHandlerImpl) CMRecommendGuildList(hdr *f5.MsgHdr, msg *CMRecommendGuildList) {
}
func (this *MsgHandlerImpl) CMCreateGuild(hdr *f5.MsgHdr, msg *CMCreateGuild) { func (this *MsgHandlerImpl) CMCreateGuild(hdr *f5.MsgHdr, msg *CMCreateGuild) {
} }
@ -345,6 +349,14 @@ func (this *SMGuildInfo) GetNetMsgId() uint16 {
return uint16(SMMessageIdE__SMGuildInfo) return uint16(SMMessageIdE__SMGuildInfo)
} }
func (this *CMRecommendGuildList) GetNetMsgId() uint16 {
return uint16(CMMessageIdE__CMRecommendGuildList)
}
func (this *SMRecommendGuildList) GetNetMsgId() uint16 {
return uint16(SMMessageIdE__SMRecommendGuildList)
}
func (this *CMCreateGuild) GetNetMsgId() uint16 { func (this *CMCreateGuild) GetNetMsgId() uint16 {
return uint16(CMMessageIdE__CMCreateGuild) return uint16(CMMessageIdE__CMCreateGuild)
} }
@ -719,6 +731,18 @@ func init() {
}, },
} }
handlers[int(CMMessageIdE__CMRecommendGuildList)] = &CsNetMsgHandler{
MsgId: int(CMMessageIdE__CMRecommendGuildList),
ParseCb: func (data []byte) interface{} {
msg := &CMRecommendGuildList{}
proto.Unmarshal(data, msg)
return msg
},
Cb: func (hdr *f5.MsgHdr, handler MsgHandler) {
handler.CMRecommendGuildList(hdr, hdr.Msg.(*CMRecommendGuildList))
},
}
handlers[int(CMMessageIdE__CMCreateGuild)] = &CsNetMsgHandler{ handlers[int(CMMessageIdE__CMCreateGuild)] = &CsNetMsgHandler{
MsgId: int(CMMessageIdE__CMCreateGuild), MsgId: int(CMMessageIdE__CMCreateGuild),
ParseCb: func (data []byte) interface{} { ParseCb: func (data []byte) interface{} {

202
server/imserver/cs/cs_msgid.pb.go
View File

@ -45,25 +45,26 @@ const (
CMMessageIdE__CMReadMsgAndOpenChatNotify CMMessageIdE = 202 CMMessageIdE__CMReadMsgAndOpenChatNotify CMMessageIdE = 202
CMMessageIdE__CMCloseChatNotify CMMessageIdE = 203 CMMessageIdE__CMCloseChatNotify CMMessageIdE = 203
// 公会相关 // 公会相关
CMMessageIdE__CMGuildInfo CMMessageIdE = 120 CMMessageIdE__CMGuildInfo CMMessageIdE = 120
CMMessageIdE__CMCreateGuild CMMessageIdE = 121 CMMessageIdE__CMCreateGuild CMMessageIdE = 121
CMMessageIdE__CMApplyToGuild CMMessageIdE = 122 CMMessageIdE__CMApplyToGuild CMMessageIdE = 122
CMMessageIdE__CMApprove CMMessageIdE = 123 CMMessageIdE__CMApprove CMMessageIdE = 123
CMMessageIdE__CMReject CMMessageIdE = 124 CMMessageIdE__CMReject CMMessageIdE = 124
CMMessageIdE__CMLeaveGuild CMMessageIdE = 125 CMMessageIdE__CMLeaveGuild CMMessageIdE = 125
CMMessageIdE__CMDismissMember CMMessageIdE = 126 CMMessageIdE__CMDismissMember CMMessageIdE = 126
CMMessageIdE__CMPromoteMember CMMessageIdE = 127 CMMessageIdE__CMPromoteMember CMMessageIdE = 127
CMMessageIdE__CMDemoteMember CMMessageIdE = 128 CMMessageIdE__CMDemoteMember CMMessageIdE = 128
CMMessageIdE__CMDisband CMMessageIdE = 129 CMMessageIdE__CMDisband CMMessageIdE = 129
CMMessageIdE__CMSearchGuilds CMMessageIdE = 130 CMMessageIdE__CMSearchGuilds CMMessageIdE = 130
CMMessageIdE__CMApplyList CMMessageIdE = 131 CMMessageIdE__CMApplyList CMMessageIdE = 131
CMMessageIdE__CMGuildLogs CMMessageIdE = 132 CMMessageIdE__CMGuildLogs CMMessageIdE = 132
CMMessageIdE__CMSetNotice CMMessageIdE = 133 CMMessageIdE__CMSetNotice CMMessageIdE = 133
CMMessageIdE__CMSetMemberLevel CMMessageIdE = 134 CMMessageIdE__CMSetMemberLevel CMMessageIdE = 134
CMMessageIdE__CMGuildMembersList CMMessageIdE = 135 CMMessageIdE__CMGuildMembersList CMMessageIdE = 135
CMMessageIdE__CMSetName CMMessageIdE = 136 CMMessageIdE__CMSetName CMMessageIdE = 136
CMMessageIdE__CMSetAvatar CMMessageIdE = 137 CMMessageIdE__CMSetAvatar CMMessageIdE = 137
CMMessageIdE__CMSetJoinCond CMMessageIdE = 138 CMMessageIdE__CMSetJoinCond CMMessageIdE = 138
CMMessageIdE__CMRecommendGuildList CMMessageIdE = 139
) )
// Enum value maps for CMMessageIdE. // Enum value maps for CMMessageIdE.
@ -106,6 +107,7 @@ var (
136: "_CMSetName", 136: "_CMSetName",
137: "_CMSetAvatar", 137: "_CMSetAvatar",
138: "_CMSetJoinCond", 138: "_CMSetJoinCond",
139: "_CMRecommendGuildList",
} }
CMMessageIdE_value = map[string]int32{ CMMessageIdE_value = map[string]int32{
"_CMPing": 101, "_CMPing": 101,
@ -145,6 +147,7 @@ var (
"_CMSetName": 136, "_CMSetName": 136,
"_CMSetAvatar": 137, "_CMSetAvatar": 137,
"_CMSetJoinCond": 138, "_CMSetJoinCond": 138,
"_CMRecommendGuildList": 139,
} }
) )
@ -204,25 +207,26 @@ const (
SMMessageIdE__SMRemoveBlacklist SMMessageIdE = 114 SMMessageIdE__SMRemoveBlacklist SMMessageIdE = 114
SMMessageIdE__SMBlacklist SMMessageIdE = 116 SMMessageIdE__SMBlacklist SMMessageIdE = 116
// 公会相关 // 公会相关
SMMessageIdE__SMGuildInfo SMMessageIdE = 120 SMMessageIdE__SMGuildInfo SMMessageIdE = 120
SMMessageIdE__SMCreateGuild SMMessageIdE = 121 SMMessageIdE__SMCreateGuild SMMessageIdE = 121
SMMessageIdE__SMApplyToGuild SMMessageIdE = 122 SMMessageIdE__SMApplyToGuild SMMessageIdE = 122
SMMessageIdE__SMApprove SMMessageIdE = 123 SMMessageIdE__SMApprove SMMessageIdE = 123
SMMessageIdE__SMReject SMMessageIdE = 124 SMMessageIdE__SMReject SMMessageIdE = 124
SMMessageIdE__SMLeaveGuild SMMessageIdE = 125 SMMessageIdE__SMLeaveGuild SMMessageIdE = 125
SMMessageIdE__SMDismissMember SMMessageIdE = 126 SMMessageIdE__SMDismissMember SMMessageIdE = 126
SMMessageIdE__SMPromoteMember SMMessageIdE = 127 SMMessageIdE__SMPromoteMember SMMessageIdE = 127
SMMessageIdE__SMDemoteMember SMMessageIdE = 128 SMMessageIdE__SMDemoteMember SMMessageIdE = 128
SMMessageIdE__SMDisband SMMessageIdE = 129 SMMessageIdE__SMDisband SMMessageIdE = 129
SMMessageIdE__SMSearchGuilds SMMessageIdE = 130 SMMessageIdE__SMSearchGuilds SMMessageIdE = 130
SMMessageIdE__SMApplyList SMMessageIdE = 131 SMMessageIdE__SMApplyList SMMessageIdE = 131
SMMessageIdE__SMGuildLogs SMMessageIdE = 132 SMMessageIdE__SMGuildLogs SMMessageIdE = 132
SMMessageIdE__SMSetNotice SMMessageIdE = 133 SMMessageIdE__SMSetNotice SMMessageIdE = 133
SMMessageIdE__SMSetMemberLevel SMMessageIdE = 134 SMMessageIdE__SMSetMemberLevel SMMessageIdE = 134
SMMessageIdE__SMGuildMembersList SMMessageIdE = 135 SMMessageIdE__SMGuildMembersList SMMessageIdE = 135
SMMessageIdE__SMSetName SMMessageIdE = 136 SMMessageIdE__SMSetName SMMessageIdE = 136
SMMessageIdE__SMSetAvatar SMMessageIdE = 137 SMMessageIdE__SMSetAvatar SMMessageIdE = 137
SMMessageIdE__SMSetJoinCond SMMessageIdE = 138 SMMessageIdE__SMSetJoinCond SMMessageIdE = 138
SMMessageIdE__SMRecommendGuildList SMMessageIdE = 139
// 聊天相关 // 聊天相关
SMMessageIdE__SMUpdateChatRedPointNotify SMMessageIdE = 200 SMMessageIdE__SMUpdateChatRedPointNotify SMMessageIdE = 200
SMMessageIdE__SMChatMsgNotify SMMessageIdE = 201 SMMessageIdE__SMChatMsgNotify SMMessageIdE = 201
@ -268,6 +272,7 @@ var (
136: "_SMSetName", 136: "_SMSetName",
137: "_SMSetAvatar", 137: "_SMSetAvatar",
138: "_SMSetJoinCond", 138: "_SMSetJoinCond",
139: "_SMRecommendGuildList",
200: "_SMUpdateChatRedPointNotify", 200: "_SMUpdateChatRedPointNotify",
201: "_SMChatMsgNotify", 201: "_SMChatMsgNotify",
202: "_SMUpdateRedPointNotify", 202: "_SMUpdateRedPointNotify",
@ -309,6 +314,7 @@ var (
"_SMSetName": 136, "_SMSetName": 136,
"_SMSetAvatar": 137, "_SMSetAvatar": 137,
"_SMSetJoinCond": 138, "_SMSetJoinCond": 138,
"_SMRecommendGuildList": 139,
"_SMUpdateChatRedPointNotify": 200, "_SMUpdateChatRedPointNotify": 200,
"_SMChatMsgNotify": 201, "_SMChatMsgNotify": 201,
"_SMUpdateRedPointNotify": 202, "_SMUpdateRedPointNotify": 202,
@ -358,7 +364,7 @@ var File_cs_msgid_proto protoreflect.FileDescriptor
var file_cs_msgid_proto_rawDesc = []byte{ var file_cs_msgid_proto_rawDesc = []byte{
0x0a, 0x0e, 0x63, 0x73, 0x5f, 0x6d, 0x73, 0x67, 0x69, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x0a, 0x0e, 0x63, 0x73, 0x5f, 0x6d, 0x73, 0x67, 0x69, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x12, 0x02, 0x63, 0x73, 0x2a, 0xb6, 0x06, 0x0a, 0x0d, 0x43, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x12, 0x02, 0x63, 0x73, 0x2a, 0xd2, 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, 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, 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, 0x67, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x43, 0x4d, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
@ -409,63 +415,67 @@ var file_cs_msgid_proto_rawDesc = []byte{
0x74, 0x10, 0x87, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x43, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x61, 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, 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, 0x76, 0x61, 0x74, 0x61, 0x72, 0x10, 0x89, 0x01, 0x12, 0x13, 0x0a, 0x0e, 0x5f, 0x43, 0x4d, 0x53,
0x65, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x10, 0x8a, 0x01, 0x2a, 0xf6, 0x06, 0x65, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x10, 0x8a, 0x01, 0x12, 0x1a, 0x0a,
0x0a, 0x0d, 0x53, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x64, 0x5f, 0x65, 0x12, 0x15, 0x5f, 0x43, 0x4d, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x47, 0x75, 0x69,
0x0b, 0x0a, 0x07, 0x5f, 0x53, 0x4d, 0x50, 0x69, 0x6e, 0x67, 0x10, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x6c, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x8b, 0x01, 0x2a, 0x92, 0x07, 0x0a, 0x0d, 0x53, 0x4d,
0x5f, 0x53, 0x4d, 0x52, 0x70, 0x63, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x66, 0x12, 0x0c, 0x0a, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x64, 0x5f, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x5f,
0x08, 0x5f, 0x53, 0x4d, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x10, 0x67, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x50, 0x69, 0x6e, 0x67, 0x10, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x5f, 0x53, 0x4d, 0x52,
0x53, 0x4d, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x10, 0x68, 0x12, 0x1c, 0x0a, 0x70, 0x63, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x66, 0x12, 0x0c, 0x0a, 0x08, 0x5f, 0x53, 0x4d,
0x18, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, 0x42, 0x79, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x10, 0x67, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x52, 0x65,
0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x10, 0x69, 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x10, 0x68, 0x12, 0x1c, 0x0a, 0x18, 0x5f, 0x53, 0x4d,
0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, 0x10, 0x6a, 0x12, 0x17, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, 0x42, 0x79, 0x41, 0x63, 0x63, 0x6f,
0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x10, 0x69, 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x53, 0x65,
0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6b, 0x12, 0x1a, 0x0a, 0x16, 0x5f, 0x53, 0x4d, 0x41, 0x63, 0x61, 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, 0x10, 0x6a, 0x12, 0x17, 0x0a, 0x13, 0x5f, 0x53,
0x63, 0x65, 0x70, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x4d, 0x41, 0x64, 0x64, 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, 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, 0x6d, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6c, 0x12,
0x1f, 0x0a, 0x1b, 0x5f, 0x53, 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x1a, 0x0a, 0x16, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x46, 0x72, 0x69, 0x65,
0x67, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6e, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6d, 0x12, 0x1f, 0x0a, 0x1b, 0x5f,
0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x53, 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x46, 0x72, 0x69,
0x64, 0x10, 0x6f, 0x12, 0x17, 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6e, 0x12, 0x11, 0x0a, 0x0d,
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x70, 0x12, 0x13, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x10, 0x6f, 0x12,
0x5f, 0x53, 0x4d, 0x41, 0x64, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, 0x17, 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65,
0x71, 0x12, 0x16, 0x0a, 0x12, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x42, 0x6c, 0x6e, 0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x70, 0x12, 0x13, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x41,
0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, 0x72, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x64, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, 0x71, 0x12, 0x16, 0x0a,
0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, 0x74, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x12, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c,
0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0x78, 0x12, 0x12, 0x0a, 0x69, 0x73, 0x74, 0x10, 0x72, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x42, 0x6c, 0x61, 0x63,
0x0e, 0x5f, 0x53, 0x4d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, 0x74, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x47, 0x75,
0x79, 0x12, 0x13, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x54, 0x6f, 0x47, 0x69, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0x78, 0x12, 0x12, 0x0a, 0x0e, 0x5f, 0x53, 0x4d,
0x75, 0x69, 0x6c, 0x64, 0x10, 0x7a, 0x12, 0x0e, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, 0x79, 0x12, 0x13, 0x0a,
0x72, 0x6f, 0x76, 0x65, 0x10, 0x7b, 0x12, 0x0d, 0x0a, 0x09, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6a, 0x0f, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x54, 0x6f, 0x47, 0x75, 0x69, 0x6c, 0x64,
0x65, 0x63, 0x74, 0x10, 0x7c, 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x4c, 0x65, 0x61, 0x76, 0x10, 0x7a, 0x12, 0x0e, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65,
0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, 0x7d, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x44, 0x10, 0x7b, 0x12, 0x0d, 0x0a, 0x09, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x10,
0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7e, 0x12, 0x14, 0x7c, 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x47, 0x75, 0x69,
0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x6c, 0x64, 0x10, 0x7d, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x44, 0x69, 0x73, 0x6d, 0x69,
0x65, 0x72, 0x10, 0x7f, 0x12, 0x14, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x44, 0x65, 0x6d, 0x6f, 0x74, 0x73, 0x73, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7e, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x53,
0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x80, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7f,
0x4d, 0x44, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x64, 0x10, 0x81, 0x01, 0x12, 0x14, 0x0a, 0x0f, 0x5f, 0x12, 0x14, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x44, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d,
0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x10, 0x82, 0x62, 0x65, 0x72, 0x10, 0x80, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x44, 0x69, 0x73,
0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x64, 0x10, 0x81, 0x01, 0x12, 0x14, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x53, 0x65,
0x74, 0x10, 0x83, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x61, 0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x10, 0x82, 0x01, 0x12, 0x11, 0x0a,
0x4c, 0x6f, 0x67, 0x73, 0x10, 0x84, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x0c, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x83, 0x01,
0x74, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x10, 0x85, 0x01, 0x12, 0x16, 0x0a, 0x11, 0x5f, 0x53, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x73,
0x4d, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x10, 0x10, 0x84, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x74,
0x86, 0x01, 0x12, 0x18, 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x69, 0x63, 0x65, 0x10, 0x85, 0x01, 0x12, 0x16, 0x0a, 0x11, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74,
0x6d, 0x62, 0x65, 0x72, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x87, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x10, 0x86, 0x01, 0x12, 0x18,
0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x10, 0x88, 0x01, 0x12, 0x11, 0x0a, 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72,
0x0c, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x10, 0x89, 0x01, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x87, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x53,
0x12, 0x13, 0x0a, 0x0e, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x10, 0x88, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d,
0x6e, 0x64, 0x10, 0x8a, 0x01, 0x12, 0x20, 0x0a, 0x1b, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x53, 0x65, 0x74, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x10, 0x89, 0x01, 0x12, 0x13, 0x0a, 0x0e,
0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x10, 0x8a,
0x74, 0x69, 0x66, 0x79, 0x10, 0xc8, 0x01, 0x12, 0x15, 0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x43, 0x68, 0x01, 0x12, 0x1a, 0x0a, 0x15, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e,
0x61, 0x74, 0x4d, 0x73, 0x67, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xc9, 0x01, 0x12, 0x1c, 0x64, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x8b, 0x01, 0x12, 0x20, 0x0a,
0x0a, 0x17, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x64, 0x50, 0x6f, 0x1b, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65,
0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xca, 0x01, 0x12, 0x27, 0x0a, 0x22, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xc8, 0x01, 0x12,
0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x15, 0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x43, 0x68, 0x61, 0x74, 0x4d, 0x73, 0x67, 0x4e, 0x6f, 0x74,
0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x69, 0x66, 0x79, 0x10, 0xc9, 0x01, 0x12, 0x1c, 0x0a, 0x17, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64,
0x66, 0x79, 0x10, 0xcb, 0x01, 0x12, 0x1f, 0x0a, 0x1a, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x61, 0x74, 0x65, 0x52, 0x65, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66,
0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4c, 0x61, 0x73, 0x79, 0x10, 0xca, 0x01, 0x12, 0x27, 0x0a, 0x22, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74,
0x74, 0x49, 0x64, 0x10, 0xcc, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x63, 0x73, 0x65, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x64, 0x50,
0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xcb, 0x01, 0x12, 0x1f, 0x0a,
0x1a, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68,
0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4c, 0x61, 0x73, 0x74, 0x49, 0x64, 0x10, 0xcc, 0x01, 0x42, 0x06,
0x5a, 0x04, 0x2e, 0x3b, 0x63, 0x73,
} }
var ( var (

950
server/imserver/cs/cs_proto.pb.go
View File

File diff suppressed because it is too large Load Diff

3
server/imserver/guilddbmgr.go
View File

@ -47,7 +47,7 @@ func (gm *GuildMgr) loadGuildFromDBResult(err error, rows *f5.DataSet) {
} }
for rows.Next() { for rows.Next() {
guildId := q5.ToInt64(*rows.GetByIndex(1)) guildId := q5.ToInt64(*rows.GetByIndex(1))
// put to gm.guilds // append to gm.guilds
gm.guilds[guildId] = &Guild{ gm.guilds[guildId] = &Guild{
AutoId: q5.ToInt64(*rows.GetByIndex(0)), AutoId: q5.ToInt64(*rows.GetByIndex(0)),
GuildId: q5.ToInt64(*rows.GetByIndex(1)), GuildId: q5.ToInt64(*rows.GetByIndex(1)),
@ -62,6 +62,7 @@ func (gm *GuildMgr) loadGuildFromDBResult(err error, rows *f5.DataSet) {
ChickenDinners: q5.ToInt32(*rows.GetByIndex(10)), ChickenDinners: q5.ToInt32(*rows.GetByIndex(10)),
MembersMax: q5.ToInt32(*rows.GetByIndex(11)), MembersMax: q5.ToInt32(*rows.GetByIndex(11)),
} }
gm.guildIds = append(gm.guildIds, guildId)
} }
q5.UnSetBitFlag(&gm.loadedFlags, LoadGuildFlag) q5.UnSetBitFlag(&gm.loadedFlags, LoadGuildFlag)
} }

5
server/imserver/guildmgr.go
View File

@ -18,8 +18,8 @@ const (
type GuildMgr struct { type GuildMgr struct {
cs.MsgHandlerImpl cs.MsgHandlerImpl
guildIds []int64 // 公会列表 guild ids
guilds map[int64]*Guild // 公会ID -> 公会 guilds map[int64]*Guild // 公会ID -> 公会
guildIds []int64 // 公会列表 guildIds
guildLogs map[int64][]*GuildLog // 公会ID -> []公会日志列表 guildLogs map[int64][]*GuildLog // 公会ID -> []公会日志列表
userGuilds map[string]int64 // accountId -> 公会ID userGuilds map[string]int64 // accountId -> 公会ID
loadedFlags int64 loadedFlags int64
@ -34,6 +34,7 @@ func NewGuildMgr() *GuildMgr {
} }
func (gm *GuildMgr) init() { func (gm *GuildMgr) init() {
gm.guildIds = make([]int64, 0, 200)
gm.loadFromDB() gm.loadFromDB()
} }
@ -53,8 +54,6 @@ func (gm *GuildMgr) loadFromDB() {
gm.loadPendingReqsFromDB() gm.loadPendingReqsFromDB()
// 加载公会日志 // 加载公会日志
gm.loadGuildLogsFromDB() gm.loadGuildLogsFromDB()
// 加载公会ids
gm.loadGuildIds()
//for gm.loadedFlags != 0 { //for gm.loadedFlags != 0 {
// time.Sleep(time.Millisecond * 1000) // time.Sleep(time.Millisecond * 1000)
//} //}

1
server/imserver/handlermgr.go
View File

@ -28,6 +28,7 @@ func (this *HandlerMgr) init() {
cs.RegHandlerId(int(cs.CMMessageIdE__CMRemoveBlacklist), PLAYER_HANDLER_ID) cs.RegHandlerId(int(cs.CMMessageIdE__CMRemoveBlacklist), PLAYER_HANDLER_ID)
// 公会 // 公会
cs.RegHandlerId(int(cs.CMMessageIdE__CMGuildInfo), PLAYER_HANDLER_ID) cs.RegHandlerId(int(cs.CMMessageIdE__CMGuildInfo), PLAYER_HANDLER_ID)
cs.RegHandlerId(int(cs.CMMessageIdE__CMRecommendGuildList), PLAYER_HANDLER_ID)
cs.RegHandlerId(int(cs.CMMessageIdE__CMCreateGuild), PLAYER_HANDLER_ID) cs.RegHandlerId(int(cs.CMMessageIdE__CMCreateGuild), PLAYER_HANDLER_ID)
cs.RegHandlerId(int(cs.CMMessageIdE__CMApplyToGuild), PLAYER_HANDLER_ID) cs.RegHandlerId(int(cs.CMMessageIdE__CMApplyToGuild), PLAYER_HANDLER_ID)
cs.RegHandlerId(int(cs.CMMessageIdE__CMApprove), PLAYER_HANDLER_ID) cs.RegHandlerId(int(cs.CMMessageIdE__CMApprove), PLAYER_HANDLER_ID)

29
server/imserver/player.go
View File

@ -341,29 +341,16 @@ func IsValidChatChannel(chatChannel int32) bool {
func (p *Player) CMGuildInfo(hdr *f5.MsgHdr, msg *cs.CMGuildInfo) { func (p *Player) CMGuildInfo(hdr *f5.MsgHdr, msg *cs.CMGuildInfo) {
rspMsg := new(cs.SMGuildInfo) rspMsg := new(cs.SMGuildInfo)
guild := guildMgr.GetGuildByAccountId(p.accountId) guild := guildMgr.GetGuildByAccountId(p.accountId)
if guild == nil { if guild != nil {
rspMsg.Guild = nil rspMsg.Guild = p.FillMFGuild(guild)
rspMsg.RandomGuilds = p.FillMFGuilds(guildMgr.RandomGuilds())
wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg)
return
} }
wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg)
}
rspGuild := &cs.MFGuild{ // CMRecommendGuildList 推荐公会列表
AutoId: &guild.AutoId, func (p *Player) CMRecommendGuildList(hdr *f5.MsgHdr, msg *cs.CMRecommendGuildList) {
GuildId: &guild.GuildId, rspMsg := new(cs.SMRecommendGuildList)
Name: &guild.Name, rspMsg.RecommendGuilds = p.FillMFGuilds(guildMgr.RandomGuilds())
LeaderId: &guild.LeaderId,
Avatar: &guild.Avatar,
Notice: &guild.Notice,
JoinCond: &guild.JoinCond,
JoinCondValue: &guild.JoinCondValue,
TotalStars: &guild.TotalStars,
TotalKills: &guild.TotalKills,
ChickenDinners: &guild.ChickenDinners,
MaxMembers: &guild.MembersMax,
}
rspMsg.Guild = rspGuild
rspMsg.RandomGuilds = nil
wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg) wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg)
} }

2
server/imserver/proto/cs_msgid.proto
View File

@ -49,6 +49,7 @@ enum CMMessageId_e
_CMSetName = 136; _CMSetName = 136;
_CMSetAvatar = 137; _CMSetAvatar = 137;
_CMSetJoinCond = 138; _CMSetJoinCond = 138;
_CMRecommendGuildList = 139;
} }
enum SMMessageId_e enum SMMessageId_e
@ -90,6 +91,7 @@ enum SMMessageId_e
_SMSetName = 136; _SMSetName = 136;
_SMSetAvatar = 137; _SMSetAvatar = 137;
_SMSetJoinCond = 138; _SMSetJoinCond = 138;
_SMRecommendGuildList = 139;
// 聊天相关 // 聊天相关
_SMUpdateChatRedPointNotify = 200; _SMUpdateChatRedPointNotify = 200;

20
server/imserver/proto/cs_proto.proto
View File

@ -365,11 +365,25 @@ message CMGuildInfo
{ {
} }
// 回复我的公会信息, 若未加入公会 guild = null，则返回随机公会列表 []MFGuild random_guilds // 回复我的公会信息
message SMGuildInfo message SMGuildInfo
{ {
optional MFGuild guild = 1; optional int32 errcode = 1;
repeated MFGuild random_guilds = 2; optional string errmsg = 2;
optional MFGuild guild = 3;
}
// 请求推荐公会列表
message CMRecommendGuildList
{
}
// 回复推荐公会列表
message SMRecommendGuildList
{
optional int32 errcode = 1;
optional string errmsg = 2;
repeated MFGuild recommend_guilds = 3;
} }
// 请求创建公会 // 请求创建公会