From 8b2eb5aea2c14b0dcdfad9a4235e550ee61b9c5d Mon Sep 17 00:00:00 2001
From: LXYan2333 <z00823823@126.com>
Date: Fri, 5 Sep 2025 01:28:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=82=B9=E5=87=BB=E8=BF=87?=
 =?UTF-8?q?=E6=9C=9F=E7=89=A9=E5=93=81=E7=9A=84=E6=8C=89=E9=92=AE=20(#1819?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/RecognitionObject/ConfirmButton.png | Bin 0 -> 2048 bytes
 .../main.js                                   |  32 ++++++++++++++++++
 .../settings.json                             |   4 +--
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 repo/js/AutoArtifactsSalvageOrDestroy（1-4star）/assets/RecognitionObject/ConfirmButton.png

diff --git a/repo/js/AutoArtifactsSalvageOrDestroy（1-4star）/assets/RecognitionObject/ConfirmButton.png b/repo/js/AutoArtifactsSalvageOrDestroy（1-4star）/assets/RecognitionObject/ConfirmButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..78d72f2993c10c250154aeb18fe31314adbe5dd6
GIT binary patch
literal 2048
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

literal 0
HcmV?d00001

diff --git a/repo/js/AutoArtifactsSalvageOrDestroy（1-4star）/main.js b/repo/js/AutoArtifactsSalvageOrDestroy（1-4star）/main.js
index 362198d26..90862090a 100644
--- a/repo/js/AutoArtifactsSalvageOrDestroy（1-4star）/main.js
+++ b/repo/js/AutoArtifactsSalvageOrDestroy（1-4star）/main.js
@@ -1,3 +1,5 @@
+const outDatedRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/ConfirmButton.png"), 760, 700, 100, 100);
+
 (async function () {
     // 读取用户设置
     let operationType = settings.operationType || "分解"; // 默认为分解
@@ -11,10 +13,36 @@
     log.debug(`操作次数: ${times}`);
     log.debug(`包含一星: ${includeOneStar}, 包含二星: ${includeTwoStar}, 包含三星: ${includeThreeStar}, 包含四星: ${includeFourStar}`);
 
+    // 点击过期按钮
+    async function findAndClick(target, maxAttempts = 20) {
+        for (let attempts = 0; attempts < maxAttempts; attempts++) {
+            const gameRegion = captureGameRegion();
+            try {
+                const result = gameRegion.find(target);
+                if (result.isExist) {
+                    result.click();
+                    return true;                 // 成功立刻返回
+                }
+                log.warn(`识别失败，第 ${attempts + 1} 次重试`);
+            } catch (err) {
+            } finally {
+                gameRegion.dispose();
+            }
+            if (attempts < maxAttempts - 1) {   // 最后一次不再 sleep
+                await sleep(250);
+            }
+        }
+        return false;
+    }
+
     // 分解圣遗物
     async function salvage() {
         await genshin.returnMainUi();
         keyPress("B"); await sleep(2000); // 打开背包
+        if (await findAndClick(outDatedRo)) {
+            log.info("检测到过期物品弹窗，处理");
+            await sleep(1000);
+        }
         click(670, 40); await sleep(1000); // 点击圣遗物
         click(660, 1010); await sleep(1000); // 点击分解
         click(300, 1020); await sleep(1000); // 点击快速选择
@@ -38,6 +66,10 @@
     async function destroy() {
         await genshin.returnMainUi();
         keyPress("B"); await sleep(2000); // 打开背包
+        if (await findAndClick(outDatedRo)) {
+            log.info("检测到过期物品弹窗，处理");
+            await sleep(1000);
+        }
         click(670, 40); await sleep(1000); // 点击圣遗物
         
         for (let i = 0; i < times; i++) {
diff --git a/repo/js/AutoArtifactsSalvageOrDestroy（1-4star）/settings.json b/repo/js/AutoArtifactsSalvageOrDestroy（1-4star）/settings.json
index f70979ee9..223faf258 100644
--- a/repo/js/AutoArtifactsSalvageOrDestroy（1-4star）/settings.json
+++ b/repo/js/AutoArtifactsSalvageOrDestroy（1-4star）/settings.json
@@ -4,8 +4,8 @@
     "type": "select",
     "label": "操作类型（默认：分解）",
     "options": [
-      "分解",
-      "摧毁"
+      "分解（经验瓶）",
+      "摧毁（摩拉）"
     ]
   },
   {