From 7caa23f0fe06d8051a3aee7351c87888baca3639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=A5=E4=B8=80=E4=B8=80?= <1204244136@qq.com>
Date: Thu, 5 Jun 2025 22:23:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=95=86=E5=BA=97=E9=94=9A=E5=AE=9A?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DoroHelper.ahk | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/DoroHelper.ahk b/DoroHelper.ahk
index 36578e3..8176d2c 100644
--- a/DoroHelper.ahk
+++ b/DoroHelper.ahk
@@ -1173,8 +1173,7 @@ NormalShop() {
         BackToHall
         return
     }
-    TextGoods := "|<百货>*128$36.zzzwMt001sM1001kE1z3zU0Bz3zk0sk07ws0k07ww1k07wzzlz7s03ly7s03k07slXk07slXlz7slXlz7sV3k07y07k07U60k07kTlnz7vzzU"
-    if (ok := FindText(&X := "wait", &Y := 3, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.1 * PicTolerance, 0.1 * PicTolerance, TextGoods, , 0, , , , , TrueRatio, TrueRatio)) {
+    if (ok := FindText(&X := "wait", &Y := 3, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.2 * PicTolerance, 0.2 * PicTolerance, Text百货, , 0, , , , , TrueRatio, TrueRatio)) {
         AddLog("已进入百货商店。")
     }
     ; 定义所有可购买物品的信息 (使用 Map)
@@ -1222,8 +1221,7 @@ NormalShop() {
                         FindText().Click(X, Y, "L")
                         Sleep g_numeric_settings["SleepTime"]
                     }
-                    Text百货 := "|<百货>*128$36.zzzwMt001sM1001kE1z3zU0Bz3zk0sk07ws0k07ww1k07wzzlz7s03ly7s03k07slXk07slXlz7slXlz7sV3k07y07k07U60k07kTlnz7vzzU"
-                    while !(ok2 := FindText(&X_found, &Y_found, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.1 * PicTolerance, 0.1 * PicTolerance, Text百货, , 0, , , , , TrueRatio, TrueRatio)) {
+                    while !(ok2 := FindText(&X, &Y, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.2 * PicTolerance, 0.2 * PicTolerance, Text百货, , 0, , , , , TrueRatio, TrueRatio)) {
                         Confirm
                     }
                 }
@@ -1249,7 +1247,7 @@ NormalShop() {
             AddLog("没有免费刷新次数了，跳过刷新。")
             break ; 退出外层 loop 2 循环，因为没有免费刷新了
         }
-        while !(ok := FindText(&X, &Y, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.2 * PicTolerance, 0.2 * PicTolerance, TextGoods, , 0, , , , , TrueRatio, TrueRatio)) {
+        while !(ok := FindText(&X, &Y, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.2 * PicTolerance, 0.2 * PicTolerance, Text百货, , 0, , , , , TrueRatio, TrueRatio)) {
             AddLog("等待返回百货商店页面。")
             Confirm
         }
@@ -1315,8 +1313,7 @@ ArenaShop() {
                     AddLog("购买" . Name)
                     FindText().Click(X, Y, "L")
                     Sleep g_numeric_settings["SleepTime"]
-                    Text百货 := "|<百货>*128$36.zzzwMt001sM1001kE1z3zU0Bz3zk0sk07ws0k07ww1k07wzzlz7s03ly7s03k07slXk07slXlz7slXlz7sV3k07y07k07U60k07kTlnz7vzzU"
-                    while !(ok2 := FindText(&X, &Y, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.1 * PicTolerance, 0.1 * PicTolerance, Text百货, , 0, , , , , TrueRatio, TrueRatio)) {
+                    while !(ok2 := FindText(&X, &Y, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.2 * PicTolerance, 0.2 * PicTolerance, Text百货, , 0, , , , , TrueRatio, TrueRatio)) {
                         Confirm
                     }
                 }
@@ -1375,8 +1372,7 @@ ScrapShop() {
                     AddLog("购买" . Name)
                     FindText().Click(X, Y, "L")
                     Sleep g_numeric_settings["SleepTime"]
-                    Text百货 := "|<百货>*128$36.zzzwMt001sM1001kE1z3zU0Bz3zk0sk07ws0k07ww1k07wzzlz7s03ly7s03k07slXk07slXlz7slXlz7sV3k07y07k07U60k07kTlnz7vzzU"
-                    while !(ok2 := FindText(&X_found, &Y_found, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.1 * PicTolerance, 0.1 * PicTolerance, Text百货, , 0, , , , , TrueRatio, TrueRatio)) {
+                    while !(ok2 := FindText(&X_found, &Y_found, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.2 * PicTolerance, 0.2 * PicTolerance, Text百货, , 0, , , , , TrueRatio, TrueRatio)) {
                         Confirm
                     }
                 }