更新
This commit is contained in:
殷勇
parent
3e470c110f
commit
1c578a1b3e
@ -50,7 +50,7 @@ const (
|
|||||||
// im server guild
|
// im server guild
|
||||||
const (
|
const (
|
||||||
RandomGuildCount = 10
|
RandomGuildCount = 10
|
||||||
MembersMax = 10
|
MembersMax = 30
|
||||||
MaxPendingReqs = 10
|
MaxPendingReqs = 10
|
||||||
DefaultLogs = 20
|
DefaultLogs = 20
|
||||||
LogTypeApprove = 1 // 公会日志类型， 批准加入
|
LogTypeApprove = 1 // 公会日志类型， 批准加入
|
||||||
|
|||||||
@ -63,6 +63,7 @@ const (
|
|||||||
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
|
||||||
)
|
)
|
||||||
|
|
||||||
// Enum value maps for CMMessageIdE.
|
// Enum value maps for CMMessageIdE.
|
||||||
@ -104,6 +105,7 @@ var (
|
|||||||
135: "_CMGuildMembersList",
|
135: "_CMGuildMembersList",
|
||||||
136: "_CMSetName",
|
136: "_CMSetName",
|
||||||
137: "_CMSetAvatar",
|
137: "_CMSetAvatar",
|
||||||
|
138: "_CMSetJoinCond",
|
||||||
}
|
}
|
||||||
CMMessageIdE_value = map[string]int32{
|
CMMessageIdE_value = map[string]int32{
|
||||||
"_CMPing": 101,
|
"_CMPing": 101,
|
||||||
@ -142,6 +144,7 @@ var (
|
|||||||
"_CMGuildMembersList": 135,
|
"_CMGuildMembersList": 135,
|
||||||
"_CMSetName": 136,
|
"_CMSetName": 136,
|
||||||
"_CMSetAvatar": 137,
|
"_CMSetAvatar": 137,
|
||||||
|
"_CMSetJoinCond": 138,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -219,6 +222,7 @@ const (
|
|||||||
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__SMUpdateChatRedPointNotify SMMessageIdE = 200
|
SMMessageIdE__SMUpdateChatRedPointNotify SMMessageIdE = 200
|
||||||
SMMessageIdE__SMChatMsgNotify SMMessageIdE = 201
|
SMMessageIdE__SMChatMsgNotify SMMessageIdE = 201
|
||||||
@ -263,6 +267,7 @@ var (
|
|||||||
135: "_SMGuildMembersList",
|
135: "_SMGuildMembersList",
|
||||||
136: "_SMSetName",
|
136: "_SMSetName",
|
||||||
137: "_SMSetAvatar",
|
137: "_SMSetAvatar",
|
||||||
|
138: "_SMSetJoinCond",
|
||||||
200: "_SMUpdateChatRedPointNotify",
|
200: "_SMUpdateChatRedPointNotify",
|
||||||
201: "_SMChatMsgNotify",
|
201: "_SMChatMsgNotify",
|
||||||
202: "_SMUpdateRedPointNotify",
|
202: "_SMUpdateRedPointNotify",
|
||||||
@ -303,6 +308,7 @@ var (
|
|||||||
"_SMGuildMembersList": 135,
|
"_SMGuildMembersList": 135,
|
||||||
"_SMSetName": 136,
|
"_SMSetName": 136,
|
||||||
"_SMSetAvatar": 137,
|
"_SMSetAvatar": 137,
|
||||||
|
"_SMSetJoinCond": 138,
|
||||||
"_SMUpdateChatRedPointNotify": 200,
|
"_SMUpdateChatRedPointNotify": 200,
|
||||||
"_SMChatMsgNotify": 201,
|
"_SMChatMsgNotify": 201,
|
||||||
"_SMUpdateRedPointNotify": 202,
|
"_SMUpdateRedPointNotify": 202,
|
||||||
@ -352,7 +358,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, 0xa1, 0x06, 0x0a, 0x0d, 0x43, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61,
|
0x12, 0x02, 0x63, 0x73, 0x2a, 0xb6, 0x06, 0x0a, 0x0d, 0x43, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61,
|
||||||
0x67, 0x65, 0x49, 0x64, 0x5f, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x5f, 0x43, 0x4d, 0x50, 0x69, 0x6e,
|
0x67, 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,
|
||||||
@ -402,62 +408,64 @@ var file_cs_msgid_proto_rawDesc = []byte{
|
|||||||
0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x4c, 0x69, 0x73,
|
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,
|
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, 0x2a, 0xe1, 0x06, 0x0a, 0x0d, 0x53, 0x4d, 0x4d,
|
0x76, 0x61, 0x74, 0x61, 0x72, 0x10, 0x89, 0x01, 0x12, 0x13, 0x0a, 0x0e, 0x5f, 0x43, 0x4d, 0x53,
|
||||||
0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x64, 0x5f, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x5f, 0x53,
|
0x65, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x10, 0x8a, 0x01, 0x2a, 0xf6, 0x06,
|
||||||
0x4d, 0x50, 0x69, 0x6e, 0x67, 0x10, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x5f, 0x53, 0x4d, 0x52, 0x70,
|
0x0a, 0x0d, 0x53, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x64, 0x5f, 0x65, 0x12,
|
||||||
0x63, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x66, 0x12, 0x0c, 0x0a, 0x08, 0x5f, 0x53, 0x4d, 0x4c,
|
0x0b, 0x0a, 0x07, 0x5f, 0x53, 0x4d, 0x50, 0x69, 0x6e, 0x67, 0x10, 0x65, 0x12, 0x0f, 0x0a, 0x0b,
|
||||||
0x6f, 0x67, 0x69, 0x6e, 0x10, 0x67, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x63,
|
0x5f, 0x53, 0x4d, 0x52, 0x70, 0x63, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x66, 0x12, 0x0c, 0x0a,
|
||||||
0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x10, 0x68, 0x12, 0x1c, 0x0a, 0x18, 0x5f, 0x53, 0x4d, 0x53,
|
0x08, 0x5f, 0x53, 0x4d, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x10, 0x67, 0x12, 0x10, 0x0a, 0x0c, 0x5f,
|
||||||
0x65, 0x61, 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, 0x42, 0x79, 0x41, 0x63, 0x63, 0x6f, 0x75,
|
0x53, 0x4d, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x10, 0x68, 0x12, 0x1c, 0x0a,
|
||||||
0x6e, 0x74, 0x49, 0x64, 0x10, 0x69, 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x61,
|
0x18, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, 0x42, 0x79,
|
||||||
0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, 0x10, 0x6a, 0x12, 0x17, 0x0a, 0x13, 0x5f, 0x53, 0x4d,
|
0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x10, 0x69, 0x12, 0x11, 0x0a, 0x0d, 0x5f,
|
||||||
0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
|
0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, 0x10, 0x6a, 0x12, 0x17,
|
||||||
0x10, 0x6b, 0x12, 0x1a, 0x0a, 0x16, 0x5f, 0x53, 0x4d, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x46,
|
0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65,
|
||||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6c, 0x12, 0x1a,
|
0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6b, 0x12, 0x1a, 0x0a, 0x16, 0x5f, 0x53, 0x4d, 0x41, 0x63,
|
||||||
0x0a, 0x16, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e,
|
0x63, 0x65, 0x70, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
|
||||||
0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6d, 0x12, 0x1f, 0x0a, 0x1b, 0x5f, 0x53,
|
0x74, 0x10, 0x6c, 0x12, 0x1a, 0x0a, 0x16, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74,
|
||||||
0x4d, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x46, 0x72, 0x69, 0x65,
|
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6d, 0x12,
|
||||||
0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6e, 0x12, 0x11, 0x0a, 0x0d, 0x5f,
|
0x1f, 0x0a, 0x1b, 0x5f, 0x53, 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e,
|
||||||
0x53, 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x10, 0x6f, 0x12, 0x17,
|
0x67, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6e,
|
||||||
0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e,
|
0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e,
|
||||||
0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x70, 0x12, 0x13, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x41, 0x64,
|
0x64, 0x10, 0x6f, 0x12, 0x17, 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
|
||||||
0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, 0x71, 0x12, 0x16, 0x0a, 0x12,
|
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x70, 0x12, 0x13, 0x0a, 0x0f,
|
||||||
0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, 0x69,
|
0x5f, 0x53, 0x4d, 0x41, 0x64, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10,
|
||||||
0x73, 0x74, 0x10, 0x72, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x42, 0x6c, 0x61, 0x63, 0x6b,
|
0x71, 0x12, 0x16, 0x0a, 0x12, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x42, 0x6c,
|
||||||
0x6c, 0x69, 0x73, 0x74, 0x10, 0x74, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69,
|
0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, 0x72, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x53, 0x4d,
|
||||||
0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0x78, 0x12, 0x12, 0x0a, 0x0e, 0x5f, 0x53, 0x4d, 0x43,
|
0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, 0x74, 0x12, 0x10, 0x0a, 0x0c, 0x5f,
|
||||||
0x72, 0x65, 0x61, 0x74, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, 0x79, 0x12, 0x13, 0x0a, 0x0f,
|
0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0x78, 0x12, 0x12, 0x0a,
|
||||||
0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x54, 0x6f, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10,
|
0x0e, 0x5f, 0x53, 0x4d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10,
|
||||||
0x7a, 0x12, 0x0e, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x10,
|
0x79, 0x12, 0x13, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x54, 0x6f, 0x47,
|
||||||
0x7b, 0x12, 0x0d, 0x0a, 0x09, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x10, 0x7c,
|
0x75, 0x69, 0x6c, 0x64, 0x10, 0x7a, 0x12, 0x0e, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70,
|
||||||
0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x47, 0x75, 0x69, 0x6c,
|
0x72, 0x6f, 0x76, 0x65, 0x10, 0x7b, 0x12, 0x0d, 0x0a, 0x09, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6a,
|
||||||
0x64, 0x10, 0x7d, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73,
|
0x65, 0x63, 0x74, 0x10, 0x7c, 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x4c, 0x65, 0x61, 0x76,
|
||||||
0x73, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7e, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x53, 0x4d,
|
0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, 0x7d, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x44,
|
||||||
0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7f, 0x12,
|
0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7e, 0x12, 0x14,
|
||||||
0x14, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x44, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62,
|
0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62,
|
||||||
0x65, 0x72, 0x10, 0x80, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x44, 0x69, 0x73, 0x62,
|
0x65, 0x72, 0x10, 0x7f, 0x12, 0x14, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x44, 0x65, 0x6d, 0x6f, 0x74,
|
||||||
0x61, 0x6e, 0x64, 0x10, 0x81, 0x01, 0x12, 0x14, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x61,
|
0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x80, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x53,
|
||||||
0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x10, 0x82, 0x01, 0x12, 0x11, 0x0a, 0x0c,
|
0x4d, 0x44, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x64, 0x10, 0x81, 0x01, 0x12, 0x14, 0x0a, 0x0f, 0x5f,
|
||||||
0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x83, 0x01, 0x12,
|
0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x10, 0x82,
|
||||||
0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x73, 0x10,
|
0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73,
|
||||||
0x84, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x69,
|
0x74, 0x10, 0x83, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64,
|
||||||
0x63, 0x65, 0x10, 0x85, 0x01, 0x12, 0x16, 0x0a, 0x11, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4d,
|
0x4c, 0x6f, 0x67, 0x73, 0x10, 0x84, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x53, 0x65,
|
||||||
0x65, 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x10, 0x86, 0x01, 0x12, 0x18, 0x0a,
|
0x74, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x10, 0x85, 0x01, 0x12, 0x16, 0x0a, 0x11, 0x5f, 0x53,
|
||||||
0x13, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73,
|
0x4d, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x10,
|
||||||
0x4c, 0x69, 0x73, 0x74, 0x10, 0x87, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x53, 0x65,
|
0x86, 0x01, 0x12, 0x18, 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4d, 0x65,
|
||||||
0x74, 0x4e, 0x61, 0x6d, 0x65, 0x10, 0x88, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x53,
|
0x6d, 0x62, 0x65, 0x72, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x87, 0x01, 0x12, 0x0f, 0x0a, 0x0a,
|
||||||
0x65, 0x74, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x10, 0x89, 0x01, 0x12, 0x20, 0x0a, 0x1b, 0x5f,
|
0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x10, 0x88, 0x01, 0x12, 0x11, 0x0a,
|
||||||
0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x64, 0x50,
|
0x0c, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x10, 0x89, 0x01,
|
||||||
0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xc8, 0x01, 0x12, 0x15, 0x0a,
|
0x12, 0x13, 0x0a, 0x0e, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x43, 0x6f,
|
||||||
0x10, 0x5f, 0x53, 0x4d, 0x43, 0x68, 0x61, 0x74, 0x4d, 0x73, 0x67, 0x4e, 0x6f, 0x74, 0x69, 0x66,
|
0x6e, 0x64, 0x10, 0x8a, 0x01, 0x12, 0x20, 0x0a, 0x1b, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61,
|
||||||
0x79, 0x10, 0xc9, 0x01, 0x12, 0x1c, 0x0a, 0x17, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74,
|
0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f,
|
||||||
0x65, 0x52, 0x65, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10,
|
0x74, 0x69, 0x66, 0x79, 0x10, 0xc8, 0x01, 0x12, 0x15, 0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x43, 0x68,
|
||||||
0xca, 0x01, 0x12, 0x27, 0x0a, 0x22, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50,
|
0x61, 0x74, 0x4d, 0x73, 0x67, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xc9, 0x01, 0x12, 0x1c,
|
||||||
0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x64, 0x50, 0x6f, 0x69,
|
0x0a, 0x17, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x64, 0x50, 0x6f,
|
||||||
0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xcb, 0x01, 0x12, 0x1f, 0x0a, 0x1a, 0x5f,
|
0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xca, 0x01, 0x12, 0x27, 0x0a, 0x22,
|
||||||
0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6e,
|
0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65,
|
||||||
0x6e, 0x65, 0x6c, 0x4c, 0x61, 0x73, 0x74, 0x49, 0x64, 0x10, 0xcc, 0x01, 0x42, 0x06, 0x5a, 0x04,
|
0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69,
|
||||||
0x2e, 0x3b, 0x63, 0x73,
|
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 (
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -838,6 +838,27 @@ func (gm *GuildMgr) SetNotice(operatorAccountId string, notice *string, cb func(
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetJoinCond 请求设置公会加入条件
|
||||||
|
func (gm *GuildMgr) SetJoinCond(operatorAccountId string, joinCond, joinCondValue int32, cb func(errCode int32, errMsg string)) {
|
||||||
|
guild, ok := gm.CheckGuildAndPermission(operatorAccountId)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
updateFields := [][]string{
|
||||||
|
{"join_cond", q5.ToString(joinCond)},
|
||||||
|
{"join_cond_value", q5.ToString(joinCondValue)},
|
||||||
|
}
|
||||||
|
gm.updateGuild(guild, updateFields, func(err error) {
|
||||||
|
if err != nil {
|
||||||
|
cb(ERR_CODE_UPDATE_GUILD_DB_FAIL, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
guild.JoinCond = joinCond
|
||||||
|
guild.JoinCondValue = joinCondValue
|
||||||
|
cb(ERR_CODE_OK, "SetJoinCond OK")
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// WriteLog 记录公会日志
|
// WriteLog 记录公会日志
|
||||||
func (gm *GuildMgr) WriteLog(guildId int64, accountId string, logType int32, content string) {
|
func (gm *GuildMgr) WriteLog(guildId int64, accountId string, logType int32, content string) {
|
||||||
guild := gm.GetGuild(guildId)
|
guild := gm.GetGuild(guildId)
|
||||||
|
|||||||
@ -343,19 +343,24 @@ func (p *Player) CMGuildInfo(hdr *f5.MsgHdr, msg *cs.CMGuildInfo) {
|
|||||||
guild := guildMgr.GetGuildByAccountId(p.accountId)
|
guild := guildMgr.GetGuildByAccountId(p.accountId)
|
||||||
if guild == nil {
|
if guild == nil {
|
||||||
rspMsg.Guild = nil
|
rspMsg.Guild = nil
|
||||||
rspMsg.RandomGuilds = p.FillGuild(guildMgr.RandomGuilds())
|
rspMsg.RandomGuilds = p.FillGuilds(guildMgr.RandomGuilds())
|
||||||
wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg)
|
wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
membersCount := q5.ToInt32(guild.GetMembersCount())
|
|
||||||
rspGuild := &cs.MFGuild{
|
rspGuild := &cs.MFGuild{
|
||||||
AutoId: &guild.AutoId,
|
AutoId: &guild.AutoId,
|
||||||
GuildId: &guild.GuildId,
|
GuildId: &guild.GuildId,
|
||||||
Name: &guild.Name,
|
Name: &guild.Name,
|
||||||
LeaderId: &guild.LeaderId,
|
LeaderId: &guild.LeaderId,
|
||||||
MembersCount: &membersCount,
|
Avatar: &guild.Avatar,
|
||||||
MembersMax: &guild.MembersMax,
|
|
||||||
Notice: &guild.Notice,
|
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.Guild = rspGuild
|
||||||
rspMsg.RandomGuilds = nil
|
rspMsg.RandomGuilds = nil
|
||||||
@ -372,23 +377,7 @@ func (p *Player) CMCreateGuild(hdr *f5.MsgHdr, msg *cs.CMCreateGuild) {
|
|||||||
rspMsg.Errcode = &errCode
|
rspMsg.Errcode = &errCode
|
||||||
rspMsg.Errmsg = &errMsg
|
rspMsg.Errmsg = &errMsg
|
||||||
} else {
|
} else {
|
||||||
memberCount := q5.ToInt32(guild.GetMembersCount())
|
rspMsg.Guild = p.FillMFGuild(guild)
|
||||||
rspGuild := &cs.MFGuild{
|
|
||||||
AutoId: &guild.AutoId,
|
|
||||||
GuildId: &guild.GuildId,
|
|
||||||
Name: &guild.Name,
|
|
||||||
LeaderId: &guild.LeaderId,
|
|
||||||
Avatar: &guild.Avatar,
|
|
||||||
Notice: &guild.Notice,
|
|
||||||
JoinCond: &guild.JoinCond,
|
|
||||||
JoinCondValue: &guild.JoinCondValue,
|
|
||||||
TotalStars: &guild.TotalStars,
|
|
||||||
TotalKills: &guild.TotalKills,
|
|
||||||
ChickenDinners: &guild.ChickenDinners,
|
|
||||||
MembersCount: &memberCount,
|
|
||||||
MembersMax: &guild.MembersMax,
|
|
||||||
}
|
|
||||||
rspMsg.Guild = rspGuild
|
|
||||||
}
|
}
|
||||||
wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg)
|
wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg)
|
||||||
})
|
})
|
||||||
@ -422,8 +411,10 @@ func (p *Player) CMApplyList(hdr *f5.MsgHdr, msg *cs.CMApplyList) {
|
|||||||
if profile == nil {
|
if profile == nil {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
user := &cs.MFGuildApplyUser{
|
defaultLevel := q5.ToInt32(GuildMemberLevelDefault)
|
||||||
|
member := &cs.MFGuildMember{
|
||||||
AccountId: &profile.AccountId,
|
AccountId: &profile.AccountId,
|
||||||
|
Level: &defaultLevel,
|
||||||
Username: &profile.Username,
|
Username: &profile.Username,
|
||||||
Avatar: &profile.Avatar,
|
Avatar: &profile.Avatar,
|
||||||
AvatarHead: &profile.AvatarHead,
|
AvatarHead: &profile.AvatarHead,
|
||||||
@ -431,7 +422,7 @@ func (p *Player) CMApplyList(hdr *f5.MsgHdr, msg *cs.CMApplyList) {
|
|||||||
OnlineStatus: &profile.OnlineStatus,
|
OnlineStatus: &profile.OnlineStatus,
|
||||||
LastLoginTime: &profile.LastLoginTime,
|
LastLoginTime: &profile.LastLoginTime,
|
||||||
}
|
}
|
||||||
rspMsg.Users = append(rspMsg.Users, user)
|
rspMsg.Members = append(rspMsg.Members, member)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg)
|
wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg)
|
||||||
@ -603,13 +594,50 @@ func (p *Player) CMSetName(hdr *f5.MsgHdr, msg *cs.CMSetName) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CMSetJoinCond 设置公会加入条件
|
||||||
|
func (p *Player) CMSetJoinCond(hdr *f5.MsgHdr, msg *cs.CMSetJoinCond) {
|
||||||
|
guildMgr.SetJoinCond(
|
||||||
|
p.accountId,
|
||||||
|
msg.GetJoinCond(),
|
||||||
|
msg.GetJoinCondValue(),
|
||||||
|
func(errCode int32, errMsg string) {
|
||||||
|
rspMsg := new(cs.SMSetJoinCond)
|
||||||
|
if errCode != 0 {
|
||||||
|
rspMsg.Errcode = &errCode
|
||||||
|
rspMsg.Errmsg = &errMsg
|
||||||
|
}
|
||||||
|
wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// CMGuildMembersList 公会成员列表
|
||||||
|
func (p *Player) CMGuildMembersList(hdr *f5.MsgHdr, msg *cs.CMGuildMembersList) {
|
||||||
|
rspMsg := new(cs.SMGuildMembersList)
|
||||||
|
|
||||||
|
guild := guildMgr.GetGuildByAccountId(p.accountId)
|
||||||
|
if guild == nil {
|
||||||
|
errCode := q5.ToInt32(ERR_CODE_CREATE_GUILD_DB_FAIL)
|
||||||
|
errMsg := "No guild"
|
||||||
|
rspMsg.Errcode = &errCode
|
||||||
|
rspMsg.Errmsg = &errMsg
|
||||||
|
} else {
|
||||||
|
for _, member := range guild.Members {
|
||||||
|
guildMember := p.FillMFGuildMember(member)
|
||||||
|
if guildMember != nil {
|
||||||
|
rspMsg.Members = append(rspMsg.Members, guildMember)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg)
|
||||||
|
}
|
||||||
|
|
||||||
// CMSearchGuilds 搜索公会
|
// CMSearchGuilds 搜索公会
|
||||||
func (p *Player) CMSearchGuilds(hdr *f5.MsgHdr, msg *cs.CMSearchGuilds) {
|
func (p *Player) CMSearchGuilds(hdr *f5.MsgHdr, msg *cs.CMSearchGuilds) {
|
||||||
sinceId := msg.GetSinceId()
|
sinceId := msg.GetSinceId()
|
||||||
name := msg.GetName()
|
name := msg.GetName()
|
||||||
|
|
||||||
rspMsg := new(cs.SMSearchGuilds)
|
rspMsg := new(cs.SMSearchGuilds)
|
||||||
rspMsg.Guilds = p.FillGuild(guildMgr.SearchGuilds(sinceId, name))
|
rspMsg.Guilds = p.FillGuilds(guildMgr.SearchGuilds(sinceId, name))
|
||||||
f5.GetSysLog().Info("CMSearchGuilds name[%s], result:%d \n", msg.GetName(), len(rspMsg.Guilds))
|
f5.GetSysLog().Info("CMSearchGuilds name[%s], result:%d \n", msg.GetName(), len(rspMsg.Guilds))
|
||||||
wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg)
|
wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg)
|
||||||
}
|
}
|
||||||
@ -634,21 +662,59 @@ func (p *Player) CMGuildLogs(hdr *f5.MsgHdr, msg *cs.CMGuildLogs) {
|
|||||||
wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg)
|
wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg)
|
||||||
}
|
}
|
||||||
|
|
||||||
// FillGuild 填充公共列表
|
func (p *Player) FillMFGuildMember(member *GuildMember) *cs.MFGuildMember {
|
||||||
func (p *Player) FillGuild(guilds []*Guild) []*cs.MFGuild {
|
profile := cacheMgr.GetPlayerProfile(member.AccountId)
|
||||||
|
if profile == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
guildMember := &cs.MFGuildMember{
|
||||||
|
AccountId: &member.AccountId,
|
||||||
|
Level: &member.Level,
|
||||||
|
Username: &profile.Username,
|
||||||
|
Avatar: &profile.Avatar,
|
||||||
|
AvatarHead: &profile.AvatarHead,
|
||||||
|
Rank: &profile.Rank,
|
||||||
|
OnlineStatus: &profile.OnlineStatus,
|
||||||
|
LastLoginTime: &profile.LastLoginTime,
|
||||||
|
}
|
||||||
|
return guildMember
|
||||||
|
}
|
||||||
|
|
||||||
|
// FillMFGuild 填充公会
|
||||||
|
func (p *Player) FillMFGuild(guild *Guild) *cs.MFGuild {
|
||||||
|
var guildMembers []*cs.MFGuildMember
|
||||||
|
for _, member := range guild.Members {
|
||||||
|
guildMember := p.FillMFGuildMember(member)
|
||||||
|
if guildMember == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
guildMembers = append(guildMembers, guildMember)
|
||||||
|
}
|
||||||
|
|
||||||
|
var resGuild *cs.MFGuild
|
||||||
|
resGuild = &cs.MFGuild{
|
||||||
|
AutoId: &guild.AutoId,
|
||||||
|
GuildId: &guild.GuildId,
|
||||||
|
Name: &guild.Name,
|
||||||
|
LeaderId: &guild.LeaderId,
|
||||||
|
Avatar: &guild.Avatar,
|
||||||
|
Notice: &guild.Notice,
|
||||||
|
JoinCond: &guild.JoinCond,
|
||||||
|
JoinCondValue: &guild.JoinCondValue,
|
||||||
|
TotalStars: &guild.TotalStars,
|
||||||
|
TotalKills: &guild.TotalKills,
|
||||||
|
ChickenDinners: &guild.ChickenDinners,
|
||||||
|
MaxMembers: &guild.MembersMax,
|
||||||
|
Members: guildMembers,
|
||||||
|
}
|
||||||
|
return resGuild
|
||||||
|
}
|
||||||
|
|
||||||
|
// FillGuilds 填充公会列表
|
||||||
|
func (p *Player) FillGuilds(guilds []*Guild) []*cs.MFGuild {
|
||||||
var resGuilds []*cs.MFGuild
|
var resGuilds []*cs.MFGuild
|
||||||
for _, g := range guilds {
|
for _, g := range guilds {
|
||||||
membersCount := q5.ToInt32(len(g.Members))
|
guild := p.FillMFGuild(g)
|
||||||
membersMax := q5.ToInt32(g.MembersMax)
|
|
||||||
guild := &cs.MFGuild{
|
|
||||||
AutoId: &g.AutoId,
|
|
||||||
GuildId: &g.GuildId,
|
|
||||||
Name: &g.Name,
|
|
||||||
LeaderId: &g.LeaderId,
|
|
||||||
MembersCount: &membersCount,
|
|
||||||
MembersMax: &membersMax,
|
|
||||||
Notice: &g.Notice,
|
|
||||||
}
|
|
||||||
resGuilds = append(resGuilds, guild)
|
resGuilds = append(resGuilds, guild)
|
||||||
}
|
}
|
||||||
return resGuilds
|
return resGuilds
|
||||||
|
|||||||
@ -48,6 +48,7 @@ enum CMMessageId_e
|
|||||||
_CMGuildMembersList = 135;
|
_CMGuildMembersList = 135;
|
||||||
_CMSetName = 136;
|
_CMSetName = 136;
|
||||||
_CMSetAvatar = 137;
|
_CMSetAvatar = 137;
|
||||||
|
_CMSetJoinCond = 138;
|
||||||
}
|
}
|
||||||
|
|
||||||
enum SMMessageId_e
|
enum SMMessageId_e
|
||||||
@ -88,6 +89,7 @@ enum SMMessageId_e
|
|||||||
_SMGuildMembersList = 135;
|
_SMGuildMembersList = 135;
|
||||||
_SMSetName = 136;
|
_SMSetName = 136;
|
||||||
_SMSetAvatar = 137;
|
_SMSetAvatar = 137;
|
||||||
|
_SMSetJoinCond = 138;
|
||||||
|
|
||||||
// 聊天相关
|
// 聊天相关
|
||||||
_SMUpdateChatRedPointNotify = 200;
|
_SMUpdateChatRedPointNotify = 200;
|
||||||
|
|||||||
@ -384,7 +384,6 @@ message SMCreateGuild
|
|||||||
{
|
{
|
||||||
optional int32 errcode = 1;
|
optional int32 errcode = 1;
|
||||||
optional string errmsg = 2;
|
optional string errmsg = 2;
|
||||||
// optional int64 guild_id = 3;
|
|
||||||
optional MFGuild guild = 3;
|
optional MFGuild guild = 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -409,17 +408,7 @@ message SMApplyList
|
|||||||
{
|
{
|
||||||
optional string errcode = 1;
|
optional string errcode = 1;
|
||||||
optional string errmsg = 2;
|
optional string errmsg = 2;
|
||||||
repeated MFGuildApplyUser users = 3;
|
repeated MFGuildMember members = 3;
|
||||||
}
|
|
||||||
|
|
||||||
message MFGuildApplyUser {
|
|
||||||
optional string account_id = 1;
|
|
||||||
optional string username = 2;
|
|
||||||
optional int32 avatar = 3;
|
|
||||||
optional int32 avatar_head = 4;
|
|
||||||
optional int32 rank = 5;
|
|
||||||
optional int32 online_status = 6;
|
|
||||||
optional int32 last_login_time = 7;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 请求批准申请加入公会
|
// 请求批准申请加入公会
|
||||||
@ -522,7 +511,7 @@ message SMGuildMembersList
|
|||||||
{
|
{
|
||||||
optional int32 errcode = 1;
|
optional int32 errcode = 1;
|
||||||
optional string errmsg = 2;
|
optional string errmsg = 2;
|
||||||
repeated MFUser users = 3;
|
repeated MFGuildMember members = 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 请求解散公会
|
// 请求解散公会
|
||||||
@ -554,22 +543,6 @@ message SMSearchGuilds
|
|||||||
repeated MFGuild guilds = 4;
|
repeated MFGuild guilds = 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
message MFGuild {
|
|
||||||
optional int64 auto_id = 1;
|
|
||||||
optional int64 guild_id = 2;
|
|
||||||
optional string name = 3;
|
|
||||||
optional string leader_id = 4;
|
|
||||||
optional int32 avatar = 5;
|
|
||||||
optional string notice = 6;
|
|
||||||
optional int32 join_cond = 7; // 公会加入条件 default:0, free:1 , 2 ,star: 3
|
|
||||||
optional int32 join_cond_value = 8; // star value
|
|
||||||
optional int32 total_stars = 9; // 公会统计信息, 总星星数量
|
|
||||||
optional int32 total_kills = 10; // 公会统计信息, 单局总击杀数
|
|
||||||
optional int32 chicken_dinners = 11; // 公会统计信息, 单局第一名数
|
|
||||||
optional int32 members_count = 12; // 成员数
|
|
||||||
optional int32 members_max = 13; // 成员上限
|
|
||||||
}
|
|
||||||
|
|
||||||
// 请求公会日志
|
// 请求公会日志
|
||||||
message CMGuildLogs{}
|
message CMGuildLogs{}
|
||||||
|
|
||||||
@ -626,3 +599,45 @@ message SMSetNotice
|
|||||||
optional int32 errcode = 1;
|
optional int32 errcode = 1;
|
||||||
optional string errmsg = 2;
|
optional string errmsg = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 请求设置公会加入条件
|
||||||
|
message CMSetJoinCond
|
||||||
|
{
|
||||||
|
optional int32 join_cond = 1; // default: 0, free:1, star: 2
|
||||||
|
optional int32 join_cond_value = 2; // only cond star, value:
|
||||||
|
}
|
||||||
|
|
||||||
|
// 回复设置公会加入条件
|
||||||
|
message SMSetJoinCond
|
||||||
|
{
|
||||||
|
optional int32 errcode = 1;
|
||||||
|
optional string errmsg = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message MFGuild {
|
||||||
|
optional int64 auto_id = 1;
|
||||||
|
optional int64 guild_id = 2;
|
||||||
|
optional string name = 3;
|
||||||
|
optional string leader_id = 4;
|
||||||
|
optional int32 avatar = 5;
|
||||||
|
optional string notice = 6;
|
||||||
|
optional int32 join_cond = 7; // 公会加入条件 default:0, free:1, star: 2
|
||||||
|
optional int32 join_cond_value = 8; // star value
|
||||||
|
optional int32 total_stars = 9; // 公会统计信息, 总星星数量
|
||||||
|
optional int32 total_kills = 10; // 公会统计信息, 单局总击杀数
|
||||||
|
optional int32 chicken_dinners = 11; // 公会统计信息, 单局第一名数
|
||||||
|
optional int32 max_members = 13; // 成员上限
|
||||||
|
repeated MFGuildMember members = 14;
|
||||||
|
}
|
||||||
|
|
||||||
|
message MFGuildMember {
|
||||||
|
optional string account_id = 1;
|
||||||
|
optional string username = 2;
|
||||||
|
optional int32 avatar = 3;
|
||||||
|
optional int32 avatar_head = 4;
|
||||||
|
optional int32 rank = 7;
|
||||||
|
optional int32 online_status = 8;
|
||||||
|
optional int32 last_login_time = 9;
|
||||||
|
optional int32 level = 10;
|
||||||
|
optional int32 star = 11;
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user