diff --git a/src/core/apis/packet.ts b/src/core/apis/packet.ts index b0e679b7..5668319f 100644 --- a/src/core/apis/packet.ts +++ b/src/core/apis/packet.ts @@ -85,7 +85,7 @@ export class NTQQPacketApi { agentType: 2 } }, - downloadRKeyReq: [10, 20, 2], + downloadRKeyReq: [[{ key: 10 }, { key: 20 }], { key: 2 }], }); let oidb_packet = new NapProtoMsg(OidbSvcTrpcTcpBase).encode({ command: 0x9067, @@ -99,9 +99,8 @@ export class NTQQPacketApi { let oidb_0xfe1_2 = new NapProtoMsg(OidbSvcTrpcTcp0XFE1_2).encode({ uin: uin, - key: [27372] + key: [{ key: 27372 }] }); - console.log(oidb_0xfe1_2); let oidb_packet = new NapProtoMsg(OidbSvcTrpcTcpBase).encode({ command: 0xfe1, subCommand: 2, diff --git a/src/core/proto/NapProto.ts b/src/core/proto/NapProto.ts index a3f8ff2d..2985adaf 100644 --- a/src/core/proto/NapProto.ts +++ b/src/core/proto/NapProto.ts @@ -122,7 +122,7 @@ export class NapProtoMsg { no: field.no, name: key, kind: 'message', - repeat: field.repeat ? RepeatType.PACKED : RepeatType.NO, + repeat: field.repeat ? RepeatType.UNPACKED : RepeatType.NO, T: () => rt, }; } diff --git a/src/core/proto/oidb/Oidb.fe1_2.ts b/src/core/proto/oidb/Oidb.fe1_2.ts index 3e01df8e..676112c1 100644 --- a/src/core/proto/oidb/Oidb.fe1_2.ts +++ b/src/core/proto/oidb/Oidb.fe1_2.ts @@ -2,8 +2,7 @@ import {ScalarType} from "@protobuf-ts/runtime"; import {ProtoField} from "../NapProto"; export const OidbSvcTrpcTcp0XFE1_2 = { - uid: ProtoField(1, ScalarType.STRING, true), - uin: ProtoField(2, ScalarType.UINT32), + uin: ProtoField(1, ScalarType.UINT32), key: ProtoField(3, () => OidbSvcTrpcTcp0XFE1_2Key, false, true), }