From 39b9e98aed36515e22acd90cd73f58d639f23319 Mon Sep 17 00:00:00 2001
From: UCPr <2032385471@qq.com>
Date: Tue, 26 Nov 2024 22:45:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=AF=86=E5=88=AB=E5=86=97?=
 =?UTF-8?q?=E4=BD=99=E5=A4=84=E7=90=86=E3=80=81fix=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=99=A8=E5=88=86=E8=BE=A8=E7=8E=87=E4=B8=8E=E6=B8=B8=E6=88=8F?=
 =?UTF-8?q?=E5=88=86=E8=BE=A8=E7=8E=87=E4=B8=8D=E5=90=8C=E6=97=B6=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E4=B8=81=E5=B0=BC=E5=89=AF=E6=9C=AC=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/enterDennyFuben.ahk                |  2 +-
 components/recogLocation.ahk                  | 20 +++++++++++++------
 utils/CoordsData.ahk                          |  6 ++++++
 ...6\345\217\267\344\270\232\347\273\251.ahk" | 10 +++++-----
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/components/enterDennyFuben.ahk b/components/enterDennyFuben.ahk
index 707f2aa..c57c005 100644
--- a/components/enterDennyFuben.ahk
+++ b/components/enterDennyFuben.ahk
@@ -11,7 +11,7 @@ enterDennyFuben(step := 2) {
   static x := 251
   static y := Floor(c.height * 0.9)
   static ymin := c.height // 10
-  static maxO := Ceil(c.height / 2160 * 16)
+  static maxO := Ceil(c.height / 2160 * 24)
   static GetPixel := PixelGetColor
   static isPageDown := false
   static calY(x0, y0, r, x) {
diff --git a/components/recogLocation.ahk b/components/recogLocation.ahk
index 710f55f..6ebeaeb 100644
--- a/components/recogLocation.ahk
+++ b/components/recogLocation.ahk
@@ -9,11 +9,11 @@
 recogLocation(loopTimes := 30) {
   activateZZZ()
 
-  /** 通过三个特殊定位点判断所处界面 */
+  /** 通过特殊定位点判断所处界面 */
   patterns := [[
     c.角色操作.M,
     c.角色操作.Q,
-    c.角色操作.T
+    [c.角色操作.T, c.角色操作.Tab]
   ], [
     c.零号选择.资质考核,
     c.零号选择.旧都列车,
@@ -24,20 +24,28 @@ recogLocation(loopTimes := 30) {
     c.拿命验收.推荐等级
   ]]
   static judge(patterns) {
+    UC:
     for (pattern in patterns) {
-      if (!PixelSearchPre(&FoundX, &FoundY, pattern*)) {
-        return false
+      if (pattern[1] is Array) {
+        for (p in pattern) {
+          if (PixelSearchPre(&FoundX, &FoundY, p*)) {
+            continue UC
+          }
+        }
+      } else if (PixelSearchPre(&FoundX, &FoundY, pattern*)) {
+        continue
       }
+      return false
     }
     return true
   }
   page := 0
-  uc:
+  UC:
   loop (loopTimes) {
     for (i, pattern in patterns) {
       if (judge(pattern)) {
         page := i 
-        break uc
+        break UC
       }
     }
     Sleep(100)
diff --git a/utils/CoordsData.ahk b/utils/CoordsData.ahk
index 6e7b9b3..e4d2b03 100644
--- a/utils/CoordsData.ahk
+++ b/utils/CoordsData.ahk
@@ -9,6 +9,7 @@ class CoordsData {
         M: [1800, 880, 1821, 908, 0xffffff],
         Q: [1799, 1021, 1821, 1046, 0xffffff],
         T: [355, 35, 375, 60, 0xffffff],
+        Tab: [1825, 116, 1865, 141, 0xffffff],
         取消正在处理: [763, 608, 777, 644, 0xcb0000]
       },
       快捷手册: {
@@ -82,6 +83,7 @@ class CoordsData {
         M: [1170, 880, 1800, 920, 0xffffff],
         Q: [1770, 1020, 1790, 1050, 0xffffff],
         T: [480, 35, 510, 60, 0xffffff],
+        Tab: [1800, 100, 1850, 130, 0xffffff],
         取消正在处理: [694, 605, 715, 646, 0xcb0000]
       },
       零号选择: {
@@ -141,6 +143,7 @@ class CoordsData {
         M: [1170, 880, 1800, 920, 0xffffff],
         Q: [1770, 1020, 1790, 1050, 0xffffff],
         T: [480, 30, 500, 55, 0xffffff],
+        Tab: [1800, 100, 1850, 130, 0xffffff],
         取消正在处理: [690, 600, 720, 640, 0xcb0000]
       },
       快捷手册: {
@@ -207,6 +210,7 @@ class CoordsData {
         M: [1769, 935, 1787, 948, 0xffffff],
         Q: [1768, 1039, 1785, 1052, 0xffffff],
         T: [480, 25, 500, 50, 0xffffff],
+        Tab: [1804, 90, 1846, 104, 0xffffff],
         取消正在处理: [690, 590, 720, 620, 0xcb0000]
       },
       快捷手册: {
@@ -273,6 +277,7 @@ class CoordsData {
         M: [1768, 943, 1787, 957, 0xffffff],
         Q: [1769, 1042, 1786, 1054, 0xffffff],
         T: [480, 20, 510, 50, 0xffffff],
+        Tab: [1802, 84, 1847, 97, 0xffffff],
         取消正在处理: [700, 580, 720, 620, 0xcb0000]
       },
       快捷手册: {
@@ -337,6 +342,7 @@ class CoordsData {
     ;     M: [0xffffff], ; 4个所需坐标参数，左上XY、右下XY
     ;     Q: [0xffffff],
     ;     T: [0xffffff],
+    ;     Tab: [0xffffff],
     ;     取消正在处理: [0xcb0000]
     ;   },
     ;   快捷手册: {
diff --git "a/\351\233\266\345\217\267\344\270\232\347\273\251.ahk" "b/\351\233\266\345\217\267\344\270\232\347\273\251.ahk"
index 9f2fa28..66fd5e3 100644
--- "a/\351\233\266\345\217\267\344\270\232\347\273\251.ahk"
+++ "b/\351\233\266\345\217\267\344\270\232\347\273\251.ahk"
@@ -2,8 +2,8 @@
  * @description 绝区零零号空洞零号业绩自动刷取、自动银行存款脚本
  * @file 零号业绩.ahk
  * @author UCPr
- * @date 2024/11/21
- * @version v2.1.3
+ * @date 2024/11/26
+ * @version v2.1.4
  * @link https://github.com/UCPr251/zzzAuto
  * @warning 请勿用于任何商业用途，仅供学习交流使用
  ***********************************************************************/
@@ -42,7 +42,7 @@ SetMouseDelay(-1)
 #Include getDenny.ahk
 #Include enterHDD.ahk
 
-global Version := "v2.1.3"
+global Version := "v2.1.4"
 global ZZZ := "ahk_exe ZenlessZoneZero.exe"
 
 init()
@@ -202,7 +202,7 @@ retry(reason?) {
   RandomSleep()
   page := 0
   ; 卡在空洞走格子、交互、确认界面，子界面
-  uc:
+  UC:
   loop (6) {
     Press('Space', 2)
     if (PixelSearchPre(&X, &Y, c.空洞.确认*)) { ; 确认？
@@ -239,7 +239,7 @@ retry(reason?) {
           RandomSleep(5600, 5800)
           page := recogLocation()
           if (page)
-            break uc
+            break UC
         }
         Sleep(100)
       }