From 149c713d1a4192697db6e548034dbb055841d6b0 Mon Sep 17 00:00:00 2001 From: 5117600049 <511760049@qq.com> Date: Wed, 3 Sep 2025 11:14:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E7=89=8C=E4=B8=80=E6=9D=A1=E9=BE=99:?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E7=BB=93=E6=9E=9C=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E7=9A=84=E5=BC=82=E5=B8=B8=E5=AF=B9=E5=B1=80?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=BA=86=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E8=A7=92=E8=89=B2=E9=80=80=E5=87=BA=E5=AF=B9=E5=B1=80?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=B8=8D=E5=90=8C=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20(#1793)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update manifest.json * Update main.js * Update repo/js/七圣召唤七日历练全自动/main.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: 秋云 Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- repo/js/七圣召唤七日历练全自动/main.js | 6 +++++- repo/js/七圣召唤七日历练全自动/manifest.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/repo/js/七圣召唤七日历练全自动/main.js b/repo/js/七圣召唤七日历练全自动/main.js index 97be120b4..d21727053 100644 --- a/repo/js/七圣召唤七日历练全自动/main.js +++ b/repo/js/七圣召唤七日历练全自动/main.js @@ -204,6 +204,7 @@ async function isTaskRefreshed(filePath, options = {}) { //检查挑战结果 await checkChallengeResults(); async function checkChallengeResults() { const region1 = RecognitionObject.ocr(785, 200, 380, 270); // 结果区域 + const region2 = RecognitionObject.ocr(1520, 170, 160, 40); // 退出位置 let capture = captureGameRegion(); let res1 = capture.find(region1); log.info(`结果识别:${res1.text}`); @@ -234,7 +235,9 @@ async function checkChallengeResults() { await sleep(500); click(1860,50); //点击齿轮图标 await sleep(1000); - click(1600, 200);//点击退出选项 + let res2 = captureGameRegion().find(region2); + if (res2.text.includes('设置')) click(1600, 260);//点击退出-选项4 + else click(1600, 200);//点击退出-选项3 await sleep(1000); click(1180, 756);//点击确认 await sleep(6000); @@ -716,3 +719,4 @@ await main(); })(); + diff --git a/repo/js/七圣召唤七日历练全自动/manifest.json b/repo/js/七圣召唤七日历练全自动/manifest.json index 61521a8c1..224eba1f4 100644 --- a/repo/js/七圣召唤七日历练全自动/manifest.json +++ b/repo/js/七圣召唤七日历练全自动/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "打牌一条龙", - "version": "2.1", + "version": "2.2", "description": "详见README.md", "tags": [ "七圣召唤"