From 2bc5077e83c1563370831338c268371ae5c24f55 Mon Sep 17 00:00:00 2001 From: Cheneeey <45511797+Cheney0120@users.noreply.github.com> Date: Sat, 27 Jul 2024 17:52:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B9=BB=E6=B5=B7=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E8=AE=A1=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?bug(#11),=E4=BB=A5=E5=8F=8A=E9=9D=9E=E9=92=93=E9=B1=BC=E7=8A=B6?= =?UTF-8?q?=E6=80=81cpu=E5=8D=A0=E7=94=A8=E8=BF=87=E9=AB=98=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#12)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MainWindow.xaml.cs" | 2 ++ .../Models/Common.cs" | 23 ++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git "a/\346\270\224\344\272\272\347\232\204\347\233\264\346\204\237/MainWindow.xaml.cs" "b/\346\270\224\344\272\272\347\232\204\347\233\264\346\204\237/MainWindow.xaml.cs" index c23eb2c..2f5cbe5 100644 --- "a/\346\270\224\344\272\272\347\232\204\347\233\264\346\204\237/MainWindow.xaml.cs" +++ "b/\346\270\224\344\272\272\347\232\204\347\233\264\346\204\237/MainWindow.xaml.cs" @@ -151,6 +151,8 @@ private void OnWork(object sender, DoWorkEventArgs e) Reset(); Status.End(); Fish.Reset(); + //挂机会导致cpu飙高 + Thread.Sleep(50); continue; } diff --git "a/\346\270\224\344\272\272\347\232\204\347\233\264\346\204\237/Models/Common.cs" "b/\346\270\224\344\272\272\347\232\204\347\233\264\346\204\237/Models/Common.cs" index 91d6486..9f85089 100644 --- "a/\346\270\224\344\272\272\347\232\204\347\233\264\346\204\237/Models/Common.cs" +++ "b/\346\270\224\344\272\272\347\232\204\347\233\264\346\204\237/Models/Common.cs" @@ -86,8 +86,8 @@ public static void Initialize(SigScanner scanner) conditionPtr = scanner.GetStaticAddressFromSig("48 8D 0D ? ? ? ? 45 33 C0 4C 8B F0", 3); //获取EventFrameworkPtr - eventFrameworkPtrAddress = scanner.GetStaticAddressFromSig("48 83 3D ?? ?? ?? ?? ?? 44 0F B6 F0", 3); - + eventFrameworkPtrAddress = scanner.GetStaticAddressFromSig("48 8B 35 ?? ?? ?? ?? 0F B6 EA 4C 8B F1", 3); + // eventFrameworkPtrAddress = scanner.GetStaticAddressFromSig("48 83 3D ?? ?? ?? ?? ?? 44 0F B6 F0", 3); //获取Offset相关 var contentDirectoryAddress = scanner.ScanText("48 83 B9 ? ? ? ? ? 74 ? B0 ? C3 48 8B 81"); // 国服6.57 @@ -103,15 +103,16 @@ public static void Initialize(SigScanner scanner) contentTimeLeftOffset = scanner.ReadInt16(contentTimeLeftOffsetAddress, 4); Debug.WriteLine($"{contentTimeLeftOffset:X}"); - // TODO: 等国服更新7.0后用 "80 B8 ? ? ? ? ? 75 ? 83 FB ? 73 ? 8B C3" - var contentDirectorTypeOffsetAddress = scanner.ScanText("E8 ? ? ? ? 0F B6 4D ? 48 8D 55 ? 66 3B C8"); - if (scanner.ReadInt16(contentDirectorTypeOffsetAddress, 0x1d) == 0xB80) // 国服6.57 - contentDirectorTypeOffsetAddress += 0x1d; - else - contentDirectorTypeOffsetAddress += 0x1a; - - contentDirectorTypeOffset = scanner.ReadInt16(contentDirectorTypeOffsetAddress, 2); - + //暂时有问题先注掉 + // // TODO: 等国服更新7.0后用 "80 B8 ? ? ? ? ? 75 ? 83 FB ? 73 ? 8B C3" + // var contentDirectorTypeOffsetAddress = scanner.ScanText("E8 ? ? ? ? 0F B6 4D ? 48 8D 55 ? 66 3B C8"); + // if (scanner.ReadInt16(contentDirectorTypeOffsetAddress, 0x1d) == 0xB80) // 国服6.57 + // contentDirectorTypeOffsetAddress += 0x1d; + // else + // contentDirectorTypeOffsetAddress += 0x1a; + + // contentDirectorTypeOffset = scanner.ReadInt16(contentDirectorTypeOffsetAddress, 2); + contentDirectorTypeOffset = scanner.ReadInt16(scanner.ScanText("80 B8 ?? ?? ?? ?? ?? 75 ?? 83 FB ?? 73 ?? 8B C3"), 2); var uiStatusEffectstAddress = scanner.ScanText("48 8D 81 ? ? ? ? C3 CC CC CC CC CC CC CC CC 48 89 5C 24 ? 48 89 74 24 ? 57 48 83 EC ? 33 F6 48 8B D9"); // 国服6.57 if (uiStatusEffectstAddress == IntPtr.Zero) uiStatusEffectstAddress = scanner.ScanText("48 8D 81 ? ? ? ? C3 CC CC CC CC CC CC CC CC 48 8B 41"); // 国际服7.0