From 5b1e17617b0a515c794184ed4de880121ac1e4c0 Mon Sep 17 00:00:00 2001 From: ksh Date: Thu, 6 Oct 2022 01:53:22 +0900 Subject: [PATCH] KR 6.1 updates (#123) --- Data/DcPacket-LocalKorea.config | 6 +++--- PacketTest.txt | 25 +++++++++++++++++++++++++ Tab/DutyForm.cs | 9 +++++++-- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/Data/DcPacket-LocalKorea.config b/Data/DcPacket-LocalKorea.config index 4f6b66b..b410a90 100644 --- a/Data/DcPacket-LocalKorea.config +++ b/Data/DcPacket-LocalKorea.config @@ -1,11 +1,11 @@ # DutyPacket configuration # packet -Version=5006052 -Description=6.05 핫픽스 (한국판) +Version=5006100 +Description=6.1 (한국판) OpFate=309 OpDuty=758 OpMatch=346 OpInstance=338 OpZone=470 -OpSouthernBozja=423 +OpSouthernBozja=0 diff --git a/PacketTest.txt b/PacketTest.txt index d745d44..5588bcf 100644 --- a/PacketTest.txt +++ b/PacketTest.txt @@ -1,5 +1,30 @@ # final steps (169/A9) +2022-10-6 액토즈판 +[01:32:22] 548(32,12) => 01 21 00 50 60 20 02 40 00 00 01 00 A9 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +[01:32:22] 548(32,12) => 01 21 00 50 60 24 02 40 00 00 01 01 A9 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +[01:32:22] 632(24,4) => 02 00 00 00 A9 00 05 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +[01:32:22] 288(32,20) => 03 36 00 00 60 24 02 40 00 00 00 00 00 00 00 00 01 6E 4E B3 A9 00 00 00 0E 5A 4E 8B 24 7F 00 01 +[01:32:22/인스턴스] 매칭: 니드호그 토벌전 +[01:32:25] 815(24,8) => 04 F0 00 00 01 7F 00 00 A9 00 00 00 00 00 00 00 00 00 01 01 00 00 00 00 +[01:32:26] 396(96,6) => 1A 00 2F 02 00 00 A9 00 00 00 00 00 00 00 00 00 03 49 2A 00 A8 22 3D 00 8E 00 00 00 00 80 09 41 00 00 80 3F 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0B 58 D9 3E 00 C0 15 B6 59 80 95 41 00 01 01 01 01 01 01 01 01 01 01 02 00 00 00 00 +[01:32:36] 454(2416,852) => FF FF FF FF FF FF FF FF FF 02 08 00 C4 00 00 00 00 00 00 00 0F 05 AC 3F E9 62 DF C2 00 00 20 41 9F BB B0 C1 C4 00 00 00 00 00 00 00 0F 05 AC 3F 2C FB D7 C2 00 00 20 41 F5 E4 A9 C1 C4 00 00 00 00 00 00 00 0F 05 AC 3F 33 F7 D0 C2 00 00 20 41 70 6A A3 C1 24 00 00 00 00 00 00 00 0F 05 AC 3F 5E 8E D5 C2 00 00 20 41 C5 5F 20 C1 24 00 00 00 00 00 00 00 0F 05 AC 3F 5E 7F E7 C2 00 00 20 41 C4 BC 47 C1 DE 00 00 00 01 00 00 00 74 8A 3A 40 3B FD DC C2 00 00 20 41 5B 60 6D C1 EB 00 00 00 00 00 00 00 CD 77 F2 BF 93 F4 DB C2 00 00 20 41 84 D6 22 C1 72 00 00 00 00 00 00 00 0F 05 AC 3F 3C 41 E0 C2 06 00 20 41 49 96 DA C1 2D 00 00 00 00 00 00 00 10 05 AC 3F 50 68 CC C2 06 00 20 41 B3 D3 CE C1 70 00 00 00 00 00 00 00 78 64 35 40 23 54 DF C2 00 00 20 41 0C 4F 1C C1 16 00 00 00 00 00 00 00 CC 74 00 C0 F4 2F 07 C3 A8 FF 3F 41 BA 73 73 C2 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 BA 00 00 00 00 00 00 00 F4 66 DF BE B2 B4 10 C3 FB FF 3F 41 7E 41 7C C2 90 00 00 00 00 00 00 00 EA C0 20 C0 1C BD 0D C3 04 00 40 41 81 73 1E C2 90 00 00 00 00 00 00 00 D7 19 2C C0 C7 16 12 C3 03 00 40 41 C4 90 26 C2 C3 00 00 00 5B 00 00 00 CC 74 00 C0 1B 06 08 C3 04 00 40 41 43 26 20 C2 56 00 00 00 00 00 00 00 F6 66 DF BE D2 5A 16 C3 02 00 40 41 A1 67 2F C2 0B 00 00 00 00 00 00 00 FC 22 2D 40 F7 D1 10 C3 04 00 40 41 E6 32 24 C2 50 00 00 00 00 00 00 00 FC 22 2D 40 EA 3E 1A C3 02 00 40 41 9C C7 35 C2 0B 00 00 00 00 00 00 00 FC 22 2D 40 EF 01 0F C3 04 00 40 41 62 D1 20 C2 96 00 00 00 00 00 00 00 66 E7 00 C0 F3 E9 0F C3 04 00 40 41 20 82 22 C2 8C 00 00 00 00 00 00 00 1D 36 91 3F 1E 7A 06 C3 05 00 40 41 B0 61 1C C2 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 8C 00 00 00 00 00 00 00 F6 66 DF BE 87 22 09 C3 05 00 40 41 19 83 18 C2 8C 00 00 00 00 00 00 00 1D 36 91 3F 5B C9 04 C3 03 00 40 41 EB E1 2A C2 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 C3 00 00 00 5B 00 00 00 CC 74 00 C0 59 55 06 C3 03 00 40 41 7C A6 2E C2 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 BE 00 00 00 00 00 00 00 CC 74 00 C0 D2 B7 10 C3 FB FF 3F 41 42 0B 7E C2 16 00 00 00 00 00 00 00 BF B8 32 BE C9 C1 09 C3 03 00 70 41 5A AC E1 C1 8D 00 00 00 00 00 00 00 C3 B8 B2 3F 57 EF 09 C3 04 00 70 41 D1 D3 E1 C1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0C 00 00 00 00 00 00 00 22 CF B0 BE BC 06 14 C3 FF FF 6F 41 71 81 0E C2 15 00 00 00 00 00 00 00 BB B8 32 BE 86 D3 11 C3 00 00 70 41 8C 32 0B C2 A9 00 00 00 00 00 00 00 91 0D E7 3E 65 22 11 C3 01 00 70 41 56 FE 0B C2 38 00 00 00 00 00 00 00 BE B8 32 BE 78 81 0A C3 03 00 70 41 06 3A B2 C1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 CE 00 00 00 00 00 00 00 5E C6 4E BF 59 7D 0A C3 04 00 70 41 16 34 94 C1 AE 00 00 00 00 00 00 00 BD B8 32 BE 78 C1 1E C3 FD FF 6F 41 23 32 8C C1 F7 00 00 00 00 00 00 00 C0 B8 32 BE EA FF 0B C3 04 00 70 41 EF DA 4F C1 F7 00 00 00 00 00 00 00 3C 3D C0 3E B2 B8 0D C3 02 00 70 41 0C AD FE C1 E0 00 00 00 00 00 00 00 C0 B8 32 BE 7A A0 0E C3 02 00 70 41 87 41 A9 C1 F7 00 00 00 00 00 00 00 18 57 B6 BF 66 FA 07 C3 04 00 70 41 51 5D 06 C2 F7 00 00 00 00 00 00 00 C0 B8 32 BE 6C E5 1C C3 FD FF 6F 41 05 87 12 C2 F7 00 00 00 00 00 00 00 FB 7E 8A BF AE 5A 18 C3 FF FF 6F 41 C0 EA 82 C1 74 00 00 00 00 00 00 00 BC B8 32 BE 19 B7 1E C3 FD FF 6F 41 7F 2B 8B C1 03 01 00 00 00 00 00 00 EC FC E0 BF B0 EE 0E C3 03 00 70 41 19 44 90 C1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 16 00 00 00 00 00 00 00 A5 A3 EA 3F 02 28 21 C3 FF FF 6F 41 7B EF 08 42 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 F1 00 00 00 01 00 00 00 30 4F 86 3E 03 75 10 C3 00 00 70 41 45 B6 BB 41 03 01 00 00 00 00 00 00 22 B8 C8 3F 51 76 14 C3 0F 00 70 41 C0 4F 06 40 0F 00 00 00 00 00 00 00 18 E1 D4 3F 10 86 0E C3 00 00 70 41 56 03 B3 41 F1 00 00 00 01 00 00 00 A7 A3 EA 3F 80 93 13 C3 00 00 70 41 A2 28 B5 41 03 01 00 00 00 00 00 00 07 85 38 40 D7 CD 18 C3 FF FF 6F 41 82 AF FD 41 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 01 00 00 00 00 00 00 1D 76 E1 BB 9F A2 1D C3 10 00 70 41 08 25 48 40 50 00 00 00 00 00 00 00 CB 95 27 40 CF B2 1A C3 03 00 70 41 EA 23 68 41 74 00 00 00 00 00 00 00 BA 1B 86 3F 48 A4 16 C3 FF FF 6F 41 18 12 F4 41 F1 00 00 00 01 00 00 00 30 4F 86 3E 92 A0 0F C3 00 00 70 41 AE 6F D4 41 50 00 00 00 00 00 00 00 F4 45 38 C0 5E 10 15 C3 00 00 70 41 9C DD EF 41 F1 00 00 00 01 00 00 00 30 4F 86 3E 51 4C 0F C3 00 00 70 41 F3 38 B9 41 C3 00 00 00 5B 00 00 00 A7 A3 EA 3F 74 B5 12 C3 00 00 70 41 0F D5 C8 41 D1 00 00 00 57 00 00 00 A7 A3 EA 3F C3 74 16 C3 00 00 70 41 C8 D5 A2 41 C3 00 00 00 5B 00 00 00 A7 A3 EA 3F AD 30 12 C3 00 00 70 41 F0 48 D8 41 0F 00 00 00 00 00 00 00 52 5E BF BF 5E C4 10 C3 FF FF 6F 41 3A 82 F4 41 50 00 00 00 00 00 00 00 2C 4F 86 3E 60 1A 0D C3 00 00 70 41 D3 19 DC 41 4F 00 00 00 00 00 00 00 A7 A3 EA 3F BD 26 1A C3 0A 00 70 41 26 AD 01 41 56 00 00 00 00 00 00 00 FD 01 06 C0 87 94 14 C3 08 00 70 41 44 C8 03 41 F1 00 00 00 01 00 00 00 30 4F 86 3E E0 77 0E C3 00 00 70 41 5A F2 D1 41 00 01 00 00 50 00 00 00 A7 A3 EA 3F 6F A6 0C C3 FF FF 6F 41 12 06 E7 41 F1 00 00 00 01 00 00 00 F4 45 38 C0 E7 F5 14 C3 00 00 70 41 DC F3 D5 41 E0 00 00 00 00 00 00 00 30 4F 86 3E 8A C5 18 C3 0C 00 70 41 22 80 B3 40 F1 00 00 00 01 00 00 00 A7 A3 EA 3F 84 B5 11 C3 00 00 70 41 CA C9 EC 41 88 00 00 00 26 00 00 00 A7 A3 EA 3F 9E 68 13 C3 00 00 70 41 25 88 B4 41 01 01 00 00 39 00 00 00 30 4F 86 3E 37 6B 12 C3 D1 43 6D 41 6C 22 8D 41 88 00 00 00 0D 00 00 00 F5 45 38 C0 99 09 10 C3 00 00 70 41 C3 D9 C7 41 F1 00 00 00 01 00 00 00 A7 A3 EA 3F 9D C8 13 C3 00 00 70 41 48 FA AE 41 16 00 00 00 00 00 00 00 36 8D A7 BF 2F AC D9 C2 0E 00 70 41 3A AF 11 42 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +548 => 듀티 +288 => 매칭 + +[01:42:48] 548(32) => 01 21 00 50 60 20 02 40 00 00 01 00 A9 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +[01:42:48] 548(32) => 01 21 00 00 60 24 02 40 00 00 01 01 A9 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +[01:42:48] 288(32) => 03 20 00 00 60 24 02 40 00 00 00 00 00 00 00 00 01 00 00 00 A9 00 00 00 C0 00 00 00 00 00 00 01 +[01:42:48/인스턴스] 매칭: 니드호그 토벌전 +[01:42:50] 460(16) => 00 00 00 00 2F 02 00 00 00 00 0C 01 01 09 00 00 +[01:42:51] 880(16) => A9 00 00 00 00 00 00 00 60 24 02 40 00 00 00 00 +[01:42:51] 880(16) => A9 00 00 00 04 00 00 00 00 00 00 00 00 00 00 00 +[01:42:51/인스턴스] 들감미: 니드호그 토벌전 +[01:43:02] 880(16) => A9 00 00 00 05 00 00 00 00 00 00 00 00 00 00 00 +[01:43:02] 460(16) => 00 00 00 00 00 00 00 00 00 00 0D 01 01 0B 00 00 +880 => 인스턴스 + + 2022-9-13 액토즈판 # undersize diff --git a/Tab/DutyForm.cs b/Tab/DutyForm.cs index c0398c1..2ce1cc8 100644 --- a/Tab/DutyForm.cs +++ b/Tab/DutyForm.cs @@ -120,6 +120,11 @@ namespace DutyContent.Tab var p = _packet_list.ElementAt(cboPacketset.SelectedIndex); RemotePacketUpdate(p.Key); } + + // +#if TESTPK + Logger.Write(Color.Red, "[TEST PK MODE]"); +#endif } public void PluginDeinitialize() @@ -1556,7 +1561,7 @@ namespace DutyContent.Tab var data = message.Skip(32).ToArray(); #if TESTPK -#if true +#if false // 파이날 스텝으로 오는거 전부 얻기 var t = IndexOfData(data, 0, new ushort[] { 169, 134, 183, 223, 637 }); // final, P1, S1, Z1, Snake if (t > 0) @@ -1567,7 +1572,7 @@ namespace DutyContent.Tab else #endif // 매칭 관련 - if (opcode == 183 || opcode == 371 || opcode == 754 || opcode == 372 || opcode == 322) + if (opcode == 548 || opcode == 288 || opcode == 880 || opcode == 460) { var s = DataToByteString(data); Logger.L("{0}({1}) => {2}", opcode, data.Length, s);