From 341f520f55cbcc80c88c063155f03ba398eca964 Mon Sep 17 00:00:00 2001
From: NaraLan0502 <129516870+NaraLan0502@users.noreply.github.com>
Date: Fri, 13 Jun 2025 00:04:11 +0800
Subject: [PATCH] =?UTF-8?q?[js]=E5=90=83=E9=87=91=E5=B8=81=E8=81=94?=
 =?UTF-8?q?=E6=9C=BA=E6=B4=BB=E5=8A=A8=EF=BC=9A=E8=81=94=E6=9C=BA=E6=9C=89?=
 =?UTF-8?q?=E4=BA=BA=E6=8B=92=E7=BB=9D=E6=97=B6=E7=9A=84=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=20(#1073)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add files via upload

* 传送至指定合成台

* Delete repo/js/蒙德合成台.json

* Delete repo/js/main.js

* Delete repo/js/manifest.json

* Delete repo/js/settings.json

* Delete repo/js/枫丹合成台.json

* Delete repo/js/璃月合成台.json

* Delete repo/js/稻妻合成台.json

* Update settings.json

* 去除main.js里的sleep函数，jsv8引擎不再必报错（maybe）

js小白，不要拷打我了😭😭😭

* Update main.js 新增默认选项

* Update settings.json

* Update manifest.json

* Add files via upload
---
 repo/js/AutoEatCoinPVPEvent/main.js | 38 +++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/repo/js/AutoEatCoinPVPEvent/main.js b/repo/js/AutoEatCoinPVPEvent/main.js
index 6f31ec9c..766f00c3 100644
--- a/repo/js/AutoEatCoinPVPEvent/main.js
+++ b/repo/js/AutoEatCoinPVPEvent/main.js
@@ -123,7 +123,7 @@
         await sleep(1000);
 
         // 7. 等待并确认匹配
-        let matchFound = false;
+        let matchFound = false,matchFound_1st = false;
         for (let i = 0; i < 60; i++) { // 最多等待60秒
             const confirmRegion = captureGameRegion().deriveCrop(
                 1037,
@@ -136,21 +136,39 @@
             const confirmResults = confirmRegion.findMulti(RecognitionObject.ocrThis);
             log.info("匹配确认区域OCR识别结果数量: {count}", confirmResults.count);
 
-            // 遍历所有识别结果
-            for (let j = 0; j < confirmResults.count; j++) {
-                const region = confirmResults[j];
-                // log.info("匹配确认区域OCR结果:位置({x},{y},{w},{h}), 文本: {text}",
-                //     region.x, region.y, region.width, region.height, region.text);
+            /*处理联机确认按钮
+                执行逻辑:（如有报错，自己改 或者 反馈naralan0502@gmail.com）
+                    如果OCR识别结果数量等于0，判断是否已经点击过确认按钮（通过变量matchFound_1st确认）
+                        是：设置matchFound为true，跳出循环
+                        否：继续循环
+                    如果OCR识别结果数量大于0，遍历所有识别结果
+                        如果存在确认按钮，设置变量matchFound_1st = true
+            */
+            if(confirmResults.count){
+                // 遍历所有识别结果
+                for (let j = 0; j < confirmResults.count; j++) {
+                    const region = confirmResults[j];
+                    // log.info("匹配确认区域OCR结果:位置({x},{y},{w},{h}), 文本: {text}",
+                    //     region.x, region.y, region.width, region.height, region.text);
 
-                if (region.text.includes("接受")) {
-                    log.info("匹配成功, 点击接受");
-                    click(1182, 737); // 点击确认按钮
+                    if (region.text.includes("接受")) {
+                        click(1182, 737); // 点击确认按钮
+                        matchFound_1st = true;
+                        break;
+                    }
+                }
+            }
+            else{
+                if(matchFound_1st) {
                     matchFound = true;
                     break;
                 }
             }
 
-            if (matchFound) break;
+            if (matchFound) {
+                log.info("匹配成功, 点击接受");
+                break;
+            }
             await sleep(1000);
         }