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": [ "七圣召唤"