From 447d905c9f2b2ceb889d610f5853bd96a8b0758a Mon Sep 17 00:00:00 2001
From: 5117600049 <511760049@qq.com>
Date: Tue, 8 Jul 2025 23:54:49 +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=EF=BC=9A=E5=B0=86=E4=BA=BA=E7=89=A9=E6=8C=91?=
 =?UTF-8?q?=E6=88=98=E5=AE=8C=E6=88=90=E5=88=A4=E6=96=AD=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=BA=E6=9B=B4=E5=8F=AF=E9=9D=A0=E7=9A=84=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=20(#1307)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../七圣召唤七日历练全自动/assets/completed.png  | Bin 0 -> 2200 bytes
 repo/js/七圣召唤七日历练全自动/main.js           |  11 ++++++-----
 repo/js/七圣召唤七日历练全自动/manifest.json     |   4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 repo/js/七圣召唤七日历练全自动/assets/completed.png

diff --git a/repo/js/七圣召唤七日历练全自动/assets/completed.png b/repo/js/七圣召唤七日历练全自动/assets/completed.png
new file mode 100644
index 0000000000000000000000000000000000000000..46eba3c49eacf0004ca710f96aa9ee30cae30176
GIT binary patch
literal 2200
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
aUHKM)(!RB)ilh|)0000<MNUMnLSTZxeH(26

literal 0
HcmV?d00001

diff --git a/repo/js/七圣召唤七日历练全自动/main.js b/repo/js/七圣召唤七日历练全自动/main.js
index 5089ba0b..a7763593 100644
--- a/repo/js/七圣召唤七日历练全自动/main.js
+++ b/repo/js/七圣召唤七日历练全自动/main.js
@@ -161,9 +161,10 @@ async function isTaskRefreshed(filePath, options = {}) {
         // 如果文件不存在，创建新文件并返回true(视为需要刷新)
         const createResult = await file.writeText(filePath, '');
         if (createResult) {
-            log.info("创建新文件成功");
-         await isTaskRefreshed(filePath, options = {});
+            log.info("创建新时间记录文件成功，执行脚本");
+            return true;
         }
+        else throw new Error(`创建新文件失败`);
     }
 }
 
@@ -342,13 +343,13 @@ async function captureAndStoreTexts() {
     for (const pos of positions) {
         // 创建OCR识别区域
         const ocrRo = RecognitionObject.ocr(pos.x, pos.y, width, height); //挑战者名字区域
-        const ocrRo2 = RecognitionObject.ocr(pos.x, pos.y + 100, width, height); //挑战是否完成
+        const ocrRo2 = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/completed.png"),pos.x, pos.y + 60, width, height+80);
         // 在指定区域进行OCR识别
         const result = captureRegion.find(ocrRo);
-        const result2 = captureRegion.find(ocrRo2);
+        let res2 = captureRegion.find(ocrRo2);
         if (!result.isEmpty() && result.text) {
             // 存储识别结果和对应位置
-            if (result2.text == "追踪") {
+            if (res2.isExist()) {
                 log.info(`识别到文本: ${result.text} 位置: (${pos.x}, ${pos.y})`);
                 textArray.push({
                     text: result.text.trim(),
diff --git a/repo/js/七圣召唤七日历练全自动/manifest.json b/repo/js/七圣召唤七日历练全自动/manifest.json
index 01ad9226..ca685d01 100644
--- a/repo/js/七圣召唤七日历练全自动/manifest.json
+++ b/repo/js/七圣召唤七日历练全自动/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "打牌一条龙",
-  "version": "1.9.6",
+  "version": "1.9.7",
   "description": "已添加 CD 管理，执行完后会检测是否全部挑战成功，之后会记录本次时间进入CD，如果想要重置请前往assets/weekly.txt中删除内容",
   "authors": [
     {
@@ -11,4 +11,4 @@
   ],
   "settings_ui": "settings.json",
   "main": "main.js"
-}
\ No newline at end of file
+}