From 2d4be8a4da6a6e55952bb64f847c8260e85e9cde Mon Sep 17 00:00:00 2001
From: this-Fish <york5252@gmail.com>
Date: Mon, 8 Dec 2025 17:23:53 +0800
Subject: [PATCH] =?UTF-8?q?JS=20:=E3=80=80=E8=87=AA=E5=8A=A8=E5=90=88?=
 =?UTF-8?q?=E6=88=90=E6=B5=93=E7=BC=A9=E6=A0=91=E8=84=821.3=20(#2453)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 合成树脂前先解除筛选状态

* Add tags and author link to manifest.json

* 修正

更改默认合成台為蒙德合成台

* Update README.md for AutoRefinedCondensationResin
---
 .../js/AutoRefinedCondensationResin/README.md |  18 +++++--
 .../assets/RecognitionObject/Clear.png        | Bin 0 -> 616 bytes
 repo/js/AutoRefinedCondensationResin/main.js  |  44 ++++++++++--------
 .../manifest.json                             |   2 +-
 .../settings.json                             |   4 +-
 5 files changed, 43 insertions(+), 25 deletions(-)
 create mode 100644 repo/js/AutoRefinedCondensationResin/assets/RecognitionObject/Clear.png

diff --git a/repo/js/AutoRefinedCondensationResin/README.md b/repo/js/AutoRefinedCondensationResin/README.md
index ecbd21dd6..a95a7d43b 100644
--- a/repo/js/AutoRefinedCondensationResin/README.md
+++ b/repo/js/AutoRefinedCondensationResin/README.md
@@ -15,6 +15,18 @@
 ## 参数说明
 | 参数名     | 类型       | 说明                                                                 |
 |------------|------------|----------------------------------------------------------------------|
-| location   | 下拉选择   | **合成台位置**<br>可选：蒙德/璃月/稻妻/枫丹<br>默认：璃月合成台      |
-| everyDay   | 复选框     | **每日执行开关**<br>开启后无视星期设置，每日自动执行                 |
-| week       | 文本输入   | **指定执行星期**<br>格式：逗号分隔数字（1=周一,7=周日）<br>例：`2,3,4,5,6,7` |
\ No newline at end of file
+| **合成台位置**   | 下拉选择   | 可选：蒙德/璃月/稻妻/枫丹<br>默认：璃月合成台      |
+| **每日执行开关**   | 复选框     | 开启后无视星期设置，每日自动执行                 |
+| **指定执行星期**       | 文本输入   | 格式：逗号分隔数字（1=周一,7=周日）<br>例：`2,3,4,5,6,7` |
+
+
+### 更新日志
+### 1.3
+1. 更改默认合成台為蒙德合成台
+### 1.2
+1. 合成树脂前先解除筛选状态
+### 1.1
+1. 修正指定执行星期只输入1个数字时执行错误
+### 1.0
+
+1. 初始版本发布
diff --git a/repo/js/AutoRefinedCondensationResin/assets/RecognitionObject/Clear.png b/repo/js/AutoRefinedCondensationResin/assets/RecognitionObject/Clear.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcd175bb34304f3c4fe8c85fc282912000ce85cc
GIT binary patch
literal 616
zcmV-u0+;=XP)<h;3K|Lk000e1NJLTq000;O000~a0{{R3OgN9+00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA0TfV7R7FHbQB_G&rczePRanYZSgBH0T1iq|
zN>YPPRf0}col#ckSzG^HT<Tg|qEc7fSX%d6T=-jD`deK7TwMEHT=-mF-dS7nTU-5H
zT>o8N-&tDgT3hW}TkTt1>RViJOjLVKRC-NRMn_R=OH*`ARBudFOh{4GS6Sd$Ti94y
zQb|%yNK))tTjg0>;#pefSzG*ETv<s{w^UexPE~VEREADfs#90=TU((~R%1(3%~n}s
zN>flsQqoshm{3;lT3hp5Tc1%@^;}$MOH<KTS=CorY)n&@QC09;S^8XDyj56=PgUMn
zT8mFre@;}6P*t#0SM^+5`CDB1TwVKJUH)BNSV>Y!NKv#@Sl?J$-&tErNKu>19{&IU
z0PRUcK~#90V`RVq7zs)+0s+H+CdOY#66`=BkOWxzHv_}}|34uT{1AzsU^Rak7+4rz
zK_tW(zn~b;%kUf`A;pO51V+Y35D9rSr!oF}2$4`i*YWorL_!V2sA~`j?T0)f@4j&`
zhyq>ngG-e0h2(jd1gj$BxAzPmwVyD2S7Ut0h>*|*dhZ^CGUFWv)o0R-HxUvhj6bkT
zn4K|YJi(y<;UR-1Q1697F7d()$UVT|$heO|Ns*E9I6{Ke@Hq2N2Dkmc8Q2{d84trH
zUa~MSz#@^Cf#J8)Du_flC~A2TspEs-Qex5-(Gma!6mcEUpMntp0000<MNUMnLSTYy
C_WkSt

literal 0
HcmV?d00001

diff --git a/repo/js/AutoRefinedCondensationResin/main.js b/repo/js/AutoRefinedCondensationResin/main.js
index 0f0f4c900..d86babce9 100644
--- a/repo/js/AutoRefinedCondensationResin/main.js
+++ b/repo/js/AutoRefinedCondensationResin/main.js
@@ -1,8 +1,9 @@
 // 识图资料
 const confirmRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/confirm.png"));
 const CondensedResin = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/Condensed_Resin.png"));
+const Clear = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/Clear.png"));
 // 读取配置文件
-const location = settings.location;
+let location = settings.location;
 const settingsWeek = settings.week;
 const everyDay = settings.everyDay;
 
@@ -34,6 +35,7 @@ async function condensedResin() {
         captureRegion.dispose();
         for (let i = 0; i < resList.count; i++) {
             if (resList[i].text.includes("合成")) {
+
                 // 找到合成台，点击合成台
                 log.info("寻找合成台成功,开始与合成台交互");
                 keyDown("VK_MENU");// Alt
@@ -45,6 +47,16 @@ async function condensedResin() {
                 keyUp("VK_MENU");// Alt
                 await sleep(1000);
 
+                const ro0 = captureGameRegion();
+                let Resin0 = ro0.find(Clear);
+                ro0.dispose();
+                if (Resin0.isExist()) {
+                    log.info("筛选中,先取消筛选");
+                    await sleep(750);
+                    Resin0.click();
+                    await sleep(750);
+                }
+
                 // 图像识别浓缩树脂
                 const ro1 = captureGameRegion();
                 let Resin = ro1.find(CondensedResin);
@@ -58,7 +70,7 @@ async function condensedResin() {
                     ro2.dispose();
                     if (confirm.isExist()) {
                         confirm.click(); // 点击合成
-                        await sleep(5000);
+                        await sleep(3000);
                         click(975, 900); // 点击确认，关闭合成成功资料
                         log.info("已完成合成浓缩树脂");
                     }
@@ -98,24 +110,21 @@ async function condensedResin() {
 }
 
 (async function () {
+    // 获取
     function validateAndStoreNumbers(input) {
-        // 定义存储结果的数组
-        let storedNumbers = [];
-
+        // 去除所有空格
+        const cleanedInput = input.replace(/\s/g, '');
+        
         // 使用正则表达式检测是否符合期望格式
-        const regex = /^(\b([1-9]|1[0-5])\b)(,(\b([1-9]|1[0-5])\b))*$/;
-
+        const regex = /^([1-7])(,([1-7]))*$/;
+        
         // 检测输入字符串是否符合正则表达式
-        if (regex.test(input)) {
+        if (regex.test(cleanedInput)) {
             // 将输入字符串按逗号分割成数组
-            const numbers = input.split(',');
-
-            // 将分割后的数字字符串转换为整数并存储到数组中
-            storedNumbers = numbers.map(Number);
-
-            return storedNumbers;
+            const numbers = cleanedInput.split(',');
+            return numbers.map(Number);
         } else {
-            return false
+            return false;
         }
     }
 
@@ -137,9 +146,6 @@ async function condensedResin() {
         return dayOfWeek === 0 ? 7 : dayOfWeek;
     }
 
-
-
-
     //main/======================================================================================
     setGameMetrics(1920, 1080, 1)
     await genshin.returnMainUi();
@@ -152,7 +158,7 @@ async function condensedResin() {
         log.info("已开启每天都合成体力，无视星期设置");
         try {
             if (!location) {
-                location = "璃月合成台";
+                location = "蒙德合成台";
                 log.info(`未设置传送位置，默认前往 ${location}...`);
             }
             log.info(`正在前往 ${location} 合成浓缩树脂`);
diff --git a/repo/js/AutoRefinedCondensationResin/manifest.json b/repo/js/AutoRefinedCondensationResin/manifest.json
index a2b145149..0b97447d2 100644
--- a/repo/js/AutoRefinedCondensationResin/manifest.json
+++ b/repo/js/AutoRefinedCondensationResin/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "自动合成浓缩树脂",
-  "version": "1.1",
+  "version": "1.3",
   "bgi_version": "0.47.0",
   "description": "\n可前往多国合成台自动合成浓缩树脂（仅支持中文语言）。\n通过OCR技术确保准确进入合成台并完成合成操作。\n可设置特定星期执行任务（例：输入\"1,3,5,7\"在周一/三/五/日执行）。\n特殊时间处理：00:00~04:00视为前一天。",
   "tags": [
diff --git a/repo/js/AutoRefinedCondensationResin/settings.json b/repo/js/AutoRefinedCondensationResin/settings.json
index d4af67c43..7a0a403d5 100644
--- a/repo/js/AutoRefinedCondensationResin/settings.json
+++ b/repo/js/AutoRefinedCondensationResin/settings.json
@@ -2,7 +2,7 @@
   {
     "name": "location",
     "type": "select",
-    "label": "合成台位置（默认：璃月合成台）",
+    "label": "合成台位置（默认：蒙德合成台）",
     "options": [
       "蒙德合成台",
       "璃月合成台",
@@ -11,7 +11,7 @@
       //"纳塔合成台",
       "枫丹合成台"
     ],
-    "default": "璃月合成台"
+    "default": "蒙德合成台"
   },
   {
     "name": "everyDay",