shkong/MiraiGo
1
0
Fork 0
mirror of https://github.com/Mrs4s/MiraiGo.git synced 2025-07-12 00:23:48 +00:00
Code Issues Projects Releases Wiki Activity

feature NewSysFace.

Browse Source
This commit is contained in:
Mrs4s
2020-11-17 23:41:21 +08:00
parent 0a7e4ea557
commit 9891871259
5 changed files with 208 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

197
client/pb/msg/msg.pb.go
View File

@ -6073,6 +6073,77 @@ func (x *MsgElemInfoServtype3) GetFlashC2CPic() *NotOnlineImage {
return nil
}
type MsgElemInfoServtype33 struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Index uint32 `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty"`
Text []byte `protobuf:"bytes,2,opt,name=text,proto3" json:"text,omitempty"`
Compat []byte `protobuf:"bytes,3,opt,name=compat,proto3" json:"compat,omitempty"`
Buf []byte `protobuf:"bytes,4,opt,name=buf,proto3" json:"buf,omitempty"`
}
func (x *MsgElemInfoServtype33) Reset() {
*x = MsgElemInfoServtype33{}
if protoimpl.UnsafeEnabled {
mi := &file_msg_proto_msgTypes[57]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *MsgElemInfoServtype33) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*MsgElemInfoServtype33) ProtoMessage() {}
func (x *MsgElemInfoServtype33) ProtoReflect() protoreflect.Message {
mi := &file_msg_proto_msgTypes[57]
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 MsgElemInfoServtype33.ProtoReflect.Descriptor instead.
func (*MsgElemInfoServtype33) Descriptor() ([]byte, []int) {
return file_msg_proto_rawDescGZIP(), []int{57}
}
func (x *MsgElemInfoServtype33) GetIndex() uint32 {
if x != nil {
return x.Index
}
return 0
}
func (x *MsgElemInfoServtype33) GetText() []byte {
if x != nil {
return x.Text
}
return nil
}
func (x *MsgElemInfoServtype33) GetCompat() []byte {
if x != nil {
return x.Compat
}
return nil
}
func (x *MsgElemInfoServtype33) GetBuf() []byte {
if x != nil {
return x.Buf
}
return nil
}
type SubMsgType0X4Body struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -6086,7 +6157,7 @@ type SubMsgType0X4Body struct {
func (x *SubMsgType0X4Body) Reset() {
*x = SubMsgType0X4Body{}
if protoimpl.UnsafeEnabled {
mi := &file_msg_proto_msgTypes[57]
mi := &file_msg_proto_msgTypes[58]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -6099,7 +6170,7 @@ func (x *SubMsgType0X4Body) String() string {
func (*SubMsgType0X4Body) ProtoMessage() {}
func (x *SubMsgType0X4Body) ProtoReflect() protoreflect.Message {
mi := &file_msg_proto_msgTypes[57]
mi := &file_msg_proto_msgTypes[58]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -6112,7 +6183,7 @@ func (x *SubMsgType0X4Body) ProtoReflect() protoreflect.Message {
// Deprecated: Use SubMsgType0X4Body.ProtoReflect.Descriptor instead.
func (*SubMsgType0X4Body) Descriptor() ([]byte, []int) {
return file_msg_proto_rawDescGZIP(), []int{57}
return file_msg_proto_rawDescGZIP(), []int{58}
}
func (x *SubMsgType0X4Body) GetNotOnlineFile() *NotOnlineFile {
@ -6147,7 +6218,7 @@ type ResvAttr struct {
func (x *ResvAttr) Reset() {
*x = ResvAttr{}
if protoimpl.UnsafeEnabled {
mi := &file_msg_proto_msgTypes[58]
mi := &file_msg_proto_msgTypes[59]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -6160,7 +6231,7 @@ func (x *ResvAttr) String() string {
func (*ResvAttr) ProtoMessage() {}
func (x *ResvAttr) ProtoReflect() protoreflect.Message {
mi := &file_msg_proto_msgTypes[58]
mi := &file_msg_proto_msgTypes[59]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -6173,7 +6244,7 @@ func (x *ResvAttr) ProtoReflect() protoreflect.Message {
// Deprecated: Use ResvAttr.ProtoReflect.Descriptor instead.
func (*ResvAttr) Descriptor() ([]byte, []int) {
return file_msg_proto_rawDescGZIP(), []int{58}
return file_msg_proto_rawDescGZIP(), []int{59}
}
func (x *ResvAttr) GetImageShow() *AnimationImageShow {
@ -6195,7 +6266,7 @@ type AnimationImageShow struct {
func (x *AnimationImageShow) Reset() {
*x = AnimationImageShow{}
if protoimpl.UnsafeEnabled {
mi := &file_msg_proto_msgTypes[59]
mi := &file_msg_proto_msgTypes[60]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -6208,7 +6279,7 @@ func (x *AnimationImageShow) String() string {
func (*AnimationImageShow) ProtoMessage() {}
func (x *AnimationImageShow) ProtoReflect() protoreflect.Message {
mi := &file_msg_proto_msgTypes[59]
mi := &file_msg_proto_msgTypes[60]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -6221,7 +6292,7 @@ func (x *AnimationImageShow) ProtoReflect() protoreflect.Message {
// Deprecated: Use AnimationImageShow.ProtoReflect.Descriptor instead.
func (*AnimationImageShow) Descriptor() ([]byte, []int) {
return file_msg_proto_rawDescGZIP(), []int{59}
return file_msg_proto_rawDescGZIP(), []int{60}
}
func (x *AnimationImageShow) GetEffectId() int32 {
@ -6251,7 +6322,7 @@ type UinTypeUserDef struct {
func (x *UinTypeUserDef) Reset() {
*x = UinTypeUserDef{}
if protoimpl.UnsafeEnabled {
mi := &file_msg_proto_msgTypes[60]
mi := &file_msg_proto_msgTypes[61]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -6264,7 +6335,7 @@ func (x *UinTypeUserDef) String() string {
func (*UinTypeUserDef) ProtoMessage() {}
func (x *UinTypeUserDef) ProtoReflect() protoreflect.Message {
mi := &file_msg_proto_msgTypes[60]
mi := &file_msg_proto_msgTypes[61]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -6277,7 +6348,7 @@ func (x *UinTypeUserDef) ProtoReflect() protoreflect.Message {
// Deprecated: Use UinTypeUserDef.ProtoReflect.Descriptor instead.
func (*UinTypeUserDef) Descriptor() ([]byte, []int) {
return file_msg_proto_rawDescGZIP(), []int{60}
return file_msg_proto_rawDescGZIP(), []int{61}
}
func (x *UinTypeUserDef) GetFromUinType() int32 {
@ -7261,38 +7332,45 @@ var file_msg_proto_rawDesc = []byte{
0x61, 0x73, 0x68, 0x5f, 0x63, 0x32, 0x63, 0x5f, 0x70, 0x69, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28,
0x0b, 0x32, 0x0f, 0x2e, 0x4e, 0x6f, 0x74, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x6d, 0x61,
0x67, 0x65, 0x52, 0x0b, 0x66, 0x6c, 0x61, 0x73, 0x68, 0x43, 0x32, 0x63, 0x50, 0x69, 0x63, 0x22,
0xa3, 0x01, 0x0a, 0x11, 0x53, 0x75, 0x62, 0x4d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x30, 0x78,
0x34, 0x42, 0x6f, 0x64, 0x79, 0x12, 0x34, 0x0a, 0x0d, 0x6e, 0x6f, 0x74, 0x4f, 0x6e, 0x6c, 0x69,
0x6e, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x4e,
0x6f, 0x74, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x0d, 0x6e, 0x6f,
0x74, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d,
0x73, 0x67, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x6d, 0x73,
0x67, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x3e, 0x0a, 0x1a, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x46,
0x6c, 0x0a, 0x16, 0x4d, 0x73, 0x67, 0x45, 0x6c, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x5f, 0x73,
0x65, 0x72, 0x76, 0x74, 0x79, 0x70, 0x65, 0x33, 0x33, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64,
0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12,
0x12, 0x0a, 0x04, 0x74, 0x65, 0x78, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x74,
0x65, 0x78, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x18, 0x03, 0x20,
0x01, 0x28, 0x0c, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x62,
0x75, 0x66, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x62, 0x75, 0x66, 0x22, 0xa3, 0x01,
0x0a, 0x11, 0x53, 0x75, 0x62, 0x4d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x30, 0x78, 0x34, 0x42,
0x6f, 0x64, 0x79, 0x12, 0x34, 0x0a, 0x0d, 0x6e, 0x6f, 0x74, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
0x46, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x4e, 0x6f, 0x74,
0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x0d, 0x6e, 0x6f, 0x74, 0x4f,
0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x73, 0x67,
0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x6d, 0x73, 0x67, 0x54,
0x69, 0x6d, 0x65, 0x12, 0x3e, 0x0a, 0x1a, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x46, 0x69, 0x6c,
0x65, 0x46, 0x6f, 0x72, 0x50, 0x6f, 0x6c, 0x79, 0x54, 0x6f, 0x4f, 0x66, 0x66, 0x6c, 0x69, 0x6e,
0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x1a, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x46,
0x69, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x50, 0x6f, 0x6c, 0x79, 0x54, 0x6f, 0x4f, 0x66, 0x66, 0x6c,
0x69, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x1a, 0x6f, 0x6e, 0x6c, 0x69, 0x6e,
0x65, 0x46, 0x69, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x50, 0x6f, 0x6c, 0x79, 0x54, 0x6f, 0x4f, 0x66,
0x66, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x76, 0x41, 0x74, 0x74,
0x72, 0x12, 0x32, 0x0a, 0x0a, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x68, 0x6f, 0x77, 0x18,
0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f,
0x6e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x53, 0x68, 0x6f, 0x77, 0x52, 0x09, 0x69, 0x6d, 0x61, 0x67,
0x65, 0x53, 0x68, 0x6f, 0x77, 0x22, 0x5a, 0x0a, 0x12, 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69,
0x6f, 0x6e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x53, 0x68, 0x6f, 0x77, 0x12, 0x1b, 0x0a, 0x09, 0x65,
0x66, 0x66, 0x65, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x49, 0x64, 0x12, 0x27, 0x0a, 0x0f, 0x61, 0x6e, 0x69, 0x6d,
0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28,
0x0c, 0x52, 0x0e, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x72, 0x61,
0x6d, 0x22, 0x74, 0x0a, 0x0e, 0x55, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x55, 0x73, 0x65, 0x72,
0x44, 0x65, 0x66, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x72, 0x6f, 0x6d, 0x55, 0x69, 0x6e, 0x54, 0x79,
0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x66, 0x72, 0x6f, 0x6d, 0x55, 0x69,
0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x66, 0x72, 0x6f, 0x6d, 0x47, 0x72, 0x6f,
0x75, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x66, 0x72,
0x6f, 0x6d, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x66,
0x69, 0x6c, 0x65, 0x55, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66,
0x69, 0x6c, 0x65, 0x55, 0x75, 0x69, 0x64, 0x2a, 0x2e, 0x0a, 0x08, 0x53, 0x79, 0x6e, 0x63, 0x46,
0x6c, 0x61, 0x67, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x54, 0x41, 0x52, 0x54, 0x10, 0x00, 0x12, 0x0d,
0x0a, 0x09, 0x43, 0x4f, 0x4e, 0x54, 0x49, 0x4e, 0x55, 0x4d, 0x45, 0x10, 0x01, 0x12, 0x08, 0x0a,
0x04, 0x53, 0x54, 0x4f, 0x50, 0x10, 0x02, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x3b, 0x6d, 0x73, 0x67,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x69, 0x6e, 0x65, 0x22, 0x3e, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x76, 0x41, 0x74, 0x74, 0x72, 0x12,
0x32, 0x0a, 0x0a, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x68, 0x6f, 0x77, 0x18, 0x07, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49,
0x6d, 0x61, 0x67, 0x65, 0x53, 0x68, 0x6f, 0x77, 0x52, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x53,
0x68, 0x6f, 0x77, 0x22, 0x5a, 0x0a, 0x12, 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
0x49, 0x6d, 0x61, 0x67, 0x65, 0x53, 0x68, 0x6f, 0x77, 0x12, 0x1b, 0x0a, 0x09, 0x65, 0x66, 0x66,
0x65, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x65, 0x66,
0x66, 0x65, 0x63, 0x74, 0x49, 0x64, 0x12, 0x27, 0x0a, 0x0f, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x74,
0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52,
0x0e, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x22,
0x74, 0x0a, 0x0e, 0x55, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65,
0x66, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x72, 0x6f, 0x6d, 0x55, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x66, 0x72, 0x6f, 0x6d, 0x55, 0x69, 0x6e, 0x54,
0x79, 0x70, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x66, 0x72, 0x6f, 0x6d, 0x47, 0x72, 0x6f, 0x75, 0x70,
0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x66, 0x72, 0x6f, 0x6d,
0x47, 0x72, 0x6f, 0x75, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x6c,
0x65, 0x55, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c,
0x65, 0x55, 0x75, 0x69, 0x64, 0x2a, 0x2e, 0x0a, 0x08, 0x53, 0x79, 0x6e, 0x63, 0x46, 0x6c, 0x61,
0x67, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x54, 0x41, 0x52, 0x54, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09,
0x43, 0x4f, 0x4e, 0x54, 0x49, 0x4e, 0x55, 0x4d, 0x45, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x53,
0x54, 0x4f, 0x50, 0x10, 0x02, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x3b, 0x6d, 0x73, 0x67, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -7308,7 +7386,7 @@ func file_msg_proto_rawDescGZIP() []byte {
}
var file_msg_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 61)
var file_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 62)
var file_msg_proto_goTypes = []interface{}{
(SyncFlag)(0), // 0: SyncFlag
(*GetMessageRequest)(nil), // 1: GetMessageRequest
@ -7368,10 +7446,11 @@ var file_msg_proto_goTypes = []interface{}{
(*PbMultiMsgNew)(nil), // 55: PbMultiMsgNew
(*PbMultiMsgTransmit)(nil), // 56: PbMultiMsgTransmit
(*MsgElemInfoServtype3)(nil), // 57: MsgElemInfo_servtype3
(*SubMsgType0X4Body)(nil), // 58: SubMsgType0x4Body
(*ResvAttr)(nil), // 59: ResvAttr
(*AnimationImageShow)(nil), // 60: AnimationImageShow
(*UinTypeUserDef)(nil), // 61: UinTypeUserDef
(*MsgElemInfoServtype33)(nil), // 58: MsgElemInfo_servtype33
(*SubMsgType0X4Body)(nil), // 59: SubMsgType0x4Body
(*ResvAttr)(nil), // 60: ResvAttr
(*AnimationImageShow)(nil), // 61: AnimationImageShow
(*UinTypeUserDef)(nil), // 62: UinTypeUserDef
}
var file_msg_proto_depIdxs = []int32{
0, // 0: GetMessageRequest.syncFlag:type_name -> SyncFlag
@ -7436,7 +7515,7 @@ var file_msg_proto_depIdxs = []int32{
41, // 59: MsgElemInfo_servtype3.flash_troop_pic:type_name -> CustomFace
31, // 60: MsgElemInfo_servtype3.flash_c2c_pic:type_name -> NotOnlineImage
32, // 61: SubMsgType0x4Body.notOnlineFile:type_name -> NotOnlineFile
60, // 62: ResvAttr.image_show:type_name -> AnimationImageShow
61, // 62: ResvAttr.image_show:type_name -> AnimationImageShow
63, // [63:63] is the sub-list for method output_type
63, // [63:63] is the sub-list for method input_type
63, // [63:63] is the sub-list for extension type_name
@ -8135,7 +8214,7 @@ func file_msg_proto_init() {
}
}
file_msg_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SubMsgType0X4Body); i {
switch v := v.(*MsgElemInfoServtype33); i {
case 0:
return &v.state
case 1:
@ -8147,7 +8226,7 @@ func file_msg_proto_init() {
}
}
file_msg_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ResvAttr); i {
switch v := v.(*SubMsgType0X4Body); i {
case 0:
return &v.state
case 1:
@ -8159,7 +8238,7 @@ func file_msg_proto_init() {
}
}
file_msg_proto_msgTypes[59].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*AnimationImageShow); i {
switch v := v.(*ResvAttr); i {
case 0:
return &v.state
case 1:
@ -8171,6 +8250,18 @@ func file_msg_proto_init() {
}
}
file_msg_proto_msgTypes[60].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*AnimationImageShow); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_msg_proto_msgTypes[61].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*UinTypeUserDef); i {
case 0:
return &v.state
@ -8189,7 +8280,7 @@ func file_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_msg_proto_rawDesc,
NumEnums: 1,
NumMessages: 61,
NumMessages: 62,
NumExtensions: 0,
NumServices: 0,
},

7
client/pb/msg/msg.proto
View File

@ -703,6 +703,13 @@ message MsgElemInfo_servtype3 {
NotOnlineImage flash_c2c_pic = 2;
}
message MsgElemInfo_servtype33 {
uint32 index = 1;
bytes text = 2;
bytes compat = 3;
bytes buf = 4;
}
message SubMsgType0x4Body {
NotOnlineFile notOnlineFile = 1;
uint32 msgTime = 2;

28
message/elements.go
View File

@ -62,6 +62,7 @@ type FriendImageElement struct {
type FaceElement struct {
Index int32
NewSysFace bool
Name string
}
@ -171,6 +172,14 @@ func NewGroupImage(id string, md5 []byte, fid int64, size, width, height, imageT
func NewFace(index int32) *FaceElement {
name := faceMap[int(index)]
if name == "" {
name = newSysFaceMap[int(index)]
if name != "" {
return &FaceElement{
Index: index,
NewSysFace: true,
Name: name,
}
}
name = "未知表情"
}
return &FaceElement{
@ -468,4 +477,23 @@ var faceMap = map[int]string{
208: "小样儿",
210: "飙泪",
211: "我不看",
247: "口罩护体",
}
var newSysFaceMap = map[int]string{
260: "搬砖中",
261: "忙到飞起",
262: "脑阔疼",
263: "沧桑",
264: "捂脸",
265: "辣眼睛",
266: "哦呦",
267: "头秃",
268: "问号脸",
269: "暗中观察",
270: "emm",
271: "吃瓜",
272: "呵呵哒",
273: "我酸了",
277: "汪汪",
}

4
message/message.go
View File

@ -516,6 +516,10 @@ func ParseMessageElems(elems []*msg.Elem) []IMessageElement {
})
return res
}
case 33:
newSysFaceMsg := &msg.MsgElemInfoServtype33{}
_ = proto.Unmarshal(elem.CommonElem.PbElem, newSysFaceMsg)
res = append(res, NewFace(int32(newSysFaceMsg.Index)))
}
}
}

16
message/pack.go
View File

@ -21,6 +21,21 @@ func (e *TextElement) Pack() (r []*msg.Elem) {
func (e *FaceElement) Pack() (r []*msg.Elem) {
r = []*msg.Elem{}
if e.NewSysFace {
elem := &msg.MsgElemInfoServtype33{
Index: uint32(e.Index),
Text: []byte("/" + e.Name),
Compat: []byte("/" + e.Name),
}
b, _ := proto.Marshal(elem)
r = append(r, &msg.Elem{
CommonElem: &msg.CommonElem{
ServiceType: 33,
PbElem: b,
BusinessType: 1,
},
})
} else {
r = append(r, &msg.Elem{
Face: &msg.Face{
Index: e.Index,
@ -28,6 +43,7 @@ func (e *FaceElement) Pack() (r []*msg.Elem) {
Buf: []byte{0x00, 0x01, 0x00, 0x04, 0x52, 0xCC, 0xF5, 0xD0},
},
})
}
return
}