From e5e62d5d518459294e8014e47b8b27294456dd8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=A5=E4=B8=80=E4=B8=80?= <1204244136@qq.com>
Date: Wed, 28 May 2025 13:19:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=AB=9E?=
 =?UTF-8?q?=E6=8A=80=E5=9C=BA=E7=BB=93=E6=9D=9F=E5=90=8E=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DoroHelper.ahk | 41 ++++++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/DoroHelper.ahk b/DoroHelper.ahk
index 582df9c..1d961d7 100644
--- a/DoroHelper.ahk
+++ b/DoroHelper.ahk
@@ -1508,21 +1508,35 @@ Arena() {
     AddLog("===竞技场收菜任务结束===")
     AddLog("进入竞技场")
     Text := "|<竞技场>*80$59.zUzwDVz70T001sT3y80C003kU0wE0S00C000sk1y3Vw0010w7U0081Uy0UT000MDVw001U03sE0Q403007k00QM0600C001ss0ADsQ033lk0M00s647U00k01sC0T00Vk07sQ1s013sEnkw3k66D1V3V01Vw8E704001jk0US0MAC3zW1Xz1stzDzyD"
-    while (ok := FindText(&X := "wait", &Y := 3, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.1 * PicTolerance, 0.1 * PicTolerance, Text, , 0, , , , , TrueRatio, TrueRatio)) {
+    while (ok := FindText(&X, &Y, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.1 * PicTolerance, 0.1 * PicTolerance, Text, , 0, , , , , TrueRatio, TrueRatio)) {
         AddLog("点击竞技场")
-        FindText().Click(X, Y, "L")
+        FindText().Click(X, Y - 50 * TrueRatio, "L")
         Sleep sleepTime
     }
+    Text := "|<新人竞技场>*92$92.wznzlzzszwTXyTzy7UDwTy00D7sz60C007z7zU03lk1tU3U0Tzlzy43s00CQ0wF7zwTz0kw0021kz4Fzy7z0010QDUEDU00zUzk00QD3s00000DsDz00T607303Vk3y3zk07k00tk0U0Fz0Tw01k00QS0804Tk3z00Q1677420F7sEzk071k3s18U4FwC7w01wS0w0W804S3kzkXj7US0FUE371w3sMtlk3VwMUElUzUE60EE09w0ACAMTyA3U4463z67bz7jzr3y3XbtzvXU"
+    while true {
+        if !(ok := FindText(&X, &Y, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.1 * PicTolerance, 0.1 * PicTolerance, Text, , 0, , , , , TrueRatio, TrueRatio)) {
+            Confirm
+        }
+        else {
+            break
+        }
+    }
 }
 ; 新人竞技场
 RookieArena() {
     AddLog("===新人竞技场任务开始===")
     AddLog("查找新人竞技场")
     Text := "|<新人竞技场>*92$92.wznzlzzszwTXyTzy7UDwTy00D7sz60C007z7zU03lk1tU3U0Tzlzy43s00CQ0wF7zwTz0kw0021kz4Fzy7z0010QDUEDU00zUzk00QD3s00000DsDz00T607303Vk3y3zk07k00tk0U0Fz0Tw01k00QS0804Tk3z00Q1677420F7sEzk071k3s18U4FwC7w01wS0w0W804S3kzkXj7US0FUE371w3sMtlk3VwMUElUzUE60EE09w0ACAMTyA3U4463z67bz7jzr3y3XbtzvXU"
-    if (ok := FindText(&X, &Y, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.1 * PicTolerance, 0.1 * PicTolerance, Text, , 0, , , , , TrueRatio, TrueRatio)) {
+    while (ok := FindText(&X, &Y, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.1 * PicTolerance, 0.1 * PicTolerance, Text, , 0, , , , , TrueRatio, TrueRatio)) {
         AddLog("点击新人竞技场")
-        FindText().Click(X, Y, "L")
+        FindText().Click(X + 20 * TrueRatio, Y, "L")
         Sleep sleepTime
+        if A_Index > 3 {
+            AddLog("新人竞技场未在开放期间，跳过任务")
+            AddLog("===新人竞技场任务结束===")
+            return
+        }
     }
     AddLog("检测免费次数")
     skip := false
@@ -1562,10 +1576,6 @@ RookieArena() {
     if (ok := FindText(&X := "wait", &Y := 3, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.1 * PicTolerance, 0.1 * PicTolerance, Text, , 0, , , , , TrueRatio, TrueRatio)) {
         AddLog("已返回竞技场页面")
     }
-    else {
-        MsgBox("返回时出现异常！")
-        pause
-    }
     AddLog("===新人竞技场任务结束===")
 }
 ;特殊竞技场
@@ -1573,10 +1583,15 @@ SpecialArena() {
     AddLog("===特殊竞技场任务开始===")
     AddLog("查找特殊竞技场")
     Text := "|<特殊竞技场>*93$91.tyDzzDzlzsyDszzws1U07s00wT7wM0kQ0E03w00SA0CA0M60AC0DVkw0077kQ1sy207UkS0031kS0010030010wT0ED000U2DU00kyDU004k0l13w01wM0QM0CTsl00C00y00CC0600000700Q0077000040U7U0C137X00003kk7k071l3k000lXss3s03sw3k20QslwE0z0CwS3k34CSMsEUD36CC0sD6CDUMMF41U4406z07bsQSsy3k2633zW3nwDzwT7y77jtzv3U"
-    if (ok := FindText(&X := "wait", &Y := 5, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.1 * PicTolerance, 0.1 * PicTolerance, Text, , 0, , , , , TrueRatio, TrueRatio)) {
+    while (ok := FindText(&X, &Y, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.1 * PicTolerance, 0.1 * PicTolerance, Text, , 0, , , , , TrueRatio, TrueRatio)) {
         AddLog("点击特殊竞技场")
-        FindText().Click(X, Y, "L")
+        FindText().Click(X + 20 * TrueRatio, Y, "L")
         Sleep sleepTime
+        if A_Index > 3 {
+            AddLog("特殊竞技场未在开放期间，跳过任务")
+            AddLog("===特殊竞技场任务结束===")
+            return
+        }
     }
     AddLog("检测免费次数")
     skip := false
@@ -1616,10 +1631,6 @@ SpecialArena() {
     if (ok := FindText(&X := "wait", &Y := 3, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.1 * PicTolerance, 0.1 * PicTolerance, Text, , 0, , , , , TrueRatio, TrueRatio)) {
         AddLog("已返回竞技场页面")
     }
-    else {
-        MsgBox("返回时出现异常！")
-        pause
-    }
     AddLog("===特殊竞技场任务结束===")
 }
 ;冠军竞技场
@@ -2350,7 +2361,7 @@ Activity() {
         Sleep sleepTime
         ; Text := "|<离活动开始还剩下的剩下>*200$36.zbtzzzU7tzzzwztU00yTNznz01NznzyzNznzqbNzlzaXNzkTqbNzk7qrNznXalNznnwTNznzsDtznzsXtznzavtznziznznzyzXznzU"
         ; if (ok := FindText(&X := "wait", &Y := 3, NikkeX, NikkeY, NikkeX + NikkeW, NikkeY + NikkeH, 0.1 * PicTolerance, 0.1 * PicTolerance, Text, , 0, , , , , TrueRatio, TrueRatio)) {
-        ;     AddLog("困难未开放，可以继续")
+        ;     AddLog("困难未在开放期间，可以继续")
         ; }
         UserClick(1662, 2013, scrRatio)
         Sleep sleepTime