From 0fff7cf8d1c0fa767dc679b668cbe26d1c6022c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=8F=90=E7=93=A6=E7=89=B9=E9=92=93=E9=B1=BC=E7=8E=B3?=
 =?UTF-8?q?=E5=B8=88?= <144542161+Hijiwos@users.noreply.github.com>
Date: Thu, 6 Nov 2025 21:39:33 +0800
Subject: [PATCH] =?UTF-8?q?JS=E8=84=9A=E6=9C=AC=EF=BC=9A=E6=8F=90=E7=93=A6?=
 =?UTF-8?q?=E7=89=B9=E8=87=AA=E5=8A=A8=E9=92=93=E9=B1=BC=E3=80=90=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=20(#2320)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 优化垂钓点跳过逻辑

* 回退部分更改
---
 repo/js/AutoFishingTeyvat/main.js       | 6 ++++--
 repo/js/AutoFishingTeyvat/manifest.json | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/repo/js/AutoFishingTeyvat/main.js b/repo/js/AutoFishingTeyvat/main.js
index cac8c1d54..6c60b34ef 100644
--- a/repo/js/AutoFishingTeyvat/main.js
+++ b/repo/js/AutoFishingTeyvat/main.js
@@ -511,10 +511,12 @@
 
             }
             // 本次已经到达4点(5s容错)
-            if (new Date() > time_4.setSeconds(time_4.getSeconds())) {
+            if (new Date() > time_4.setSeconds(time_4.getSeconds()) && new Date() < time_4.setSeconds(time_4.getSeconds() + 5)) {
                 await sleep(5000);
                 step_flag += 1;
                 auto_skip = false;
+            } else {
+                await sleep(10);
             }
             // 领取月卡(点击两次)
             if (step_flag === 2) {
@@ -658,7 +660,7 @@
 
         // 获取当前用户UID
         let uid = "default_user";
-        if (fishing_cd) {
+        if (fishing_cd && !is_con) {
             const ocrRoUid = RecognitionObject.Ocr(166, 198, 120, 22);
             const ocrRoText = RecognitionObject.Ocr(1565, 997, 177, 39);
 
diff --git a/repo/js/AutoFishingTeyvat/manifest.json b/repo/js/AutoFishingTeyvat/manifest.json
index a3ee85f3e..5e156d52d 100644
--- a/repo/js/AutoFishingTeyvat/manifest.json
+++ b/repo/js/AutoFishingTeyvat/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "提瓦特自动钓鱼（全流程+自选）",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "bgi_version": "0.47.0",
   "description": "支持自动追踪并垂钓bgi支持的全提瓦特垂钓点",
   "authors": [