From e7a594a6332a7fc82322c1bcf7aa93bedc80d6b9 Mon Sep 17 00:00:00 2001
From: Zhicheng Zhang <20331014+zzc-tongji@users.noreply.github.com>
Date: Mon, 12 May 2025 10:25:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8B=8D=E6=99=B6=E8=9E=BA?=
 =?UTF-8?q?=E7=9A=84=E9=87=87=E9=9B=86=E8=84=9A=E6=9C=AC=E3=80=82=20(#783)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* update 苍晶螺采集水下(77个)

* 优化苍晶螺的引导
---
 repo/js/苍晶螺采集水下(77个)/main.js          | 292 ++++++++++++++----
 repo/js/苍晶螺采集水下(77个)/manifest.json    |   8 +-
 repo/js/苍晶螺采集水下(77个)/settings.json    | 110 +++++++
 repo/pathing/地方特产/枫丹/苍晶螺/README.md   |   2 +-
 .../苍晶螺/详见-JS脚本-苍晶螺采集水下(77个).txt |   0
 5 files changed, 345 insertions(+), 67 deletions(-)
 create mode 100644 repo/js/苍晶螺采集水下(77个)/settings.json
 create mode 100644 repo/pathing/地方特产/枫丹/苍晶螺/详见-JS脚本-苍晶螺采集水下(77个).txt

diff --git a/repo/js/苍晶螺采集水下(77个)/main.js b/repo/js/苍晶螺采集水下(77个)/main.js
index 34af675e..970475f8 100644
--- a/repo/js/苍晶螺采集水下(77个)/main.js
+++ b/repo/js/苍晶螺采集水下(77个)/main.js
@@ -1,80 +1,248 @@
 (async function () {
 
+  dispatcher.addTimer(new RealtimeTimer("AutoPick", { "forceInteraction": true }));
 
-dispatcher.addTimer(new RealtimeTimer("AutoPick", { "forceInteraction": true }));
+  if (!settings.enable) {
+    log.error(`请打开「JS脚本自定义配置」，然后阅读并勾选第一个复选框。`);
+    return
+  }
 
-await genshin.tp(5035.94,3672.92);//安眠处1
-await sleep(1000);
-await keyMouseScript.runFile(`assets/安眠处地面1-3.json`);
+  log.info('安眠处地面1，3个。');
+  if (settings.selectAll || settings.annapausis1) {
+    try {
+      await genshin.tp(5035.94, 3672.92);//安眠处1
+      await sleep(1000);
+      await keyMouseScript.runFile(`assets/安眠处地面1-3.json`);
+    } catch (error) {
+      log.warn(error.message);
+      log.warn('传送错误，跳过。');
+    }
+  } else {
+    log.info('跳过。');
+  }
 
+  log.info('安眠处地面3，6个。');
+  if (settings.selectAll || settings.annapausis3) {
+    try {
+      await genshin.tp(4939.90, 3564.62);//安眠处2
+      await sleep(1000);
+      await keyMouseScript.runFile(`assets/安眠处地面3-6.json`);
+    } catch (error) {
+      log.warn(error.message);
+      log.warn('传送错误，跳过。');
+    }
+  } else {
+    log.info('跳过。');
+  }
 
-await genshin.tp(4939.90,3564.62);//安眠处2
-await sleep(1000);
-await keyMouseScript.runFile(`assets/安眠处地面3-6.json`);
+  log.info('安眠处地面4，8个。');
+  if (settings.selectAll || settings.annapausis4) {
+    try {
+      await genshin.tp(4939.90, 3564.62);//安眠处2
+      await sleep(1000);
+      await keyMouseScript.runFile(`assets/安眠处地面4-8.json`);
+    } catch (error) {
+      log.warn(error.message);
+      log.warn('传送错误，跳过。');
+    }
+  } else {
+    log.info('跳过。');
+  }
 
-await genshin.tp(4939.90,3564.62);//安眠处2
-await sleep(1000);
-await keyMouseScript.runFile(`assets/安眠处地面4-8.json`);
+  log.info('安眠处地面5，6个。');
+  if (settings.selectAll || settings.annapausis5) {
+    try {
+      await genshin.tp(4939.90, 3564.62);//安眠处2
+      await sleep(1000);
+      await keyMouseScript.runFile(`assets/安眠处地面5-6.json`);
+    } catch (error) {
+      log.warn(error.message);
+      log.warn('传送错误，跳过。');
+    }
+  } else {
+    log.info('跳过。');
+  }
 
-await genshin.tp(4939.90,3564.62);//安眠处2
-await sleep(1000);
-await keyMouseScript.runFile(`assets/安眠处地面5-6.json`);
-//3
-await genshin.tp(4259.14,2704.10,true);//白松镇1
-await sleep(1000);
-await keyMouseScript.runFile(`assets/白松镇1-3.json`);
-//9
-await genshin.tp(4234.85,3121.65);//自然哲学学院1，有概率失败
-await sleep(1000);
-await keyMouseScript.runFile(`assets/自然哲学学院1.json`);
-//4
-await genshin.tp(4175.23,3280.54);//自然哲学学院2
-await sleep(1000);
-await keyMouseScript.runFile(`assets/自然哲学学院2.json`);
-//4
-await genshin.tp(4191.45,3802.76);//塔拉塔海沟
-await sleep(1000);
-await keyMouseScript.runFile(`assets/塔拉塔海谷1.json`);
-//4
-await genshin.tp(4012.88,3434.90);//塞洛海原1
-await sleep(1000);
-await keyMouseScript.runFile(`assets/塞洛海原1.json`);
+  log.info('白松镇1，3个。');
+  if (settings.selectAll || settings.poisson1) {
+    try {
+      //3
+      await genshin.tp(4259.14, 2704.10, true);//白松镇1
+      await sleep(1000);
+      await keyMouseScript.runFile(`assets/白松镇1-3.json`);
+    } catch (error) {
+      log.warn(error.message);
+      log.warn('传送错误，跳过。');
+    }
+  } else {
+    log.info('跳过。');
+  }
 
-//5
-await genshin.tp(3965.72,3235.31);//塞洛海原2
-await sleep(1000);
-await keyMouseScript.runFile(`assets/塞洛海原2.json`);
+  log.info('自然哲学学院1，9个。');
+  if (settings.selectAll || settings.instituteOfNaturalPhilosophy1) {
+    try {
+      //9
+      await genshin.tp(4234.85, 3121.65);//自然哲学学院1，有概率失败
+      await sleep(1000);
+      await keyMouseScript.runFile(`assets/自然哲学学院1.json`);
+    } catch (error) {
+      log.warn(error.message);
+      log.warn('传送错误，跳过。');
+    }
+  } else {
+    log.info('跳过。');
+  }
 
-//3
-await genshin.tp(4396.86,3092.05);//塞洛海原3
-await sleep(1000);
-await keyMouseScript.runFile(`assets/塞洛海原3.json`);
-//5
-await genshin.tp(4396.86,3092.05);//塞洛海原3
-await sleep(1000);
-await keyMouseScript.runFile(`assets/塞洛海原4.json`);
+  log.info('自然哲学学院2，4个。');
+  if (settings.selectAll || settings.instituteOfNaturalPhilosophy2) {
+    try {
+      //4
+      await genshin.tp(4175.23, 3280.54);//自然哲学学院2
+      await sleep(1000);
+      await keyMouseScript.runFile(`assets/自然哲学学院2.json`);
+    } catch (error) {
+      log.warn(error.message);
+      log.warn('传送错误，跳过。');
+    }
+  } else {
+    log.info('跳过。');
+  }
 
-//5
-await genshin.tp(4487.10,2801.05);//苍晶区1
-await sleep(1000);
-await keyMouseScript.runFile(`assets/苍晶区1.json`);
+  log.info('自塔拉塔海谷1，4个。');
+  if (settings.selectAll || settings.thalattaSubmarineCanyon1) {
+    try {
+      //4
+      await genshin.tp(4191.45, 3802.76);//塔拉塔海沟
+      await sleep(1000);
+      await keyMouseScript.runFile(`assets/塔拉塔海谷1.json`);
+    } catch (error) {
+      log.warn(error.message);
+      log.warn('传送错误，跳过。');
+    }
+  } else {
+    log.info('跳过。');
+  }
 
-//8
-await genshin.tp(4775.41,3145.85);//枫丹廷区1
-await sleep(1000);
-await keyMouseScript.runFile(`assets/枫丹廷区1.json`);
-//2
-await genshin.tp(4775.41,3145.85);//枫丹廷区1
-await sleep(1000);
-await keyMouseScript.runFile(`assets/枫丹廷区2.json`);
+  log.info('塞洛海原1，4个。');
+  if (settings.selectAll || settings.salaciaPlain1) {
+    try {
+      //4
+      await genshin.tp(4012.88, 3434.90);//塞洛海原1
+      await sleep(1000);
+      await keyMouseScript.runFile(`assets/塞洛海原1.json`);
+    } catch (error) {
+      log.warn(error.message);
+      log.warn('传送错误，跳过。');
+    }
+  } else {
+    log.info('跳过。');
+  }
 
-//3
-await genshin.tp(4775.41,3145.85);//枫丹廷区1
-await sleep(1000);
-await keyMouseScript.runFile(`assets/枫丹廷区3.json`);
+  log.info('塞洛海原2，5个。');
+  if (settings.selectAll || settings.salaciaPlain2) {
+    try {
+      //5
+      await genshin.tp(3965.72, 3235.31);//塞洛海原2
+      await sleep(1000);
+      await keyMouseScript.runFile(`assets/塞洛海原2.json`);
+    } catch (error) {
+      log.warn(error.message);
+      log.warn('传送错误，跳过。');
+    }
+  } else {
+    log.info('跳过。');
+  }
 
-dispatcher.addTimer(new RealtimeTimer("AutoPick", { "forceInteraction": false }));
+  log.info('塞洛海原3，3个。');
+  if (settings.selectAll || settings.salaciaPlain3) {
+    try {
+      //3
+      await genshin.tp(4396.86, 3092.05);//塞洛海原3
+      await sleep(1000);
+      await keyMouseScript.runFile(`assets/塞洛海原3.json`);
+    } catch (error) {
+      log.warn(error.message);
+      log.warn('传送错误，跳过。');
+    }
+  } else {
+    log.info('跳过。');
+  }
 
+  log.info('塞洛海原4，5个。');
+  if (settings.selectAll || settings.salaciaPlain4) {
+    try {
+      //5
+      await genshin.tp(4396.86, 3092.05);//塞洛海原3
+      await sleep(1000);
+      await keyMouseScript.runFile(`assets/塞洛海原4.json`);
+    } catch (error) {
+      log.warn(error.message);
+      log.warn('传送错误，跳过。');
+    }
+  } else {
+    log.info('跳过。');
+  }
 
+  log.info('苍晶区1，5个。');
+  if (settings.selectAll || settings.eltonTrench1) {
+    try {
+      //5
+      await genshin.tp(4487.10, 2801.05);//苍晶区1
+      await sleep(1000);
+      await keyMouseScript.runFile(`assets/苍晶区1.json`);
+    } catch (error) {
+      log.warn(error.message);
+      log.warn('传送错误，跳过。');
+    }
+  } else {
+    log.info('跳过。');
+  }
+
+  log.info('枫丹廷区1，8个。');
+  if (settings.selectAll || settings.courtOfFontaine1) {
+    try {
+      //8
+      await genshin.tp(4775.41, 3145.85);//枫丹廷区1
+      await sleep(1000);
+      await keyMouseScript.runFile(`assets/枫丹廷区1.json`);
+    } catch (error) {
+      log.warn(error.message);
+      log.warn('传送错误，跳过。');
+    }
+  } else {
+    log.info('跳过。');
+  }
+
+  log.info('枫丹廷区2，2个。');
+  if (settings.selectAll || settings.courtOfFontaine2) {
+    try {
+      //2
+      await genshin.tp(4775.41, 3145.85);//枫丹廷区1
+      await sleep(1000);
+      await keyMouseScript.runFile(`assets/枫丹廷区2.json`);
+    } catch (error) {
+      log.warn(error.message);
+      log.warn('传送错误，跳过。');
+    }
+  } else {
+    log.info('跳过。');
+  }
+
+  log.info('枫丹廷区3，3个。');
+  if (settings.selectAll || settings.courtOfFontaine3) {
+    try {
+      //3
+      await genshin.tp(4775.41, 3145.85);//枫丹廷区1
+      await sleep(1000);
+      await keyMouseScript.runFile(`assets/枫丹廷区3.json`);
+    } catch (error) {
+      log.warn(error.message);
+      log.warn('传送错误，跳过。');
+    }
+  } else {
+    log.info('跳过。');
+  }
+
+  dispatcher.addTimer(new RealtimeTimer("AutoPick", { "forceInteraction": false }));
 
 })();
diff --git a/repo/js/苍晶螺采集水下(77个)/manifest.json b/repo/js/苍晶螺采集水下(77个)/manifest.json
index c44ba5b2..8a41016b 100644
--- a/repo/js/苍晶螺采集水下(77个)/manifest.json
+++ b/repo/js/苍晶螺采集水下(77个)/manifest.json
@@ -1,12 +1,12 @@
 {
   "manifest_version": 1,
   "name": "苍晶螺拾取",
-  "version": "1.0",
-  "description": "键鼠脚本使用双风芭芭拉录制，请将采集队伍按照这个标准配置，可以提升采集成功率",
+  "version": "1.1",
+  "description": "键鼠脚本使用「芭芭拉+双风」录制。请将采集队伍按照这个标准配置，可以提升采集成功率。",
   "authors": [
     {
-        "name": "柒叶子",
-        "link": "https://github.com/511760049"
+      "name": "柒叶子",
+      "link": "https://github.com/5117600049"
     }
   ],
   "settings_ui": "settings.json",
diff --git a/repo/js/苍晶螺采集水下(77个)/settings.json b/repo/js/苍晶螺采集水下(77个)/settings.json
new file mode 100644
index 00000000..74cfe7bd
--- /dev/null
+++ b/repo/js/苍晶螺采集水下(77个)/settings.json
@@ -0,0 +1,110 @@
+[
+  {
+    "name": "enable",
+    "type": "checkbox",
+    "label": "键鼠脚本使用「芭芭拉+双风」录制。\n请将采集队伍按照这个标准配置，可以提升采集成功率。\n\n我已阅读，启用脚本。",
+    "default": false
+  },
+  {
+    "name": "selectAll",
+    "type": "checkbox",
+    "label": "无视后续选项，运行全部区域。",
+    "default": false
+  },
+  {
+    "name": "annapausis1",
+    "type": "checkbox",
+    "label": "安眠处地面1，3个。",
+    "default": true
+  },
+  {
+    "name": "annapausis3",
+    "type": "checkbox",
+    "label": "安眠处地面3，6个。",
+    "default": true
+  },
+  {
+    "name": "annapausis4",
+    "type": "checkbox",
+    "label": "安眠处地面4，8个。",
+    "default": true
+  },
+  {
+    "name": "annapausis5",
+    "type": "checkbox",
+    "label": "安眠处地面5，6个。",
+    "default": true
+  },
+  {
+    "name": "poisson1",
+    "type": "checkbox",
+    "label": "白松镇1，3个，此处卡图建议跳过。",
+    "default": false
+  },
+  {
+    "name": "instituteOfNaturalPhilosophy1",
+    "type": "checkbox",
+    "label": "自然哲学学院1，9个，有概率失败。",
+    "default": false
+  },
+  {
+    "name": "instituteOfNaturalPhilosophy2",
+    "type": "checkbox",
+    "label": "自然哲学学院2，4个，有个挑战需要先做完。",
+    "default": false
+  },
+  {
+    "name": "thalattaSubmarineCanyon1",
+    "type": "checkbox",
+    "label": "塔拉塔海谷1，4个。",
+    "default": true
+  },
+  {
+    "name": "salaciaPlain1",
+    "type": "checkbox",
+    "label": "塞洛海原1，4个。",
+    "default": true
+  },
+  {
+    "name": "salaciaPlain2",
+    "type": "checkbox",
+    "label": "塞洛海原2，5个。",
+    "default": true
+  },
+  {
+    "name": "salaciaPlain3",
+    "type": "checkbox",
+    "label": "塞洛海原3，3个。",
+    "default": true
+  },
+  {
+    "name": "salaciaPlain4",
+    "type": "checkbox",
+    "label": "塞洛海原4，5个，有宝箱和怪需要先处理。",
+    "default": false
+  },
+  {
+    "name": "eltonTrench1",
+    "type": "checkbox",
+    "label": "苍晶区1，5个。",
+    "default": true
+  },
+  {
+    "name": "courtOfFontaine1",
+    "type": "checkbox",
+    "label": "枫丹廷区1，8个。",
+    "default": true
+  },
+  {
+    "name": "courtOfFontaine2",
+    "type": "checkbox",
+    "label": "枫丹廷区2，2个，此处卡对话建议跳过。",
+    "default": false
+  },
+  {
+    "name": "courtOfFontaine3",
+    "type": "checkbox",
+    "label": "枫丹廷区3，3个。",
+    "default": true
+  }
+]
diff --git a/repo/pathing/地方特产/枫丹/苍晶螺/README.md b/repo/pathing/地方特产/枫丹/苍晶螺/README.md
index 663939db..d28f9223 100644
--- a/repo/pathing/地方特产/枫丹/苍晶螺/README.md
+++ b/repo/pathing/地方特产/枫丹/苍晶螺/README.md
@@ -1 +1 @@
-见 js 苍晶螺采集水下(77个)
\ No newline at end of file
+详见 [js/苍晶螺采集水下(77个)](../../../../js/苍晶螺采集水下(77个)) 。
diff --git a/repo/pathing/地方特产/枫丹/苍晶螺/详见-JS脚本-苍晶螺采集水下(77个).txt b/repo/pathing/地方特产/枫丹/苍晶螺/详见-JS脚本-苍晶螺采集水下(77个).txt
new file mode 100644
index 00000000..e69de29b