From 5a52623848dabd66b2d91f553f4128c9cb88e9a8 Mon Sep 17 00:00:00 2001 From: Patrick-Ze <19711799+Patrick-Ze@users.noreply.github.com> Date: Thu, 25 Dec 2025 10:07:28 +0800 Subject: [PATCH] =?UTF-8?q?js:=20=E5=B8=A6CD=E7=AE=A1=E7=90=86=E5=92=8C?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E8=AE=BE=E5=AE=9A=E7=9A=84=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E9=87=87=E9=9B=86=EF=BC=8C=E5=85=A8=E6=96=B02.0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=20(#2556)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * js: 带CD管理和目标设定的自动采集，全新2.0版本 * Remove this-Fish from manifest acknowledgments per request * Fix issues identified by bot review --- repo/js/CD-Aware-AutoGather/CooldownData.txt | 69 - repo/js/CD-Aware-AutoGather/README.md | 175 ++- .../assets/avatar_elements.json | 123 ++ repo/js/CD-Aware-AutoGather/assets/pic-1.png | Bin 0 -> 23423 bytes repo/js/CD-Aware-AutoGather/assets/pic-2.png | Bin 0 -> 23994 bytes repo/js/CD-Aware-AutoGather/assets/pic-3.png | Bin 0 -> 13052 bytes repo/js/CD-Aware-AutoGather/assets/pic-4.png | Bin 0 -> 18932 bytes .../assets/settings.template.json | 95 ++ repo/js/CD-Aware-AutoGather/lib/inventory.js | 246 +++ repo/js/CD-Aware-AutoGather/lib/lib.js | 1354 ++++++++-------- repo/js/CD-Aware-AutoGather/lib/ocr.js | 200 +++ repo/js/CD-Aware-AutoGather/main.js | 1372 +++++++++++------ repo/js/CD-Aware-AutoGather/manifest.json | 20 +- repo/js/CD-Aware-AutoGather/settings.json | 141 +- .../settings.template.json | 48 - repo/js/CD-Aware-AutoGather/脚本思路.txt | 44 - 16 files changed, 2596 insertions(+), 1291 deletions(-) delete mode 100644 repo/js/CD-Aware-AutoGather/CooldownData.txt create mode 100644 repo/js/CD-Aware-AutoGather/assets/avatar_elements.json create mode 100644 repo/js/CD-Aware-AutoGather/assets/pic-1.png create mode 100644 repo/js/CD-Aware-AutoGather/assets/pic-2.png create mode 100644 repo/js/CD-Aware-AutoGather/assets/pic-3.png create mode 100644 repo/js/CD-Aware-AutoGather/assets/pic-4.png create mode 100644 repo/js/CD-Aware-AutoGather/assets/settings.template.json create mode 100644 repo/js/CD-Aware-AutoGather/lib/inventory.js create mode 100644 repo/js/CD-Aware-AutoGather/lib/ocr.js delete mode 100644 repo/js/CD-Aware-AutoGather/settings.template.json delete mode 100644 repo/js/CD-Aware-AutoGather/脚本思路.txt diff --git a/repo/js/CD-Aware-AutoGather/CooldownData.txt b/repo/js/CD-Aware-AutoGather/CooldownData.txt deleted file mode 100644 index d55957b5e..000000000 --- a/repo/js/CD-Aware-AutoGather/CooldownData.txt +++ /dev/null @@ -1,69 +0,0 @@ -沉玉仙茗: 24小时 -发光髓: 12小时 -蝴蝶翅膀: 12小时 -晶核: 12小时 -鳗肉: 12小时 -螃蟹: 12小时 -禽肉: 12小时 -青蛙: 12小时 -鳅鳅宝玉: 12小时 -神秘的肉: 12小时 -兽肉: 12小时 -「冷鲜肉」: 12小时 -蜥蜴尾巴: 12小时 -鱼肉: 12小时 -白萝卜: 每天0点 -薄荷: 每天0点 -澄晶实: 每天0点 -墩墩桃: 每天0点 -海草: 每天0点 -红果果菇: 每天0点 -胡萝卜: 每天0点 -金鱼草: 每天0点 -堇瓜: 每天0点 -烬芯花: 每天0点 -久雨莲: 每天0点 -颗粒果: 每天0点 -苦种: 每天0点 -莲蓬: 每天0点 -烈焰花花蕊: 每天0点 -马尾: 每天0点 -蘑菇: 每天0点 -茉洁草: 每天0点 -鸟蛋: 每天0点 -泡泡桔: 每天0点 -苹果: 每天0点 -日落果: 每天0点 -树莓: 每天0点 -松果: 每天0点 -松茸: 每天0点 -甜甜花: 每天0点 -汐藻: 每天0点 -香辛果: 每天0点 -星蕈: 每天0点 -须弥蔷薇: 每天0点 -枣椰: 每天0点 -竹笋: 每天0点 -烛伞蘑菇: 每天0点 -宿影花: 每天0点 -寒涌石: 每天0点 -白灵果: 每天0点 -夏槲果: 每天0点 -沉玉仙茗: 24小时 -晶蝶: 每天4点 - -铁块: 每天0点 -白铁块: 每2天0点 -电气水晶: 每2天0点 -星银矿石: 每2天0点 -萃凝晶: 每3天0点 -水晶块: 每3天0点 -紫晶块: 每3天0点 -虹滴晶: 每3天0点 -奇异的「牙齿」: 46小时 -冰雾花花朵: 46小时 -冰雾花: 46小时 -烈焰花花蕊: 46小时 -烈焰花: 46小时 - -地方特产: 46小时 \ No newline at end of file diff --git a/repo/js/CD-Aware-AutoGather/README.md b/repo/js/CD-Aware-AutoGather/README.md index eba769021..f677bcbe1 100644 --- a/repo/js/CD-Aware-AutoGather/README.md +++ b/repo/js/CD-Aware-AutoGather/README.md @@ -1,8 +1,21 @@ +**由于使用了尚处于测试版BetterGI中的API，使用稳定版BetterGI的用户请等待`0.54.1`或更高的版本发布后再订阅此脚本** + +# 功能特点 + +- 自动同步你订阅的地图追踪任务，无需手动复制文件夹 +- 自动匹配各类材料的CD，支持联机模式（会识别是在谁的世界进行采集） +- 可识别背包物品数量，并按设定的目标数量按需运行 +- 方便的材料选择界面，并支持按地区、按类别批量选择 +- 可设置一个或多个不运行的时间段 +- 采集过程自动切换合适的队伍 + # 使用前准备 +（在脚本仓库页面阅读此文档，会比在BGI的已订阅脚本界面获得更好的渲染效果） + **双击运行脚本所在目录下的`SymLink.bat`文件，以创建符号链接。** -(脚本所在目录为：你的BetterGI安装位置下面的`repo\js\CD-Aware-AutoGather`文件夹) +(在BGI的`全自动——JS脚本`界面，右键点击本脚本，选择`打开目录`可快速打开脚本所在目录) 此操作只需要一次。运行后，脚本下的`pathing`文件夹将指向Better GI的地图追踪文件夹`User\AutoPathing`，你通过Better GI新增或删除地图追踪任务后，脚本这边看到的也是修改后的。 @@ -12,46 +25,152 @@ ## 1. 扫描文件夹更新可选材料列表 -扫描脚本`pathing`目录（等价于你在Better GI里订阅的地图追踪任务目录）下的`地方特产`、`矿物`、`食材与炼金`内的材料，并自动匹配材料的刷新时间。 +扫描脚本`pathing`目录（等价于你在Better GI里订阅的地图追踪任务目录）下的`地方特产`、`矿物`、`食材与炼金`内的材料，并更新脚本可用的配置菜单。 -扫描完成后，将自动更新脚本可用的配置菜单。此时再次打开右键的`修改JS脚本自定义配置`，将看到新增了多个配置项，其中包含刚刚扫描到的材料目录。 +运行后，再次打开右键的`修改JS脚本自定义配置`，将看到新增了多个配置项。 -![preview.png](https://foruda.gitee.com/images/1749967868807757262/ada1abf2_9716310.png) - -如果你订阅了很多地图追踪任务，那么扫描结果也会比较多，选项列表也会比较长，但不影响脚本运行。 - -只有你新增或者删除了地图追踪任务的订阅时，才需要运行此模式。 +完成扫描后会自动设置下次的脚本运行模式为`采集选中的材料`。 ## 2. 采集选中的材料 -此模式下有这些选项可以配置： - -| 选项 | 说明 | -| ---- | ---- | -| `地图追踪`中已订阅的任务目录的处理方式 | 有三种处理方式：
- `每次自动扫描，并采集扫描到的所有材料`
- `手动扫描，并采集扫描到的所有材料`
- `手动扫描，只采集已勾选的材料`
`自动扫描`会在每次执行采集前扫描当前已订阅的任务目录，`手动扫描`则是手动将运行模式切换到扫描模式执行脚本进行扫描。
`采集所有`会无视后面的每个材料⬇️是否选中，`采集已勾选`则是根据勾选的列表进行采集 | -| 设置首选队伍名称 | 执行采集任务前切换到指定的队伍，未设置则不切换。 | -| 设置备选队伍名称 | 首选队伍缺少对应的采集角色时使用。
两支队伍的名称不要存在包含关系，例如不能一支叫`特产`一支叫`特产备选` | -| 停止运行时间 | 超过此时间后，停止后续的任务（会等待正在运行的那条json路线结束）。 | -| 我肝的账号不止一个 | 如果你有多个账号，可在输入框内为每个游戏帐号填写一个唯一的字符串以使他们的刷新时间分开保存，互不干扰。这个唯一的字符串并不必须是帐号的UID，只要互不相同就可以了。
如果填空，会自动使用原神中右下角UID作为区分账号的唯一字符串 | -| 即使同一种材料有多个版本的路线，也全都执行采集 | 如果某种材料选中了多个版本的路线（常见于不同作者），默认只会执行第一个。勾选此选项后会每个版本都执行，可能造成部分点位重复（空跑）。 | -| `↓` 地方特产\稻妻\绯樱绣球 | 根据你订阅的路径追踪任务数量，这里将会显示相应个数的选择框。
勾选后将执行你选中的条目的采集任务。
Tip: `↓`符号是在提示你应该勾选文本下面的选择框 | - -**推荐的配置**: 运行模式设置为`采集选中的材料`，已订阅的任务目录的处理方式设置为`每次自动扫描，并采集扫描到的所有材料`。这样一来，待采集的材料列表自动保持与你订阅的列表一致，新增/删除材料也直接通过BetterGI的界面执行，每次直接运行脚本即可。 - 运行此模式后，将按照你勾选的条目，执行相应的采集任务。每执行完一条json路线后，将会计算它的下次刷新时间并写入`record`文件夹下的记录文件。下次运行脚本时，未刷新的路线将自动跳过。 +采集过程中，如果所有材料均达到了你设置的目标数量，或者到达你设置的不执行时间段，会自动停止运行。 + 可以同时勾选多种材料，会逐个进行采集。 +此模式下有这些选项可以配置： + +### 基本配置 + +| 选项 | 说明 | +| ---- | ---- | +| 按关键词筛选材料路线 | 默认为黑名单模式。此时，文件路径中含有任意一个关键词的路线，在扫描时会被忽略。其他模式见后文 | +| 设置首选队伍名称 | 执行采集任务前切换到指定的队伍，未设置则不切换。 | +| 设置备选队伍名称 | 首选队伍缺少对应的采集角色时使用。
两支队伍的名称不要存在包含关系，例如不能一支叫`特产`一支叫`特产备选` | +| 不在以下时间段内运行 | 字面意思。如果脚本启动时间在设定的时间段内，会立即终止；如果运行过程中进入设定的时间段内，也会停止后续路线。支持设置多个时间段，用空格分隔即可，比如`05:20-09:28 21:28-00:20` | +| 物品采集数量目标 | 填写目标数量，留空表示不限制。也可以设置为`csv`，将按csv文件的配置详细设定不同材料的目标，具体见后文 | +| 使用指定的账号名保存运行记录 | 留空时，将自动识别UID，将其作为账号名记录材料刷新时间。你也可以主动填写账号名称（不推荐），会导致联机互采时（例如大小号）无法正确维护材料刷新时间，建议仅在你遇到脚本无法稳定识别你的UID时填写 | + +### 材料采集配置 + +这部分配置分为4个大类，根据你订阅的路线，可能只会出现其中的部分配置。 + +为了方便用户查找： + +- “地区”类型的选项，是按照在游戏中开放的顺序排序的。 +- 每个小类别下的选项，是按照拼音的先后顺序排序的。 + +**【常用采集选项】** + +开发了按类别、按地区批量选择的功能，并和常用材料汇集到了一起以方便使用，如图所示。 + +`按大类选择`和`按地区选择地方特产`都是批量选择。批量选择和后面的具体项选择可以结合使用，实现灵活的采集目标设定。 + +比如勾选 `按大类选择`的矿物 + `按地区选择地方特产`里的蒙德 + `单独选择地方特产`下的稻妻地区的绯樱绣球。 + +![pic-1](assets/pic-1.png) + +**【单独选择地方特产】** + +![pic-2](assets/pic-2.png) + +**【食材与炼金】** + +![pic-3](assets/pic-3.png) + +**【对于具有多版本路线的物品，选择要使用的路线】** + +如果你为某种材料订阅了多个版本的路线，可以在这里进行选择其中的一个或多个选项。 + +如果你没有指定路线，会默认执行第一项的路线。 + +![pic-4](assets/pic-4.png) + +### 队伍配置推荐 + 采集任务可能用到的元素共有`火水雷风`4种，此外还有挖矿类（如钟离）以及纳西妲两个类型，可以考虑建立两支队伍`钟纳水雷`和`钟纳火风`，即可满足所有采集任务的需要。 -支持使用配置组`更多功能`——`日志分析`分析运行记录（参考了[mno](https://github.com/Bedrockx)大佬的写法）。 +配置好两支队伍后，脚本会在执行路线前计算所需角色，如果当前队伍不满足要求，会自动切换到另一支队伍。 -![log_analysis.png](https://foruda.gitee.com/images/1749967993135535153/3bbeecd3_9716310.png) +注意：队伍切换功能在联机模式下无法执行，因此联机采集时请先调整好队伍中的角色。 -## 3. 清除运行记录（重置材料刷新时间） +# 进阶用法 -此模式下，相关的选项只有`我肝的账号不止一个`和以`↓`开头的任务名，作用同上文。 +### 1. 不想每次订阅材料路线后都要在脚本设置中再勾选，怎么办？ -运行此模式后，将重置你选中的任务相应材料的刷新时间。 +利用好`按大类选择`选项。你可以勾选上全部三个大类（或者你实际需要的类别），然后，只要在BGI本体里订阅路线即可。 -如果你需要删除全部运行记录，可以直接删除脚本`record`文件夹下，以账号为名称的文件夹内的文件。 +### 2. 怎么清除运行记录（重置材料刷新时间）？ + +运行记录保存在脚本所在路径的`record`文件夹中，以UID（或者用户指定的名字）作为账号文件夹。打开子文件夹后，删除对应材料的txt文件即可。 + +### 3. `按关键词筛选材料路线`的进阶用法 + +如前面配置描述中所述，此选项默认以黑名单模式运行，设置的关键词即为黑名单，在扫描时会被忽略。可以在选项的开头加上`include:`，将切换为以白名单模式运行，例如`include:无草神`将只扫描含有"无草神"字样的路线。 + +或者更进阶的，使用`regex:`开头，将完全使用你设置的正则表达式进行筛选。如果你不了解什么是正则表达式，说明你大概率也不需要这种方式。 + +使用该选项设置的进阶用法时，希望你充分理解了自己的设置会产生什么样的效果。 + +### 4. 在`物品采集数量目标`选项中，如何为不同物品设置不同的目标？ + +请将该选项设置为`csv`，然后执行一次材料扫描模式。扫描完成后，在record下找到对应账号的子文件夹。打开这个子文件夹，会找到一个`采集目标.csv`的csv文件。 + +你可以用Excel或者WPS等打开此csv文件，打开后就是一个表格（如果你了解csv文件格式，也可以用任意文本编辑器打开，不过不推荐）。表格内容示例如下： + +| 物品 | 目标数量 | +| -------------- | ---- | +| 地方特产 | | +| 矿物 | | +| 食材与炼金 | | +| 地方特产\\璃月 | | +| 地方特产\\稻妻 | | +| 矿物\\萃凝晶 | | +| 矿物\\虹滴晶 | | +| 食材与炼金\\晶蝶 | | +| 食材与炼金\\松果 | | +| 地方特产\\璃月\\夜泊石 | | +| 地方特产\\璃月\\星螺 | | +| 地方特产\\稻妻\\绯樱绣球 | | +| 地方特产\\须弥\\树王圣体菇 | | + +默认情况下`目标数量`这一列是空的，填写具体的数字，保存文件后关闭Excel（或者其他你用来编辑csv的工具）。然后，再次运行脚本即可。 + +**如你所见，这个csv表格也具有和脚本选项中相似的层次关系。 是的，数量是按层次继承的~** 🎉 + +- 如果低层次的材料没有设置目标，则会自动尝试较高层次所设定的数量 +- 如果向上遍历所有层次都没有目标数量，则表示不限制数量 +- 数量为`0`将不进行采集 + +利用好脚本设置中的批量选择功能和这个层次关系，可以轻松实现灵活的采集目标。比如： + +- 希望背包材料能立即把一个角色拉到90级，于是在`按大类选择`中勾选了地方特产，并将地方特产类别的数量设置为168 +- 但是，又觉得不会再用到树王圣体菇，所以把`地方特产\须弥\树王圣体菇`的数量设置为0 +- 璃月的特产希望多采集一点，那就把`地方特产\璃月`的数量增加了一点到199 +- 还想做用`红炉一点雪`填满背包，那就把对应的特产`地方特产\稻妻\绯樱绣球`设置为9999 +- 想要随时能锻造武器，于是于是在`按大类选择`中勾选了矿物，并将矿物类别的数量设置为50 +- 不想抓晶蝶，随便设个100个晶蝶吧 +- 对了，还有每周参量质变仪要用的薄荷，要不就2倍数量吧，300 +- …… + +选好材料和数量，配置好队伍，然后把脚本加到你的每日配置组或一条龙中，从此实现背包自由。 + + +# 致谢 + +此脚本的2.0版本进行了重写，基于新的API重新设计了主要逻辑，以解决此前我想要处理却不能的痛点。在此， + +- 诚挚致敬[鸭蛋老师](https://github.com/huiyadanli)和BGI的诸位贡献者，是各位使我的提瓦特之旅得以苟延残喘 + +- 得益于[FishmanTheMurloc](https://github.com/FishmanTheMurloc)的鼎力相助，脚本才能实现无图的批量材料扫描 + +- 受惠于[JamisHoo](https://github.com/JamisHoo)的配置界面优化，使得更便捷的材料选择成为可能 + +- 感谢[this-Fish](https://github.com/this-Fish)的改进，基于坐标判断是否更新记录、将材料是否刷新的检查提前都是沿袭的TA的思路 + +最后，要特别感谢绫华，是她陪伴了我的提瓦特之旅。在弃坑之后，唯有这份牵挂，支撑着我重新回到这里。 + +没有她就没有今天的这个脚本。 + +![in-a-league-of-her-own](https://ayaka20.ggff.net/img/ayaka.png) diff --git a/repo/js/CD-Aware-AutoGather/assets/avatar_elements.json b/repo/js/CD-Aware-AutoGather/assets/avatar_elements.json new file mode 100644 index 000000000..af8d6097e --- /dev/null +++ b/repo/js/CD-Aware-AutoGather/assets/avatar_elements.json @@ -0,0 +1,123 @@ +{ + "冰": [ + "神里绫华", + "丝柯克", + "爱可菲", + "茜特菈莉", + "夏洛蒂", + "莱欧斯利", + "菲米尼", + "米卡", + "莱依拉", + "申鹤", + "埃洛伊", + "优菈", + "罗莎莉亚", + "甘雨", + "迪奥娜", + "七七", + "凯亚", + "重云" + ], + "火": [ + "杜林", + "玛薇卡", + "阿蕾奇诺", + "嘉明", + "夏沃蕾", + "林尼", + "迪希雅", + "托马", + "宵宫", + "烟绯", + "胡桃", + "辛焱", + "可莉", + "迪卢克", + "安柏", + "班尼特", + "香菱" + ], + "水": [ + "爱诺", + "塔利雅", + "玛拉妮", + "希格雯", + "芙宁娜", + "那维莱特", + "妮露", + "坎蒂丝", + "夜兰", + "神里绫人", + "珊瑚宫心海", + "达达利亚", + "莫娜", + "芭芭拉", + "行秋" + ], + "风": [ + "雅珂达", + "伊法", + "梦见月瑞希", + "蓝砚", + "恰斯卡", + "闲云", + "琳妮特", + "流浪者", + "珐露珊", + "鹿野院平藏", + "早柚", + "枫原万叶", + "魈", + "温迪", + "琴", + "砂糖" + ], + "雷": [ + "菲林斯", + "伊涅芙", + "瓦雷莎", + "伊安珊", + "欧洛伦", + "克洛琳德", + "赛索斯", + "赛诺", + "多莉", + "久岐忍", + "八重神子", + "雷电将军", + "九条裟罗", + "刻晴", + "菲谢尔", + "丽莎", + "北斗", + "雷泽" + ], + "草": [ + "奈芙尔", + "菈乌玛", + "基尼奇", + "艾梅莉埃", + "绮良良", + "白术", + "卡维", + "艾尔海森", + "瑶瑶", + "纳西妲", + "提纳里", + "柯莱" + ], + "岩": [ + "希诺宁", + "卡齐娜", + "千织", + "娜维娅", + "云堇", + "荒泷一斗", + "五郎", + "阿贝多", + "钟离", + "凝光", + "诺艾尔" + ] +} \ No newline at end of file diff --git a/repo/js/CD-Aware-AutoGather/assets/pic-1.png b/repo/js/CD-Aware-AutoGather/assets/pic-1.png new file mode 100644 index 0000000000000000000000000000000000000000..7a9dfde013cd6a1d7320c1dde8444f9f15246288 GIT binary patch literal 23423 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�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 literal 0 HcmV?d00001 diff --git a/repo/js/CD-Aware-AutoGather/assets/pic-3.png b/repo/js/CD-Aware-AutoGather/assets/pic-3.png new file mode 100644 index 0000000000000000000000000000000000000000..497ef6e402d65ba6b8108240b99d6311b3c3d815 GIT binary patch literal 13052 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 literal 0 HcmV?d00001 diff --git a/repo/js/CD-Aware-AutoGather/assets/pic-4.png b/repo/js/CD-Aware-AutoGather/assets/pic-4.png new file mode 100644 index 0000000000000000000000000000000000000000..75745181cedc4a7e4a6b597900f3f2115386f2c3 GIT binary patch literal 18932 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 literal 0 HcmV?d00001 diff --git a/repo/js/CD-Aware-AutoGather/assets/settings.template.json b/repo/js/CD-Aware-AutoGather/assets/settings.template.json new file mode 100644 index 000000000..e78573190 --- /dev/null +++ b/repo/js/CD-Aware-AutoGather/assets/settings.template.json @@ -0,0 +1,95 @@ +[ + { + "name": "runMode", + "type": "select", + "label": "运行模式", + "options": [ + "扫描文件夹更新可选材料列表", + "采集选中的材料" + ], + "default": "扫描文件夹更新可选材料列表" + }, + { + "name": "filterPathByKeywords", + "type": "input-text", + "label": "按关键词筛选材料路线（使用空格分隔，默认为黑名单模式）", + "default": "低成功率 不建议" + }, + { + "name": "partyName", + "type": "input-text", + "label": "设置首选队伍名称（留空则不进行切换）" + }, + { + "name": "partyName2nd", + "type": "input-text", + "label": "设置备选队伍名称（首选队伍缺少对应的采集角色时使用）" + }, + { + "name": "excludeTimeRange", + "type": "input-text", + "label": "不在以下时间段内运行（HH:mm-HH:mm，24小时制）：" + }, + { + "name": "targetCountOfSelected", + "type": "input-text", + "label": "物品采集数量目标（可使用csv为不同物品设置不同数量）" + }, + { + "name": "manualSetAccountName", + "type": "input-text", + "label": "使用指定的账号名保存运行记录" + }, + { + "type": "separator" + }, + { + "label": "\n【常用采集选项】\n\n按大类选择", + "type": "multi-checkbox", + "name": "selectByCategory", + "options": [ + "地方特产", + "矿物", + "食材与炼金" + ] + }, + { + "label": "按地区选择地方特产", + "type": "multi-checkbox", + "name": "selectLocalSpecialtyByCountry", + "options": [ + "蒙德", + "璃月", + "稻妻", + "须弥", + "枫丹", + "纳塔", + "挪德卡莱" + ] + }, + { + "label": "矿物", + "type": "multi-checkbox", + "name": "selectForgingOre", + "options": [ + "白铁块", + "水晶块", + "星银矿石", + "紫晶块", + "萃凝晶", + "虹滴晶" + ] + }, + { + "label": "特殊物品", + "type": "multi-checkbox", + "name": "selectMiscellaneous", + "options": [ + "晶蝶", + "沉玉仙茗" + ] + }, + { + "type": "separator" + } +] \ No newline at end of file diff --git a/repo/js/CD-Aware-AutoGather/lib/inventory.js b/repo/js/CD-Aware-AutoGather/lib/inventory.js new file mode 100644 index 000000000..fa4f4eb1e --- /dev/null +++ b/repo/js/CD-Aware-AutoGather/lib/inventory.js @@ -0,0 +1,246 @@ + +/** + * @author Ayaka-Main + * @link https://github.com/Patrick-Ze + * @description 对背包API的易用包装。使用方法: 将此文件放在脚本目录下的 lib 文件夹中，然后在你的脚本开头处执行下面这行: + eval(file.readTextSync("lib/inventory.js")); + */ + +let scriptContext = { + version: "1.0", +}; + +// 原本是csv格式，但是为了方便js重用，还是内置在代码中 +const csvText = `物品,刷新机制,背包分类 +「冷鲜肉」,12小时,材料 +发光髓,12小时,材料 +蝴蝶翅膀,12小时,材料 +晶蝶,12小时,材料 +晶核,12小时,材料 +鳗肉,12小时,材料 +螃蟹,12小时,材料 +禽肉,12小时,材料 +青蛙,12小时,材料 +鳅鳅宝玉,12小时,材料 +神秘的肉,12小时,材料 +兽肉,12小时,材料 +蜥蜴尾巴,12小时,材料 +鱼肉,12小时,材料 +沉玉仙茗,24小时,材料 +便携轴承,46小时,材料 +冰雾花花朵,46小时,材料 +苍晶螺,46小时,材料 +赤念果,46小时,材料 +初露之源,46小时,材料 +悼灵花,46小时,材料 +嘟嘟莲,46小时,材料 +绯樱绣球,46小时,材料 +风车菊,46小时,材料 +钩钩果,46小时,材料 +鬼兜虫,46小时,材料 +海灵芝,46小时,材料 +海露花,46小时,材料 +虹彩蔷薇,46小时,材料 +湖光铃兰,46小时,材料 +劫波莲,46小时,材料 +晶化骨髓,46小时,材料 +绝云椒椒,46小时,材料 +枯叶紫英,46小时,材料 +浪沫羽鳃,46小时,材料 +烈焰花花蕊,46小时,材料 +琉璃百合,46小时,材料 +琉璃袋,46小时,材料 +琉鳞石,46小时,材料 +落落莓,46小时,材料 +鸣草,46小时,材料 +慕风蘑菇,46小时,材料 +霓裳花,46小时,材料 +帕蒂沙兰,46小时,材料 +蒲公英籽,46小时,材料 +奇异的「牙齿」,46小时,材料 +青蜜莓,46小时,材料 +清水玉,46小时,材料 +清心,46小时,材料 +柔灯铃,46小时,材料 +肉龙掌,46小时,材料 +塞西莉亚花,46小时,材料 +沙脂蛹,46小时,材料 +珊瑚真珠,46小时,材料 +圣金虫,46小时,材料 +石珀,46小时,材料 +树王圣体菇,46小时,材料 +霜盏花,46小时,材料 +天云草实,46小时,材料 +万相石,46小时,材料 +微光角菌,46小时,材料 +小灯草,46小时,材料 +星螺,46小时,材料 +血斛,46小时,材料 +夜泊石,46小时,材料 +幽灯蕈,46小时,材料 +幽光星星,46小时,材料 +月莲,46小时,材料 +月落银,46小时,材料 +云岩裂叶,46小时,材料 +灼灼彩菊,46小时,材料 +子探测单元,46小时,材料 +白铁块,每2天0点,材料 +电气水晶,每2天0点,材料 +星银矿石,每2天0点,材料 +萃凝晶,每3天0点,材料 +虹滴晶,每3天0点,材料 +水晶块,每3天0点,材料 +紫晶块,每3天0点,材料 +白灵果,每天0点,材料 +白萝卜,每天0点,材料 +薄荷,每天0点,材料 +澄晶实,每天0点,材料 +墩墩桃,每天0点,材料 +海草,每天0点,材料 +寒涌石,每天0点,材料 +红果果菇,每天0点,材料 +胡萝卜,每天0点,材料 +金鱼草,每天0点,材料 +堇瓜,每天0点,材料 +烬芯花,每天0点,材料 +久雨莲,每天0点,材料 +颗粒果,每天0点,材料 +苦种,每天0点,材料 +莲蓬,每天0点,材料 +马尾,每天0点,材料 +蘑菇,每天0点,材料 +茉洁草,每天0点,材料 +鸟蛋,每天0点,材料 +树莓,每天0点,材料 +松果,每天0点,材料 +松茸,每天0点,材料 +宿影花,每天0点,材料 +甜甜花,每天0点,材料 +铁块,每天0点,材料 +汐藻,每天0点,材料 +夏槲果,每天0点,材料 +香辛果,每天0点,材料 +须弥蔷薇,每天0点,材料 +枣椰,每天0点,材料 +竹笋,每天0点,材料 +泡泡桔,每天0点,食物 +苹果,每天0点,食物 +日落果,每天0点,食物 +星蕈,每天0点,食物 +烛伞蘑菇,每天0点,食物 +` + +const materialMetadata = {}; + +function parseCsvTextToDict() { + // 1. 将文本按行分割成数组 + const lines = csvText.trim().split("\n"); + + // 预期标题是：['物品', '刷新机制', '背包分类'] + const headers = lines[0].split(",").map((header) => header.trim()); + + // 检查标题是否符合预期，防止解析错误 + if (headers[0] !== "物品" || headers.length < 3) { + console.error("CSV格式的标题行不符合预期。"); + return {}; + } + + // 确定我们需要的值对应的索引 + const cdIndex = headers.indexOf("刷新机制"); + const typeIndex = headers.indexOf("背包分类"); + + // 3. 处理数据行，构建结果字典 + const resultDict = {}; + + // 从第二行（索引 1）开始遍历数据 + const typeMap = {"食物": "Food", "材料": "Materials"}; + for (let i = 1; i < lines.length; i++) { + const line = lines[i].trim(); + if (line === "") continue; // 跳过空行 + + // 将数据行按逗号分割 + const values = line.split(",").map((value) => value.trim()); + + // 确保数据行有足够的值 + if (values.length > Math.max(cdIndex, typeIndex) && values[0]) { + const itemName = values[0]; + const cdValue = values[cdIndex]; + const typeValue = typeMap[values[typeIndex]]; + + // 存入结果字典，以物品名为 key + resultDict[itemName] = { + cd: cdValue, + type: typeValue, + }; + } + } + + return resultDict; +} + +/** + * 获取背包中物品的数量。 + * 如果没有找到，则为-1；如果找到了但数字识别失败，则为-2 + * + * 暂不支持 冷鲜肉, 红果果菇, 奇异的「牙齿」 + */ +async function getItemCount(itemList=null, retry=true) { + if (Object.keys(materialMetadata).length === 0) { + Object.assign(materialMetadata, parseCsvTextToDict()); + } + + if (typeof itemList === "string") { + itemList = [itemList]; + } else if (itemList == null || itemList.length === 0) { + itemList = Object.keys(materialMetadata); + } + const renameMap = {"晶蝶": "晶核", "「冷鲜肉」":"冷鲜肉"}; + const groupByType = {}; + for (const itemName of itemList) { + const metadata = materialMetadata[itemName]; + const itemType = metadata?.type ?? "Materials"; + if (!metadata?.type) { + log.warn("未查找到{0}所属的背包分类，默认它是{1}", itemName, itemType); + } + const normalizedName = renameMap[itemName] || itemName; + groupByType[itemType] = groupByType[itemType] || []; + groupByType[itemType].push(normalizedName); + } + + let results = {}; + for (const type in groupByType) { + const names = groupByType[type]; + const countResult = await dispatcher.runTask(new SoloTask("CountInventoryItem", { + "gridScreenName": type, + "itemNames": names, + })); + Object.assign(results, countResult); + } + if (retry && itemList.some(item => !(item in results))) { + // 即使在白天，大多数情况也能识别成功，因此不作为常态机制，仅在失败时使用 + log.info("部分物品识别失败，调整时间和视角后重试"); + await genshin.returnMainUi(); + await genshin.setTime(0, 0); + await sleep(300); + moveMouseBy(0, 9280); + await sleep(300); + const retryResults = await getItemCount(itemList, false); + await genshin.returnMainUi(); + keyPress("MBUTTON"); + return retryResults; + } + const finalResults = {}; + for (const itemName of itemList) { + const normalizedName = renameMap[itemName] || itemName; + // 如果某个元素没有找到，则不会存在对应的键值，赋值为-1以保持与单个物品查找时一致的行为 + finalResults[itemName] = results[normalizedName] ?? -1; + } + return finalResults; +} + +function getItemCD(itemName) { + if (Object.keys(materialMetadata).length === 0) { + Object.assign(materialMetadata, parseCsvTextToDict()); + } + return materialMetadata[itemName]?.cd || null; +} diff --git a/repo/js/CD-Aware-AutoGather/lib/lib.js b/repo/js/CD-Aware-AutoGather/lib/lib.js index 65e4d1c84..7e9c8ca2c 100644 --- a/repo/js/CD-Aware-AutoGather/lib/lib.js +++ b/repo/js/CD-Aware-AutoGather/lib/lib.js @@ -1,611 +1,743 @@ -/** - * @author Ayaka-Main - * @link https://github.com/Patrick-Ze - * @description 提供一些通用性的功能函数。使用方法: 将此文件放在脚本目录下的 lib 文件夹中，然后在你的脚本开头处执行下面这行: - eval(file.readTextSync("lib/lib.js")); - */ - -let scriptContext = { - scriptStartTime: new Date(), - version: "1.3", -}; - -/** - * 将 Date 对象格式化为 ISO 8601 字符串，包含本地时区（如：2020-09-28T20:20:20+08:00） - * @param {Date} date - 要格式化的日期对象 - * @returns {string} 格式化后的字符串 - */ -function formatDateTime(date) { - const pad = (n) => n.toString().padStart(2, "0"); - - const year = date.getFullYear(); - const month = pad(date.getMonth() + 1); - const day = pad(date.getDate()); - const hour = pad(date.getHours()); - const minute = pad(date.getMinutes()); - const second = pad(date.getSeconds()); - - // 获取时区偏移（分钟），转换成±HH:MM - const offset = -date.getTimezoneOffset(); - const sign = offset >= 0 ? "+" : "-"; - const offsetHour = pad(Math.floor(Math.abs(offset) / 60)); - const offsetMin = pad(Math.abs(offset) % 60); - - return `${year}-${month}-${day}T${hour}:${minute}:${second}${sign}${offsetHour}:${offsetMin}`; -} - -/** - * 将 Date 对象以本地时区格式化为字符串，格式为 "MM-DD HH:mm:ss" - * @param {Date} date - 要格式化的日期对象 - * @returns {string} 格式化后的字符串 - */ -function formatDateTimeShort(date) { - const pad = (n) => n.toString().padStart(2, "0"); - - const month = pad(date.getMonth() + 1); - const day = pad(date.getDate()); - const hour = pad(date.getHours()); - const minute = pad(date.getMinutes()); - const second = pad(date.getSeconds()); - - return `${month}-${day} ${hour}:${minute}:${second}`; -} - -/** - * 判断当前时间是否已达到目标时间（目标时间基于脚本启动时间，支持跨天）。 - * @param {string} targetTimeStr - 目标时间，格式为 "HH:mm"。 - * @returns {boolean} 如果已达到目标时间，返回 true，否则返回 false。 - */ -function isTargetTimeReached(targetTimeStr) { - const now = new Date(); - const [targetHour, targetMinute] = targetTimeStr.split(":").map(Number); - - const target = new Date(scriptContext.scriptStartTime); - target.setHours(targetHour, targetMinute, 0, 0); - - // 如果目标时间早于脚本启动时间，则认为是第二天 - if (target <= scriptContext.scriptStartTime) { - target.setDate(target.getDate() + 1); - } - - return now >= target; -} - -/** - * 判断当前时间是否在给定时间范围内（支持跨天）。 - * @param {*} startStr 起始时间，格式为"HH:mm" - * @param {*} endStr 结束时间，格式为"HH:mm" - * @returns {boolean} 如果当前时间在范围内，返回 true，否则返回 false。 - */ -function isNowInTimeRange(startStr, endStr) { - const now = new Date(); - const [startHour, startMinute] = startStr.split(":").map(Number); - const [endHour, endMinute] = endStr.split(":").map(Number); - - const start = new Date(now); - start.setHours(startHour, startMinute, 0, 0); - - const end = new Date(now); - end.setHours(endHour, endMinute, 0, 0); - - // 如果结束时间早于开始时间，表示跨天 - if (end <= start) { - end.setDate(end.getDate() + 1); - } - return now >= start && now <= end; -} - -/** - * 根据上期刷新时间字符串和刷新模式计算下一次的刷新时间。 - * - * @param {string} lastRefreshTimeStr 上次刷新时间。如果为空或无效，将使用 getDefaultTime()。 - * @param {string} refreshMode 刷新模式，例如 "每X周", "每X天Y点", "每24:05" (表示每24小时零5分), "X小时" - * @returns {Date | null} 计算出的下一次刷新时间Date对象，如果模式无法解析则返回null。 - * @example 已进行过的测试用例(用例中 GetDefaultTime() 返回 1970-01-01T00:00:00.000+08:00)： - * calculateNextRefreshTime("2025-06-01T10:00:00.000+08:00", "每1周"); // 2025-06-02T04:00:00.000+08:00 - * calculateNextRefreshTime("2025-06-02T03:00:00.000+08:00", "每1周"); // 2025-06-02T04:00:00.000+08:00 - * calculateNextRefreshTime("2025-06-02T05:00:00.000+08:00", "每1周"); // 2025-06-09T04:00:00.000+08:00 - * calculateNextRefreshTime(null, "每周"); // 1970-01-05T04:00:00.000+08:00 - * calculateNextRefreshTime("2025-06-02T03:00:00.000+08:00", "每2周"); // 2025-06-09T04:00:00.000+08:00 - * calculateNextRefreshTime("2025-06-20T22:00:00.000+08:00", "每天8点"); // 2025-06-21T08:00:00.000+08:00 - * calculateNextRefreshTime("2025-06-21T07:00:00.000+08:00", "每天08点"); // 2025-06-21T08:00:00.000+08:00 - * calculateNextRefreshTime("2025-06-21T09:00:00.000+08:00", "每天08点"); // 2025-06-22T08:00:00.000+08:00 - * calculateNextRefreshTime(null, "每天12点"); // 1970-01-01T12:00:00.000+08:00 - * calculateNextRefreshTime("2025-06-20T10:00:00.000+08:00", "每2天10点"); // 2025-06-22T10:00:00.000+08:00 - * calculateNextRefreshTime("2025-06-20T10:00:00.000+08:00", "每3天0点"); // 2025-06-23T00:00:00.000+08:00 - * calculateNextRefreshTime("2025-06-21T11:00:00.000+08:00", "00:30"); // 2025-06-21T11:30:00.000+08:00 - * calculateNextRefreshTime("2025-06-21T23:00:00.000+08:00", "02:00"); // 2025-06-22T01:00:00.000+08:00 - * calculateNextRefreshTime("2025-06-20T04:00:00.000+08:00", "每24:05"); // 2025-06-21T04:05:00.000+08:00 - * calculateNextRefreshTime(null, "01:00"); // 1970-01-01T01:00:00.000+08:00 - * calculateNextRefreshTime("2025-06-21T10:00:00.000+08:00", "2小时"); // 2025-06-21T12:00:00.000+08:00 - * calculateNextRefreshTime("2025-06-21T23:00:00.000+08:00", "3小时"); // 2025-06-22T02:00:00.000+08:00 - * calculateNextRefreshTime(null, "5小时"); // 1970-01-01T05:00:00.000+08:00 - * calculateNextRefreshTime("2025-06-20T10:00:00.000+08:00", "每1周 每天10点"); // 2025-06-23T04:00:00.000+08:00 - * calculateNextRefreshTime("2025-06-20T10:00:00.000+08:00", "每天10点 02:00 2小时"); // 2025-06-21T10:00:00.000+08:00 - * calculateNextRefreshTime("2025-06-20T10:00:00.000+08:00", "00:30 2小时"); // 2025-06-20T10:30:00.000+08:00 - * calculateNextRefreshTime("2025-06-21T10:00:00.000+08:00", "无效模式"); // null - */ -function calculateNextRefreshTime(lastRefreshTimeStr, refreshMode) { - let lastRunTime = lastRefreshTimeStr ? new Date(lastRefreshTimeStr) : getDefaultTime(); - let nextRunTime = null; - const lowerCaseRefreshMode = refreshMode.toLowerCase(); - - // 1. 匹配 "每(\d*)周" - let match = lowerCaseRefreshMode.match(/每(\d*)周/); - if (match) { - const weeks = parseInt(match[1] || "1", 10); // 如果没有数字，默认为1周 - - nextRunTime = new Date(lastRunTime); - // 找到 lastRunTime 所在周的周一 04:00 - nextRunTime.setDate(lastRunTime.getDate() - ((lastRunTime.getDay() + 6) % 7)); // 调整到上一个或当前周一 - nextRunTime.setHours(4, 0, 0, 0); // 固定到周一 04:00 - - // 确保 nextRunTime 至少晚于 lastRunTime。 - // 如果 lastRunTime 是周一 05:00，而计算出的是周一 04:00，则需要推到下个周期。 - while (nextRunTime <= lastRunTime) { - nextRunTime.setDate(nextRunTime.getDate() + 7); - } - if (weeks > 1) { - // 如果是多周周期，直接加上 weeks 周 - nextRunTime.setDate(nextRunTime.getDate() + 7 * (weeks - 1)); - } - } - - // 2. 匹配 "每(\d*)天(\d{1,2})点" - if (!nextRunTime) { - match = lowerCaseRefreshMode.match(/每(\d*)天(\d{1,2})点/); - if (match) { - const days = parseInt(match[1] || "1", 10); // 如果没有数字，默认为1天 - const hours = parseInt(match[2], 10); - - nextRunTime = new Date(lastRunTime); - nextRunTime.setHours(hours, 0, 0, 0); // 设置固定小时和分钟 - - // 确保 nextRunTime 至少晚于 lastRunTime。 - while (nextRunTime <= lastRunTime) { - nextRunTime.setDate(nextRunTime.getDate() + days); - } - } - } - - // 3. 匹配 "每(\d\d):(\d\d)" (作为间隔) - if (!nextRunTime) { - match = lowerCaseRefreshMode.match(/(\d{1,2}):(\d{2})/); - if (match) { - const intervalHours = parseInt(match[1], 10); - const intervalMinutes = parseInt(match[2], 10); - const intervalMs = (intervalHours * 60 + intervalMinutes) * 60 * 1000; - - if (intervalMs > 0) { - // 确保间隔有效 - nextRunTime = new Date(lastRunTime.getTime() + intervalMs); - } - } - } - - // 4. 匹配 "(\d+)小时" - if (!nextRunTime) { - match = lowerCaseRefreshMode.match(/(\d+)小时/); - if (match) { - const intervalHours = parseInt(match[1], 10); - const intervalMs = intervalHours * 60 * 60 * 1000; - - if (intervalMs > 0) { - // 确保间隔有效 - nextRunTime = new Date(lastRunTime.getTime() + intervalMs); - } - } - } - - return nextRunTime; -} - -/** - * 判断任务是否达到刷新时间 - * - * @param {string} refreshMode 刷新模式，例如 "每X周", "每X天Y点", "X小时", "每24:05" (表示每24小时零5分) - * @param {string} taskName 任务名称或采集资源名称 - * @param {string} [accountName] 账户名称，可选 - * @returns {{isRefreshed: boolean, lastRunTime: Date | null, nextRunTime: Date | null}} - * 返回一个对象，包含： - * - isRefreshed: boolean - 任务是否达到刷新时间。 - * - lastRunTime: Date | null - 任务上次运行的时间（如果未找到，则是getDefaultTime()返回的远古时间）。 - * - nextRunTime: Date | null - 计算出的下一次刷新时间。 - */ -function isTaskRefreshed(refreshMode, taskName, accountName = null) { - let record = {}; - const recordPath = `record/${accountName || "默认账号"}.json`; - try { - const content = file.readTextSync(recordPath); - record = JSON.parse(content); - } catch (e) { - log.debug(`无法读取或解析记录文件 ${recordPath}，错误: ${e.message}`); - } - - taskName = taskName || "默认任务"; - const lastRunTimeStr = record[taskName]; - const currentTime = new Date(); - const nextRunTime = calculateNextRefreshTime(lastRunTimeStr, refreshMode); - - let isRefreshed = false; - if (!nextRunTime) { - log.error(`无法解析刷新模式 "{0}"，请检查格式`, refreshMode); - } else { - isRefreshed = currentTime >= nextRunTime; - } - - const lastRunTime = lastRunTimeStr ? new Date(lastRunTimeStr) : getDefaultTime(); - return { - isRefreshed: isRefreshed, - lastRunTime: lastRunTime, // 返回实际的 Date 对象 - nextRunTime: nextRunTime, - }; -} - -/** - * 判断任务或资源是否仍然未刷新（对`isTaskRefreshed`的易用封装） - * - * @param {string} refreshMode 刷新模式，例如 "每X周", "每X天Y点", "X小时", "每24:05" (表示每24小时零5分) - * @param {string} taskName 任务名称或采集资源名称，可选 - * @param {string} [accountName] 账户名称，可选 - * @example - * // 运行结束时调用 - * updateTaskRunTime(); - * // 在脚本开头检查是否已刷新 - * if (taskIsNotRefresh("每天4点")) { - * return; - * } - */ -function taskIsNotRefresh(refreshMode, taskName = null, accountName = null) { - const { isRefreshed, lastRunTime, nextRunTime } = isTaskRefreshed(refreshMode, taskName, accountName); - - taskName = taskName || "默认任务"; - if (!isRefreshed) { - log.info("{0}未刷新(上次运行: {1}), 刷新时间: {2}", taskName, formatDateTimeShort(lastRunTime), formatDateTimeShort(nextRunTime)); - } - return !isRefreshed; -} - -/** - * 更新指定任务的上次运行时间为当前时间。 - * - * @param {string} taskName 任务名称。 - * @param {string} [accountName=null] 账户名称，可选，默认为null，表示使用默认账户。 - * @returns {boolean} 如果成功更新了任务的上次运行时间则返回true，否则返回false。 - */ -function updateTaskRunTime(taskName = null, accountName = null) { - let record = {}; - taskName = taskName || "默认任务"; - const recordPath = `record/${accountName || "默认账号"}.json`; - - // 1. 读取记录文件 - try { - const content = file.readTextSync(recordPath); - record = JSON.parse(content); - } catch (e) { - log.debug(`未能读取或解析记录文件 ${recordPath}，将创建新记录。错误: ${e.message}`); - } - - // 2. 更新指定任务的上次运行时间 - const currentTime = new Date(); - record[taskName] = formatDateTime(currentTime); // 格式化为本地时间字符串，便于人阅读 - - // 3. 将更新后的记录写回文件 - try { - file.writeTextSync(recordPath, JSON.stringify(record, null, 2)); - return true; - } catch (e) { - log.error(`写入文件 ${recordPath} 失败: ${e.message}`); - return false; - } -} - -/** - * 尝试切换队伍，如果失败则传送到七天神像后重试。 - * @param {string} partyName - 要切换的队伍名 - * @returns {Promise} - */ -async function switchPartySafely(partyName) { - if (!partyName) return; - - try { - if (!(await genshin.switchParty(partyName))) { - log.info("切换队伍失败，前往七天神像重试"); - await genshin.tpToStatueOfTheSeven(); - await genshin.returnMainUi(); // 确保传送完成 - await genshin.switchParty(partyName); - await genshin.returnMainUi(); - } - } catch { - log.error("队伍切换失败，可能处于联机模式或其他不可切换状态"); - await genshin.returnMainUi(); - } -} - -/** - * 获取账号名（通常用于区分不同账号的数据） - * - * @async - * @param {*} multiAccount 是否使用OCR区分多个账号（可以传入一个设置项） - * @param {boolean} mask 对UID进行掩码，只保留开头和结尾 - * @returns {Promise} 当前账号的UID，如果不区分多账号或OCR失败则返回"默认账号"。 - */ -async function getGameAccount(multiAccount = false, mask = true) { - let account = "默认账号"; - if (!multiAccount) { - return account; - } - - // 打开背包避免界面背景干扰 - // await genshin.returnMainUi(); - // keyPress("B"); - // await sleep(1000); - - const region = captureGameRegion(); - const ocrResults = RecognitionObject.ocr(region.width * 0.75, region.height * 0.75, region.width * 0.25, region.height * 0.25); - const resList = region.findMulti(ocrResults); - region.dispose(); - - for (let i = 0; i < resList.count; i++) { - const text = resList[i].text; - if (text.includes("UID")) { - const match = text.match(/\d+/); - if (match) { - account = match[0]; - if (mask) { - // 避免完整UID出现在log中造成意外暴露 - account = account.replace(/\d*(\d{4})\d{4}/, (match, group1) => match.replace(group1, "xxxx")); - } - } - break; - } - } - - if (account === "默认账号") { - log.error("未能提取到UID"); - } - - return account; -} - -/** - * 从 manifest.json 获取脚本自身名称 - * @returns {string} 脚本名称 - */ -function getScriptName() { - const content = file.readTextSync("manifest.json"); - const manifest = JSON.parse(content); - return manifest.name; -} - -/** - * 从文件路径中提取文件名。 - * @param {string} filePath - 文件路径。 - * @returns {string} - 文件名。 - */ -function basename(filePath) { - const lastSlashIndex = filePath.lastIndexOf("\\"); // 或者使用 '/' - return filePath.substring(lastSlashIndex + 1); -} - -/** - * 将路径分割为目录和文件名 - * @param {string} path - 文件完整路径 - * @returns {[string, string]} 返回数组，第一个元素是目录路径，第二个是文件名 - * @example - * const [dir, file] = splitPath('稻妻\\绯樱绣球\\06-绯樱绣球-神里屋敷-10个.json'); // ['稻妻\\绯樱绣球', '06-绯樱绣球-神里屋敷-10个.json'] - */ -function splitPath(path) { - const normalizedPath = path.replace(/\\/g, "/"); - const lastSlashIndex = normalizedPath.lastIndexOf("/"); - if (lastSlashIndex === -1) { - return ["", path]; - } - const dir = path.slice(0, lastSlashIndex); - const file = path.slice(lastSlashIndex + 1); - return [dir, file]; -} - -/** - * 将路径分割为主名和扩展名 - * @param {string} filename - 文件名或路径中的文件部分 - * @returns {[string, string]} 返回数组，第一个是主文件名，第二个是扩展名（含点） - * @example - * const [dir, file] = splitPath('稻妻\\绯樱绣球\\06-绯樱绣球-神里屋敷-10个.json'); // ['稻妻\\绯樱绣球\\06-绯樱绣球-神里屋敷-10个', '.json'] - */ -function splitExt(filename) { - const baseName = filename.includes("/") ? filename.slice(filename.lastIndexOf("/") + 1) : filename; - const lastDotIndex = baseName.lastIndexOf("."); - if (lastDotIndex <= 0) { - return [filename, ""]; - } - return [ - filename.slice(0, filename.length - (baseName.length - lastDotIndex)), - filename.slice(filename.length - (baseName.length - lastDotIndex)), - ]; -} - -/** - * 如果你需要一个很久以前的时间，作为默认时间 - * @returns {Date} 默认时间的Date对象 - */ -function getDefaultTime() { - const now = new Date(); - const year = now.getFullYear() - 18; - return new Date(year, 8, 28, 0, 0, 0); // 9月是month=8（0起始） -} - -/** - * 获取指定目录下所有指定后缀的文件列表（不含子文件夹） - * @param {string} taskDir - 目标目录路径 - * @param {string} [ext=".json"] - 文件后缀名（默认.json） - * @returns {string[]} 返回符合后缀的文件路径数组 - */ -function getFilesByExtension(taskDir, ext = ".json") { - const allFilesRaw = file.ReadPathSync(taskDir); - const extFiles = []; - - for (const filePath of allFilesRaw) { - if (filePath.endsWith(ext)) { - extFiles.push(filePath); - } - } - - return extFiles; -} - -/** - * 获取指定路径下所有最底层的文件夹（即不包含任何子文件夹的文件夹） - * @param {string} folderPath - 要遍历的根文件夹路径 - * @param {string[]} result - 用于收集最底层文件夹路径的数组 - * @returns {Promise} 所有最底层文件夹的路径 - */ -function getLeafFolders(folderPath, result = []) { - const filesInSubFolder = file.ReadPathSync(folderPath); - let hasSubFolder = false; - - for (const filePath of filesInSubFolder) { - if (file.IsFolder(filePath)) { - hasSubFolder = true; - // 递归查找子文件夹 - getLeafFolders(filePath, result); - } - } - - // 如果没有发现任何子文件夹，则当前为最底层文件夹 - if (!hasSubFolder) { - result.push(folderPath); - } - - return result; -} - -// 参考了 mno 大佬的函数 -function _fakeLogCore(name, isJs = true, dateIn = null) { - const isStart = isJs === (dateIn !== null); - const lastRun = isJs ? new Date() : dateIn; - const task = isJs ? "JS脚本" : "地图追踪任务"; - let logMessage = ""; - let logTime = new Date(); - if (isJs && isStart) { - // 传入开始时间是为了在跟踪路径耗时的同时仍然保留对脚本运行时间的统计 - // 但是如果脚本开始时间和结束时间跨天，就不能使用传入时间，否则会影响日志分析(Seconds cannot be negative) - if (logTime.getDay() === dateIn.getDay()) { - logTime = dateIn; - } - } - - const ms = logTime.getMilliseconds().toString().padStart(3, "0"); - // 时间部分从第11位开始，长度是12（"20:20:20"） - const formattedTime = formatDateTime(logTime).slice(11, 19) + "." + ms; - - if (isStart) { - logMessage = - `正在伪造开始的日志记录\n\n` + - `[${formattedTime}] [INF] BetterGenshinImpact.Service.ScriptService\n` + - `------------------------------\n\n` + - `[${formattedTime}] [INF] BetterGenshinImpact.Service.ScriptService\n` + - `→ 开始执行${task}: "${name}"`; - } else { - const durationInSeconds = (logTime.getTime() - lastRun.getTime()) / 1000; - const durationMinutes = Math.floor(durationInSeconds / 60); - const durationSeconds = (durationInSeconds % 60).toFixed(3); // 保留三位小数 - logMessage = - `正在伪造结束的日志记录\n\n` + - `[${formattedTime}] [INF] BetterGenshinImpact.Service.ScriptService\n` + - `→ 脚本执行结束: "${name}", 耗时: ${durationMinutes}分${durationSeconds}秒\n\n` + - `[${formattedTime}] [INF] BetterGenshinImpact.Service.ScriptService\n` + - `------------------------------`; - } - log.debug(logMessage); - return logTime; -} - -/** - * 在日志文件中创建可供BGI解析耗时的路径追踪记录，Start和End两个函数需配对使用 - * @param {string} name 要写入到日志的事项名，例如路径追踪的json文件名 - * @returns {Date} 此函数的调用时间的Date对象 - * @example - * let pathStart = logFakePathStart(fileName); - * // await pathingScript.runFile(jsonPath); - * logFakePathEnd(fileName, pathStart); - */ -function logFakePathStart(name) { - return _fakeLogCore(name, false); -} - -/** - * 在日志文件中创建可供BGI解析耗时的路径追踪记录，Start和End两个函数需配对使用 - * @param {string} name 要写入到日志的事项名，通常传入路径追踪的json文件名 - * @param {Date} startTime 调用`logFakePathStart`时返回的Date对象 - * @example - * let pathStart = logFakePathStart(fileName); - * // await pathingScript.runFile(jsonPath); - * logFakePathEnd(fileName, pathStart); - */ -function logFakePathEnd(name, startTime) { - return _fakeLogCore(name, false, startTime); -} - -/** - * 在日志文件中创建可供BGI解析耗时的脚本运行记录，Start和End两个函数需配对使用 - * @param {string} scriptName 脚本名，留空时将自动获取 - * @returns {Date} 此函数的调用时间的Date对象 - * @example - * let startTime = logFakeScriptStart(); - * // do something; - * logFakeScriptEnd({ startTime: startTime }); - */ -function logFakeScriptStart(scriptName = null) { - if (!scriptName) { - if (!scriptContext.scriptName) { - scriptContext.scriptName = getScriptName(); - } - scriptName = scriptContext.scriptName; - } - return _fakeLogCore(scriptName, true); -} - -/** - * 在日志文件中创建可供BGI解析耗时的脚本运行记录，Start和End两个函数需配对使用 - * @param {Object} params - * @param {string|null} [params.scriptName=null] - 脚本名，留空时将自动获取 - * @param {Date} [params.startTime=new Date()] - 调用`logFakeScriptStart`时返回的Date对象 - * @returns {Date} 此函数的调用时间的Date对象 - * @example - * let startTime = logFakeScriptStart(); - * // do something; - * logFakeScriptEnd({ startTime: startTime }); - */ -function logFakeScriptEnd({ scriptName = null, startTime = new Date() } = {}) { - if (!scriptName) { - if (!scriptContext.scriptName) { - scriptContext.scriptName = getScriptName(); - } - scriptName = scriptContext.scriptName; - } - return _fakeLogCore(scriptName, true, startTime); -} - -/** - * 等待传送结束 - * @param {Int} timeout 单位为ms - * @note 参考了七圣召唤七日历练脚本 - */ -async function waitTpFinish(timeout = 30000) { - const region = RecognitionObject.ocr(1690, 230, 75, 350); // 队伍名称区域 - const startTime = Date.now(); - - await sleep(500); //点击传送后等待一段时间避免误判 - while (Date.now() - startTime < timeout) { - const ro = captureGameRegion(); - let res = ro.find(region); - ro.dispose(); - if (!res.isEmpty()) { - await sleep(600); //传送结束后有僵直 - return; - } - await sleep(100); - } - throw new Error("传送时间超时"); -} +/** + * @author Ayaka-Main + * @link https://github.com/Patrick-Ze + * @description 提供一些通用性的功能函数。使用方法: 将此文件放在脚本目录下的 lib 文件夹中，然后在你的脚本开头处执行下面这行: + eval(file.readTextSync("lib/lib.js")); + */ + +let scriptContext = { + scriptStartTime: new Date(), + version: "2.0", +}; + +/** + * 将 Date 对象格式化为 ISO 8601 字符串，包含本地时区（如：2020-09-28T20:20:20+08:00） + * @param {Date} date - 要格式化的日期对象 + * @returns {string} 格式化后的字符串 + */ +function formatDateTime(date) { + const pad = (n) => n.toString().padStart(2, "0"); + + const year = date.getFullYear(); + const month = pad(date.getMonth() + 1); + const day = pad(date.getDate()); + const hour = pad(date.getHours()); + const minute = pad(date.getMinutes()); + const second = pad(date.getSeconds()); + + // 获取时区偏移（分钟），转换成±HH:MM + const offset = -date.getTimezoneOffset(); + const sign = offset >= 0 ? "+" : "-"; + const offsetHour = pad(Math.floor(Math.abs(offset) / 60)); + const offsetMin = pad(Math.abs(offset) % 60); + + return `${year}-${month}-${day}T${hour}:${minute}:${second}${sign}${offsetHour}:${offsetMin}`; +} + +/** + * 将 Date 对象以本地时区格式化为字符串，格式为 "MM-DD HH:mm:ss" + * @param {Date} date - 要格式化的日期对象 + * @returns {string} 格式化后的字符串 + */ +function formatDateTimeShort(date) { + const pad = (n) => n.toString().padStart(2, "0"); + + const month = pad(date.getMonth() + 1); + const day = pad(date.getDate()); + const hour = pad(date.getHours()); + const minute = pad(date.getMinutes()); + const second = pad(date.getSeconds()); + + return `${month}-${day} ${hour}:${minute}:${second}`; +} + +/** + * 计算两个 Date 对象的差值，并格式化为 HH:mm:ss 字符串。 + * + * @param {Date} date1 第一个 Date 对象。 + * @param {Date} date2 第二个 Date 对象。 + * @returns {string} 格式为 "HH:mm:ss" 的时间差字符串。 + */ +function formatTimeDifference(date1, date2) { + // 计算毫秒差值，确保总是正数 + const diffInMilliseconds = Math.abs(date2.getTime() - date1.getTime()); + + // 将毫秒转换为总秒数 + const totalSeconds = Math.floor(diffInMilliseconds / 1000); + + // 计算时、分、秒 + const hours = Math.floor(totalSeconds / 3600); + const minutes = Math.floor((totalSeconds % 3600) / 60); + const seconds = totalSeconds % 60; + + // 格式化为两位数 + const formattedHours = String(hours).padStart(2, "0"); + const formattedMinutes = String(minutes).padStart(2, "0"); + const formattedSeconds = String(seconds).padStart(2, "0"); + + return `${formattedHours}:${formattedMinutes}:${formattedSeconds}`; +} + +/** + * 判断当前时间是否已达到目标时间（目标时间基于脚本启动时间，支持跨天）。 + * @param {string} targetTimeStr - 目标时间，格式为 "HH:mm"。 + * @returns {boolean} 如果已达到目标时间，返回 true，否则返回 false。 + */ +function isTargetTimeReached(targetTimeStr) { + const now = new Date(); + const [targetHour, targetMinute] = targetTimeStr.split(":").map(Number); + + const target = new Date(scriptContext.scriptStartTime); + target.setHours(targetHour, targetMinute, 0, 0); + + // 如果目标时间早于脚本启动时间，则认为是第二天 + if (target <= scriptContext.scriptStartTime) { + target.setDate(target.getDate() + 1); + } + + return now >= target; +} + +/** + * 检查当前时间是否在排除的时间段内 + * @param {string} excludeTimeRange - 格式如 "05:20-09:28 20:20-21:28 23:20-00:30" + * @returns {Object} { duringRange: false or string, nearestStopTime: string} + */ +function checkExecutionExcludeTime(excludeTimeRange) { + const now = new Date(); + const currentMinutes = now.getHours() * 60 + now.getMinutes(); + const ONE_DAY_MINUTES = 1440; // 24 * 60 + + // 辅助函数：HH:mm 转分钟 + const timeToMinutes = (timeStr) => { + const [hrs, mins] = timeStr.trim().split(":").map(Number); + return hrs * 60 + mins; + }; + + const ranges = excludeTimeRange.split(/\s+/).map((range) => { + range = range.trim().replace("：", ":"); + const [startStr, endStr] = range.split("-"); + return { + start: timeToMinutes(startStr), + end: timeToMinutes(endStr), + raw: range, + startStr: startStr, + }; + }); + + let duringRange = false; + let nearestStopTime = null; + let minWaitTime = Infinity; + for (const range of ranges) { + const { start, end } = range; + // 判断是否处于当前范围（支持跨天逻辑，如 23:00-01:00） + const inThisRange = end < start ? currentMinutes >= start || currentMinutes < end : currentMinutes >= start && currentMinutes < end; + if (inThisRange) { + duringRange = range.raw; + break; + } + // 计算到该时间段开始的分钟数 (取模处理跨天) + const diff = (start - currentMinutes + ONE_DAY_MINUTES) % ONE_DAY_MINUTES; + if (diff < minWaitTime) { + minWaitTime = diff; + nearestStopTime = range.startStr; + } + } + return { duringRange, nearestStopTime }; +} + +/** + * 判断当前时间是否在给定时间范围内（支持跨天）。 + * @param {*} startStr 起始时间，格式为"HH:mm" + * @param {*} endStr 结束时间，格式为"HH:mm" + * @returns {boolean} 如果当前时间在范围内，返回 true，否则返回 false。 + */ +function isNowInTimeRange(startStr, endStr) { + const now = new Date(); + const [startHour, startMinute] = startStr.split(":").map(Number); + const [endHour, endMinute] = endStr.split(":").map(Number); + + const start = new Date(now); + start.setHours(startHour, startMinute, 0, 0); + + const end = new Date(now); + end.setHours(endHour, endMinute, 0, 0); + + // 如果结束时间早于开始时间，表示跨天 + if (end <= start) { + end.setDate(end.getDate() + 1); + } + return now >= start && now <= end; +} + +/** + * 根据上期刷新时间字符串和刷新模式计算下一次的刷新时间。 + * + * @param {string} lastRefreshTimeStr 上次刷新时间。如果为空或无效，将使用 getDefaultTime()。 + * @param {string} refreshMode 刷新模式，例如 "每X周", "每X天Y点", "每24:05" (表示每24小时零5分), "X小时", "每版本" + * @returns {Date | null} 计算出的下一次刷新时间Date对象，如果模式无法解析则返回null。 + * @example 已进行过的测试用例(用例中 GetDefaultTime() 返回 1970-01-01T00:00:00.000+08:00)： + * calculateNextRefreshTime("2025-06-01T10:00:00.000+08:00", "每1周"); // 2025-06-02T04:00:00.000+08:00 + * calculateNextRefreshTime("2025-06-02T03:00:00.000+08:00", "每1周"); // 2025-06-02T04:00:00.000+08:00 + * calculateNextRefreshTime("2025-06-02T05:00:00.000+08:00", "每1周"); // 2025-06-09T04:00:00.000+08:00 + * calculateNextRefreshTime(null, "每周"); // 1970-01-05T04:00:00.000+08:00 + * calculateNextRefreshTime("2025-06-02T03:00:00.000+08:00", "每2周"); // 2025-06-09T04:00:00.000+08:00 + * calculateNextRefreshTime("2025-06-20T22:00:00.000+08:00", "每天8点"); // 2025-06-21T08:00:00.000+08:00 + * calculateNextRefreshTime("2025-06-21T07:00:00.000+08:00", "每天08点"); // 2025-06-21T08:00:00.000+08:00 + * calculateNextRefreshTime("2025-06-21T09:00:00.000+08:00", "每天08点"); // 2025-06-22T08:00:00.000+08:00 + * calculateNextRefreshTime(null, "每天12点"); // 1970-01-01T12:00:00.000+08:00 + * calculateNextRefreshTime("2025-06-20T10:00:00.000+08:00", "每2天10点"); // 2025-06-22T10:00:00.000+08:00 + * calculateNextRefreshTime("2025-06-20T10:00:00.000+08:00", "每3天0点"); // 2025-06-23T00:00:00.000+08:00 + * calculateNextRefreshTime("2025-06-21T11:00:00.000+08:00", "00:30"); // 2025-06-21T11:30:00.000+08:00 + * calculateNextRefreshTime("2025-06-21T23:00:00.000+08:00", "02:00"); // 2025-06-22T01:00:00.000+08:00 + * calculateNextRefreshTime("2025-06-20T04:00:00.000+08:00", "每24:05"); // 2025-06-21T04:05:00.000+08:00 + * calculateNextRefreshTime(null, "01:00"); // 1970-01-01T01:00:00.000+08:00 + * calculateNextRefreshTime("2025-06-21T10:00:00.000+08:00", "2小时"); // 2025-06-21T12:00:00.000+08:00 + * calculateNextRefreshTime("2025-06-21T23:00:00.000+08:00", "3小时"); // 2025-06-22T02:00:00.000+08:00 + * calculateNextRefreshTime(null, "5小时"); // 1970-01-01T05:00:00.000+08:00 + * calculateNextRefreshTime("2025-06-20T10:00:00.000+08:00", "每1周 每天10点"); // 2025-06-23T04:00:00.000+08:00 + * calculateNextRefreshTime("2025-06-20T10:00:00.000+08:00", "每天10点 02:00 2小时"); // 2025-06-21T10:00:00.000+08:00 + * calculateNextRefreshTime("2025-06-20T10:00:00.000+08:00", "00:30 2小时"); // 2025-06-20T10:30:00.000+08:00 + * calculateNextRefreshTime("2025-06-21T10:00:00.000+08:00", "无效模式"); // null + */ +function calculateNextRefreshTime(lastRefreshTimeStr, refreshMode) { + let lastRunTime = lastRefreshTimeStr ? new Date(lastRefreshTimeStr) : getDefaultTime(); + let nextRunTime = null; + const lowerCaseRefreshMode = refreshMode.toLowerCase(); + + // 1. 匹配 "每(\d*)周" + let match = lowerCaseRefreshMode.match(/每(\d*)周/); + if (match) { + const weeks = parseInt(match[1] || "1", 10); // 如果没有数字，默认为1周 + + nextRunTime = new Date(lastRunTime); + // 找到 lastRunTime 所在周的周一 04:00 + nextRunTime.setDate(lastRunTime.getDate() - ((lastRunTime.getDay() + 6) % 7)); // 调整到上一个或当前周一 + nextRunTime.setHours(4, 0, 0, 0); // 固定到周一 04:00 + + // 确保 nextRunTime 至少晚于 lastRunTime。 + // 如果 lastRunTime 是周一 05:00，而计算出的是周一 04:00，则需要推到下个周期。 + while (nextRunTime <= lastRunTime) { + nextRunTime.setDate(nextRunTime.getDate() + 7); + } + if (weeks > 1) { + // 如果是多周周期，直接加上 weeks 周 + nextRunTime.setDate(nextRunTime.getDate() + 7 * (weeks - 1)); + } + } + + // 2. 匹配 "每(\d*)天(\d{1,2})点" + if (!nextRunTime) { + match = lowerCaseRefreshMode.match(/每(\d*)天(\d{1,2})点/); + if (match) { + const days = parseInt(match[1] || "1", 10); // 如果没有数字，默认为1天 + const hours = parseInt(match[2], 10); + + nextRunTime = new Date(lastRunTime); + nextRunTime.setHours(hours, 0, 0, 0); // 设置固定小时和分钟 + + // 确保 nextRunTime 至少晚于 lastRunTime。 + while (nextRunTime <= lastRunTime) { + nextRunTime.setDate(nextRunTime.getDate() + days); + } + } + } + + // 3. 匹配 "每(\d\d):(\d\d)" (作为间隔) + if (!nextRunTime) { + match = lowerCaseRefreshMode.match(/(\d{1,2}):(\d{2})/); + if (match) { + const intervalHours = parseInt(match[1], 10); + const intervalMinutes = parseInt(match[2], 10); + const intervalMs = (intervalHours * 60 + intervalMinutes) * 60 * 1000; + + if (intervalMs > 0) { + // 确保间隔有效 + nextRunTime = new Date(lastRunTime.getTime() + intervalMs); + } + } + } + + // 4. 匹配 "(\d+)小时" + if (!nextRunTime) { + match = lowerCaseRefreshMode.match(/(\d+)小时/); + if (match) { + const intervalHours = parseInt(match[1], 10); + const intervalMs = intervalHours * 60 * 60 * 1000; + + if (intervalMs > 0) { + // 确保间隔有效 + nextRunTime = new Date(lastRunTime.getTime() + intervalMs); + } + } + } + + // 5. 匹配 "每版本" + if (!nextRunTime) { + match = lowerCaseRefreshMode.match(/每(\d*)版本/); + if (match) { + const intervalVersions = parseInt(match[1] || "1", 10); // 如果没有数字，默认为1 + const baseDate = new Date("2025-01-01T04:00:00"); // v5.3 作为base版本 + const days = (lastRunTime - baseDate) / (1000 * 60 * 60 * 24); + const versionIndex = Math.trunc(days / 42); + nextRunTime = new Date(baseDate.getTime() + (versionIndex + intervalVersions) * 42 * 24 * 60 * 60 * 1000); + } + } + + return nextRunTime; +} + +/** + * 判断任务是否达到刷新时间 + * + * @param {string} refreshMode 刷新模式，例如 "每X周", "每X天Y点", "X小时", "每24:05" (表示每24小时零5分), "X小时", "每版本" + * @param {string} taskName 任务名称或采集资源名称 + * @param {string} [accountName] 账户名称，可选 + * @returns {{isRefreshed: boolean, lastRunTime: Date | null, nextRunTime: Date | null}} + * 返回一个对象，包含： + * - isRefreshed: boolean - 任务是否达到刷新时间。 + * - lastRunTime: Date | null - 任务上次运行的时间（如果未找到，则是getDefaultTime()返回的远古时间）。 + * - nextRunTime: Date | null - 计算出的下一次刷新时间。 + */ +function isTaskRefreshed(refreshMode, taskName, accountName = null) { + let record = {}; + const recordPath = `record/${accountName || "默认账号"}.json`; + try { + const content = file.readTextSync(recordPath); + record = JSON.parse(content); + } catch (e) { + log.debug(`无法读取或解析记录文件 ${recordPath}，错误: ${e.message}`); + } + + taskName = taskName || "默认任务"; + const lastRunTimeStr = record[taskName]; + const currentTime = new Date(); + const nextRunTime = calculateNextRefreshTime(lastRunTimeStr, refreshMode); + + let isRefreshed = false; + if (!nextRunTime) { + log.error(`无法解析刷新模式 "{0}"，请检查格式`, refreshMode); + } else { + isRefreshed = currentTime >= nextRunTime; + } + + const lastRunTime = lastRunTimeStr ? new Date(lastRunTimeStr) : getDefaultTime(); + return { + isRefreshed: isRefreshed, + lastRunTime: lastRunTime, // 返回实际的 Date 对象 + nextRunTime: nextRunTime, + }; +} + +/** + * 判断任务或资源是否仍然未刷新（对`isTaskRefreshed`的易用封装） + * + * @param {string} refreshMode 刷新模式，例如 "每X周", "每X天Y点", "X小时", "每24:05" (表示每24小时零5分), "X小时", "每版本" + * @param {string} taskName 任务名称或采集资源名称，可选 + * @param {string} [accountName] 账户名称，可选 + * @example + * // 运行结束时调用 + * await updateTaskRunTime(); + * // 在脚本开头检查是否已刷新 + * if (taskIsNotRefresh("每天4点")) { + * return; + * } + */ +function taskIsNotRefresh(refreshMode, taskName = null, accountName = null) { + const { isRefreshed, lastRunTime, nextRunTime } = isTaskRefreshed(refreshMode, taskName, accountName); + + taskName = taskName || "默认任务"; + if (!isRefreshed) { + log.info("{0}未刷新(上次运行: {1}), 刷新时间: {2}", taskName, formatDateTimeShort(lastRunTime), formatDateTimeShort(nextRunTime)); + } + return !isRefreshed; +} + +/** + * 更新指定任务的上次运行时间为当前时间。 + * + * @param {string} taskName 任务名称。 + * @param {string} [accountName=null] 账户名称，可选，默认为null，表示使用默认账户。 + * @returns {boolean} 如果成功更新了任务的上次运行时间则返回true，否则返回false。 + */ +async function updateTaskRunTime(taskName = null, accountName = null) { + let record = {}; + taskName = taskName || "默认任务"; + const recordPath = `record/${accountName || "默认账号"}.json`; + + //捕获任务取消的信息，避免执行到后面的进度更新函数 + try { + await sleep(10); + } catch (error) { + return error.toString(); + } + // 1. 读取记录文件 + try { + const content = file.readTextSync(recordPath); + record = JSON.parse(content); + } catch (e) { + log.debug(`未能读取或解析记录文件 ${recordPath}，将创建新记录。错误: ${e.message}`); + } + + // 2. 更新指定任务的上次运行时间 + const currentTime = new Date(); + record[taskName] = formatDateTime(currentTime); // 格式化为本地时间字符串，便于人阅读 + + // 3. 将更新后的记录写回文件 + try { + file.writeTextSync(recordPath, JSON.stringify(record, null, 2)); + return true; + } catch (e) { + log.error(`写入文件 ${recordPath} 失败: ${e.message}`); + return false; + } +} + +/** + * 尝试切换队伍，如果失败则传送到七天神像后重试。 + * @param {string} partyName - 要切换的队伍名 + * @returns {boolean} 切换过程触使用了强制传送到神像 + */ +async function switchPartySafely(partyName) { + let teleported = false; + if (!partyName) return teleported; + + try { + if (!(await genshin.switchParty(partyName))) { + log.info("切换队伍失败，前往七天神像重试"); + await genshin.tpToStatueOfTheSeven(); + await genshin.returnMainUi(); // 确保传送完成 + teleported = true; + await genshin.switchParty(partyName); + await genshin.returnMainUi(); + } + } catch { + log.error("队伍切换失败，可能处于联机模式或其他不可切换状态"); + await genshin.returnMainUi(); + } + return teleported; +} + +/** + * 获取账号名（通常用于区分不同账号的数据） + * + * @async + * @param {*} multiAccount 是否使用OCR区分多个账号（可以传入一个设置项） + * @param {boolean} mask 对UID进行掩码，只保留开头和结尾 + * @returns {Promise} 当前账号的UID，如果不区分多账号或OCR失败则返回"默认账号"。 + */ +async function getGameAccount(multiAccount = false, mask = true) { + let account = "默认账号"; + if (!multiAccount) { + return account; + } + + // 打开背包避免界面背景干扰 + // await genshin.returnMainUi(); + // keyPress("B"); + // await sleep(1000); + + const region = captureGameRegion(); + const ocrResults = RecognitionObject.ocr(region.width * 0.75, region.height * 0.75, region.width * 0.25, region.height * 0.25); + const resList = region.findMulti(ocrResults); + region.dispose(); + + for (let i = 0; i < resList.count; i++) { + const text = resList[i].text; + if (text.includes("UID")) { + const match = text.match(/\d+/); + if (match) { + account = match[0]; + if (mask) { + // 避免完整UID出现在log中造成意外暴露 + account = account.replace(/\d*(\d{4})\d{4}/, (match, group1) => match.replace(group1, "xxxx")); + } + } + break; + } + } + + if (account === "默认账号") { + log.error("未能提取到UID"); + } + + return account; +} + +/** + * 从 manifest.json 获取脚本自身名称 + * @returns {string} 脚本名称 + */ +function getScriptName() { + const content = file.readTextSync("manifest.json"); + const manifest = JSON.parse(content); + return manifest.name; +} + +function fileExists(fullPath) { + const [dirpath, filename] = splitPath(fullPath); + const normalizedPath = fullPath.replaceAll("/", "\\"); + const files = Array.from(file.ReadPathSync(dirpath)); + return files.includes(normalizedPath); +} + +/** + * 重写内置函数，解决每次读取不存在的文件时必然出现的、不可抑制的Error消息问题 + * + * 该问题由于 [PR#2412](https://github.com/babalae/better-genshin-impact/pull/2412) 导致， + * 并且[看起来也不会修复](https://github.com/babalae/better-genshin-impact/issues/2474) + */ +function readTextSync(fullPath) { + if (fileExists(fullPath)) { + return file.readTextSync(fullPath); + } else { + throw new Error("FileNotFound: " + fullPath); + } +} + +/** + * 从文件路径中提取文件名。 + * @param {string} filePath - 文件路径。 + * @returns {string} - 文件名。 + */ +function basename(filePath) { + const normalizedPath = filePath.replace(/\\/g, "/"); + const lastSlashIndex = normalizedPath.lastIndexOf("/"); + return filePath.substring(lastSlashIndex + 1); +} + +/** + * 将路径分割为目录和文件名 + * @param {string} path - 文件完整路径 + * @returns {[string, string]} 返回数组，第一个元素是目录路径，第二个是文件名 + * @example + * const [dir, file] = splitPath('稻妻\\绯樱绣球\\06-绯樱绣球-神里屋敷-10个.json'); // ['稻妻\\绯樱绣球', '06-绯樱绣球-神里屋敷-10个.json'] + */ +function splitPath(path) { + const normalizedPath = path.replace(/\\/g, "/"); + const lastSlashIndex = normalizedPath.lastIndexOf("/"); + if (lastSlashIndex === -1) { + return [".", path]; + } + const dir = path.slice(0, lastSlashIndex); + const file = path.slice(lastSlashIndex + 1); + return [dir, file]; +} + +/** + * 将路径分割为主名和扩展名 + * @param {string} filename - 文件名或路径中的文件部分 + * @returns {[string, string]} 返回数组，第一个是主文件名，第二个是扩展名（含点） + * @example + * const [dir, file] = splitExt('稻妻\\绯樱绣球\\06-绯樱绣球-神里屋敷-10个.json'); // ['稻妻\\绯樱绣球\\06-绯樱绣球-神里屋敷-10个', '.json'] + */ +function splitExt(filename) { + const baseName = filename.includes("/") ? filename.slice(filename.lastIndexOf("/") + 1) : filename; + const lastDotIndex = baseName.lastIndexOf("."); + if (lastDotIndex <= 0) { + return [filename, ""]; + } + return [ + filename.slice(0, filename.length - (baseName.length - lastDotIndex)), + filename.slice(filename.length - (baseName.length - lastDotIndex)), + ]; +} + +/** + * 如果你需要一个很久以前的时间，作为默认时间 + * @returns {Date} 默认时间的Date对象 + */ +function getDefaultTime() { + const now = new Date(); + const year = now.getFullYear() - 18; + return new Date(year, 8, 28, 0, 0, 0); // 9月是month=8（0起始） +} + +/** + * 获取指定目录下指定后缀的文件 + * @param {string} folderPath - 要遍历的根文件夹路径 + * @param {string} suffix - 目标文件后缀 + * @returns {string[]} 匹配后缀的所有文件路径 + */ +function getFilesBySuffix(folderPath, suffix, recursive = true) { + let files = []; + const items = file.ReadPathSync(folderPath); + + for (const itemPath of items) { + if (recursive && file.IsFolder(itemPath)) { + const subFolderFiles = getFilesBySuffix(itemPath, suffix, recursive); + // 将子目录返回的数组合并到当前数组中 + files = files.concat(subFolderFiles); + } else { + // 如果是文件且匹配后缀 + if (itemPath.endsWith(suffix)) { + files.push(itemPath); + } + } + } + + return files; +} + +/** + * 获取指定路径下所有最底层的文件夹（即不包含任何子文件夹的文件夹） + * @param {string} folderPath - 要遍历的根文件夹路径 + * @param {string[]} result - 用于收集最底层文件夹路径的数组 + * @returns {Promise} 所有最底层文件夹的路径 + */ +function getLeafFolders(folderPath, result = []) { + const filesInSubFolder = file.ReadPathSync(folderPath); + let hasSubFolder = false; + + for (const filePath of filesInSubFolder) { + if (file.IsFolder(filePath)) { + hasSubFolder = true; + // 递归查找子文件夹 + getLeafFolders(filePath, result); + } + } + + // 如果没有发现任何子文件夹，则当前为最底层文件夹 + if (!hasSubFolder) { + result.push(folderPath); + } + + return result; +} + +// 参考了 mno 大佬的函数 +function _fakeLogCore(name, isJs = true, dateIn = null) { + const isStart = isJs === (dateIn !== null); + const lastRun = isJs ? new Date() : dateIn; + const task = isJs ? "JS脚本" : "地图追踪任务"; + let logMessage = ""; + let logTime = new Date(); + if (isJs && isStart) { + // 传入开始时间是为了在跟踪路径耗时的同时仍然保留对脚本运行时间的统计 + // 但是如果脚本开始时间和结束时间跨天，就不能使用传入时间，否则会影响日志分析(Seconds cannot be negative) + if (logTime.getDate() === dateIn.getDate()) { + logTime = dateIn; + } + } + + const ms = logTime.getMilliseconds().toString().padStart(3, "0"); + // 时间部分从第11位开始，长度是12（"20:20:20"） + const formattedTime = formatDateTime(logTime).slice(11, 19) + "." + ms; + + if (isStart) { + logMessage = + `正在伪造开始的日志记录\n\n` + + `[${formattedTime}] [INF] BetterGenshinImpact.Service.ScriptService\n` + + `------------------------------\n\n` + + `[${formattedTime}] [INF] BetterGenshinImpact.Service.ScriptService\n` + + `→ 开始执行${task}: "${name}"`; + } else { + const durationInSeconds = (logTime.getTime() - lastRun.getTime()) / 1000; + const durationMinutes = Math.floor(durationInSeconds / 60); + const durationSeconds = (durationInSeconds % 60).toFixed(3); // 保留三位小数 + logMessage = + `正在伪造结束的日志记录\n\n` + + `[${formattedTime}] [INF] BetterGenshinImpact.Service.ScriptService\n` + + `→ 脚本执行结束: "${name}", 耗时: ${durationMinutes}分${durationSeconds}秒\n\n` + + `[${formattedTime}] [INF] BetterGenshinImpact.Service.ScriptService\n` + + `------------------------------`; + } + log.debug(logMessage); + return logTime; +} + +/** + * 在日志文件中创建可供BGI解析耗时的路径追踪记录，Start和End两个函数需配对使用 + * @param {string} name 要写入到日志的事项名，例如路径追踪的json文件名 + * @returns {Date} 此函数的调用时间的Date对象 + * @example + * let pathStart = logFakePathStart(fileName); + * // await pathingScript.runFile(jsonPath); + * logFakePathEnd(fileName, pathStart); + */ +function logFakePathStart(name) { + return _fakeLogCore(name, false); +} + +/** + * 在日志文件中创建可供BGI解析耗时的路径追踪记录，Start和End两个函数需配对使用 + * @param {string} name 要写入到日志的事项名，通常传入路径追踪的json文件名 + * @param {Date} startTime 调用`logFakePathStart`时返回的Date对象 + * @example + * let pathStart = logFakePathStart(fileName); + * // await pathingScript.runFile(jsonPath); + * logFakePathEnd(fileName, pathStart); + */ +function logFakePathEnd(name, startTime) { + return _fakeLogCore(name, false, startTime); +} + +/** + * 在日志文件中创建可供BGI解析耗时的脚本运行记录，Start和End两个函数需配对使用 + * @param {string} scriptName 脚本名，留空时将自动获取 + * @returns {Date} 此函数的调用时间的Date对象 + * @example + * let startTime = logFakeScriptStart(); + * // do something; + * logFakeScriptEnd({ startTime: startTime }); + */ +function logFakeScriptStart(scriptName = null) { + if (!scriptName) { + if (!scriptContext.scriptName) { + scriptContext.scriptName = getScriptName(); + } + scriptName = scriptContext.scriptName; + } + return _fakeLogCore(scriptName, true); +} + +/** + * 在日志文件中创建可供BGI解析耗时的脚本运行记录，Start和End两个函数需配对使用 + * @param {Object} params + * @param {string|null} [params.scriptName=null] - 脚本名，留空时将自动获取 + * @param {Date} [params.startTime=new Date()] - 调用`logFakeScriptStart`时返回的Date对象 + * @returns {Date} 此函数的调用时间的Date对象 + * @example + * let startTime = logFakeScriptStart(); + * // do something; + * logFakeScriptEnd({ startTime: startTime }); + */ +function logFakeScriptEnd({ scriptName = null, startTime = new Date() } = {}) { + if (!scriptName) { + if (!scriptContext.scriptName) { + scriptContext.scriptName = getScriptName(); + } + scriptName = scriptContext.scriptName; + } + return _fakeLogCore(scriptName, true, startTime); +} + +/** + * 等待传送结束 + * @param {Int} timeout 单位为ms + * @note 参考了七圣召唤七日历练脚本 + */ +async function waitTpFinish(timeout = 30000) { + const region = RecognitionObject.ocr(1690, 230, 75, 350); // 队伍名称区域 + const startTime = Date.now(); + + await sleep(500); //点击传送后等待一段时间避免误判 + while (Date.now() - startTime < timeout) { + const ro = captureGameRegion(); + let res = ro.find(region); + ro.dispose(); + if (!res.isEmpty()) { + await sleep(600); //传送结束后有僵直 + return; + } + await sleep(100); + } + throw new Error("传送时间超时"); +} + +function calculateDistance(point1, point2) { + const deltaX = point1.x - point2.x; + const deltaY = point1.y - point2.y; + const distance = Math.sqrt(Math.pow(deltaX, 2) + Math.pow(deltaY, 2)); + return distance; +} diff --git a/repo/js/CD-Aware-AutoGather/lib/ocr.js b/repo/js/CD-Aware-AutoGather/lib/ocr.js new file mode 100644 index 000000000..90ec5efc3 --- /dev/null +++ b/repo/js/CD-Aware-AutoGather/lib/ocr.js @@ -0,0 +1,200 @@ +const defaultReplacementMap = { + 监: "盐", + 卵: "卯", +}; + +/** + * 绘制方框以标记OCR区域 + * + * @param {number[4] | {x: number, y: number, width: number, height: number}} ocrRegion - OCR 区域，数组或对象形式，表示 [x, y, width, height] + * @param {object|null} [captureRegion=null] - 截图区域对象。为 null 时自动调用 captureGameRegion() + * @throws {TypeError} 当 ocrRegion 既不是数组也不是对象时抛出。 + */ +function drawOcrRegion(ocrRegion, captureRegion = null) { + let x, y, width, height; + if (Array.isArray(ocrRegion)) { + [x, y, width, height] = ocrRegion; + } else if (typeof ocrRegion === "object" && ocrRegion !== null) { + ({ x, y, width, height } = ocrRegion); + } else { + throw new TypeError("'ocrRegion' must be an array [x, y, width, height] or an object with x, y, width, height properties"); + } + + let auto_created = false; + if (captureRegion === null) { + captureRegion = captureGameRegion(); + auto_created = true; + } + let region = captureRegion.DeriveCrop(x, y, width, height); + let name = [x, y, width, height].toString(); + region.DrawSelf(name); + region.dispose(); + if (auto_created) { + captureRegion.dispose(); + } +} + +async function getTextInRegion(ocrRegion, timeout = 5000, retryInterval = 50, replacementMap = defaultReplacementMap) { + let x, y, width, height; + if (Array.isArray(ocrRegion)) { + [x, y, width, height] = ocrRegion; + } else if (typeof ocrRegion === "object" && ocrRegion !== null) { + ({ x, y, width, height } = ocrRegion); + } else { + throw new Error("Invalid parameter 'ocrRegion'"); + } + + const debugThreshold = timeout / retryInterval / 3; + let startTime = Date.now(); + let retryCount = 0; // 重试计数 + while (Date.now() - startTime < timeout) { + let captureRegion = captureGameRegion(); + try { + // 尝试 OCR 识别 + let resList = captureRegion.findMulti(RecognitionObject.ocr(x, y, width, height)); // 指定识别区域 + // 遍历识别结果，检查是否找到目标文本 + for (let res of resList) { + // 后处理：根据替换映射表检查和替换错误识别的字符 + let correctedText = res.text; + for (let [wrongChar, correctChar] of Object.entries(replacementMap)) { + correctedText = correctedText.replace(new RegExp(wrongChar, "g"), correctChar); + } + + captureRegion.dispose(); + return correctedText.trim(); + } + } catch (error) { + log.warn(`页面标志识别失败，正在进行第 ${retryCount} 次重试...`); + } + retryCount++; // 增加重试计数 + if (retryCount > debugThreshold) { + let region = captureRegion.DeriveCrop(x, y, width, height); + region.DrawSelf("debug"); + region.dispose(); + } + captureRegion.dispose(); + await sleep(retryInterval); + } + return null; +} + +async function waitForTextAppear(targetText, ocrRegion, timeout = 5000, retryInterval = 50, replacementMap = defaultReplacementMap) { + let x, y, width, height; + + if (Array.isArray(ocrRegion)) { + [x, y, width, height] = ocrRegion; + } else if (typeof ocrRegion === "object" && ocrRegion !== null) { + ({ x, y, width, height } = ocrRegion); + } else { + throw new Error("Invalid parameter 'ocrRegion'"); + } + + const debugThreshold = timeout / retryInterval / 3; + let startTime = Date.now(); + let retryCount = 0; // 重试计数 + while (Date.now() - startTime < timeout) { + let captureRegion = captureGameRegion(); + try { + // 尝试 OCR 识别 + let resList = captureRegion.findMulti(RecognitionObject.ocr(x, y, width, height)); // 指定识别区域 + // 遍历识别结果，检查是否找到目标文本 + for (let res of resList) { + // 后处理：根据替换映射表检查和替换错误识别的字符 + let correctedText = res.text; + for (let [wrongChar, correctChar] of Object.entries(replacementMap)) { + correctedText = correctedText.replace(new RegExp(wrongChar, "g"), correctChar); + } + + if (correctedText.includes(targetText)) { + captureRegion.dispose(); + return { success: true, wait_time: Date.now() - startTime }; + } + } + } catch (error) { + log.warn(`页面标志识别失败，正在进行第 ${retryCount} 次重试...`); + } + retryCount++; // 增加重试计数 + if (retryCount > debugThreshold) { + let region = captureRegion.DeriveCrop(x, y, width, height); + region.DrawSelf("debug"); + region.dispose(); + } + captureRegion.dispose(); + await sleep(retryInterval); + } + return { success: false }; +} + +async function recognizeTextAndClick(targetText, ocrRegion, timeout = 5000, retryInterval = 50, replacementMap = defaultReplacementMap) { + let x, y, width, height; + + if (Array.isArray(ocrRegion)) { + [x, y, width, height] = ocrRegion; + } else if (typeof ocrRegion === "object" && ocrRegion !== null) { + ({ x, y, width, height } = ocrRegion); + } else { + throw new Error("Invalid parameter 'ocrRegion'"); + } + + const debugThreshold = timeout / retryInterval / 3; + let startTime = Date.now(); + let retryCount = 0; // 重试计数 + while (Date.now() - startTime < timeout) { + let captureRegion = captureGameRegion(); + try { + // 尝试 OCR 识别 + let resList = captureRegion.findMulti(RecognitionObject.ocr(x, y, width, height)); // 指定识别区域 + // 遍历识别结果，检查是否找到目标文本 + for (let res of resList) { + // 后处理：根据替换映射表检查和替换错误识别的字符 + let correctedText = res.text; + for (let [wrongChar, correctChar] of Object.entries(replacementMap)) { + correctedText = correctedText.replace(new RegExp(wrongChar, "g"), correctChar); + } + + if (correctedText.includes(targetText)) { + // 如果找到目标文本，计算并点击文字的中心坐标 + let centerX = Math.round(res.x + res.width / 2); + let centerY = Math.round(res.y + res.height / 2); + await click(centerX, centerY); + await sleep(50); + captureRegion.dispose(); + return { success: true, x: centerX, y: centerY }; + } + } + } catch (error) { + log.warn(`页面标志识别失败，正在进行第 ${retryCount} 次重试...`); + } + retryCount++; // 增加重试计数 + if (retryCount > debugThreshold) { + let region = captureRegion.DeriveCrop(x, y, width, height); + region.DrawSelf("debug"); + region.dispose(); + } + captureRegion.dispose(); + await sleep(retryInterval); + } + return { success: false }; +} + +async function isTextExistedInRegion(searchText, ocrRegion) { + let x, y, width, height; + if (Array.isArray(ocrRegion)) { + [x, y, width, height] = ocrRegion; + } else if (typeof ocrRegion === "object" && ocrRegion !== null) { + ({ x, y, width, height } = ocrRegion); + } else { + throw new Error("Invalid parameter 'ocrRegion'"); + } + let captureRegion = captureGameRegion(); + const result = captureRegion.find(RecognitionObject.ocr(x, y, width, height)); + captureRegion.dispose(); + if (result.text) { + if (typeof searchText === "string") { + return result.text.includes(searchText); + } else if (searchText instanceof RegExp) { + return result.text.match(searchText); + } + } + return false; +} diff --git a/repo/js/CD-Aware-AutoGather/main.js b/repo/js/CD-Aware-AutoGather/main.js index 423632a21..c97d64b30 100644 --- a/repo/js/CD-Aware-AutoGather/main.js +++ b/repo/js/CD-Aware-AutoGather/main.js @@ -1,23 +1,24 @@ eval(file.readTextSync("lib/lib.js")); +eval(file.readTextSync("lib/ocr.js")); +eval(file.readTextSync("lib/inventory.js")); const settingFile = "settings.json"; const defaultTime = getDefaultTime(); -const CooldownDataBase = readRefreshInfo("CooldownData.txt"); +const countryList = ["蒙德", "璃月", "稻妻", "须弥", "枫丹", "纳塔", "挪德卡莱", "至冬"]; +const collectAbility = { + hydro_collect: "水", + electro_collect: "雷", + anemo_collect: "风", + pyro_collect: "火", + nahida_collect: "纳西妲", +}; let stopAtTime = null; let currentParty = null; +let currentMap = "Teyvat"; +let worldInfo = null; +let partyAbility = {}; let runMode = settings.runMode; -let subscribeMode = settings.subscribeMode; - -// 用用戶自定義的唯一ID來區分不同帳號 -async function get_profile_name() { - if (!settings.iHaveMultipleAccounts || settings.iHaveMultipleAccounts.trim() === "") { - // 使用OCR讀取UID作為目錄名 - const uid = await getGameAccount(true, true); - return String(uid); - } - return settings.iHaveMultipleAccounts.toString().trim(); -} class ReachStopTime extends Error { constructor(message) { @@ -33,171 +34,229 @@ class UserCancelled extends Error { } (async function () { + setGameMetrics(1920, 1080, 1.25); + if (!file.IsFolder("pathing")) { let batFile = "SymLink.bat"; - log.error("{0}文件夹不存在，请双击运行本脚本目录下的{1}文件以创建文件夹链接", "pathing", batFile); + log.error("{0}文件夹不存在，请在BetterGI中右键点击本脚本，选择{1}。然后双击脚本目录下的{2}文件以创建文件夹链接", "pathing", "打开所在目录", batFile); return; } if (!runMode) { - const defaultRunMode = "采集选中的材料"; + const defaultRunMode = "扫描文件夹更新可选材料列表"; log.warn("运行模式 未选择或无效: {0}，默认为{1}", runMode, defaultRunMode); runMode = defaultRunMode; - } - if (!subscribeMode) { - const defaultSubscribeMode = "每次自动扫描，并采集扫描到的所有材料"; - log.warn("已订阅的任务目录的处理方式 未选择或无效: {0}，默认为{1}", subscribeMode, defaultSubscribeMode); - subscribeMode = defaultSubscribeMode; - } - if (!settings.runMode || !settings.subscribeMode) { await sleep(3000); } log.info("当前运行模式:{0}", runMode); if (runMode === "扫描文件夹更新可选材料列表") { await runScanMode(); + settings.runMode = "采集选中的材料"; + log.info("扫描完成，自动更新设置：下次脚本将以{0}模式运行", settings.runMode); } else if (runMode === "采集选中的材料") { let startTime = logFakeScriptStart(); - log.info("已订阅的任务目录的处理方式：{0}", subscribeMode); - if (subscribeMode === "每次自动扫描，并采集扫描到的所有材料") { - await runScanMode(); - } await runGatherMode(); logFakeScriptEnd({ startTime: startTime }); - } else if (runMode === "清除运行记录（重置材料刷新时间）") { - await runClearMode(); } })(); // 扫描文件夹更新可选材料列表 async function runScanMode() { - // 1. 扫描所有最底层路径 - const focusFolders = ["地方特产", "矿物", "食材与炼金"]; - const pathList = focusFolders.flatMap((fd) => getLeafFolders(`pathing/${fd}`)); - - // 2. 读取配置模板 - const templateText = file.readTextSync("settings.template.json"); + // 读取配置模板 + const templateText = readTextSync("assets/settings.template.json"); let config = JSON.parse(templateText); + const configMap = {}; - // 将地方特产按照国家顺序排序 - const countryList = ["蒙德", "璃月", "稻妻", "须弥", "枫丹", "纳塔", "挪德卡莱", "至冬"]; - const sortedList = pathList.slice().sort((a, b) => { - const getRegion = (p) => p.split("\\")[2]; - const aIndex = countryList.indexOf(getRegion(a)); - const bIndex = countryList.indexOf(getRegion(b)); - return (aIndex === -1 ? Infinity : aIndex) - (bIndex === -1 ? Infinity : bIndex); - }); - - // 3. 处理每个路径 - let count = 0; - actions_map = {}; - for (const path of sortedList) { - const info = getCooldownInfoFromPath(path); - const jsonFiles = filterFilesInTaskDir(info.label); - - if (jsonFiles.length === 0) { - log.info("{0}内无json文件，跳过", path); - } else if (info.coolType === null) { - log.warn("路径{0}未匹配到对应的刷新机制，跳过", path); - await sleep(100); - } else { - config.push({ - name: info.name, - label: "⬇️ " + info.label, - type: "checkbox", - }); - count += 1; - - const actions = scanSpecialCollectMethod(jsonFiles); - if (actions.length > 0) { - actions_map[path] = actions; - } - } + // 扫描地方特产 + const { countryToSpecialties, specialtyToFiles } = scanLocalSpecialty(); + const localSpecialtyByCountry = {}; + for (const [country, specialties] of Object.entries(countryToSpecialties)) { + localSpecialtyByCountry[country] = {}; + specialties.forEach((specialty) => { + localSpecialtyByCountry[country][specialty] = specialtyToFiles[specialty] || []; + }); } - // 4. 写入新的配置（格式化输出） + configMap["selectLocalSpecialtyByCountry"] = localSpecialtyByCountry; + const cfgLocalSpecialtyByCountry = Object.keys(localSpecialtyByCountry).map((country, index) => { + const name = "selectLocalSpecialty_" + country; + configMap[name] = localSpecialtyByCountry[country]; + return { + label: (index === 0 ? "\n【单独选择地方特产】\n\n" : "") + `${country}`, + type: "multi-checkbox", + name: name, + options: Object.keys(localSpecialtyByCountry[country]).sort((a, b) => a.localeCompare(b, "zh")), + }; + }); + config = config.concat(cfgLocalSpecialtyByCountry); + + // 扫描食材与炼金材料 + const otherJsonFiles = scanAndFilterJsonFiles("pathing/食材与炼金"); + const otherMaterialByName = await groupByMaterialName(otherJsonFiles); + const cfgOtherMaterial = { + label: "\n【食材与炼金】", + type: "multi-checkbox", + name: "selectFoodAndAlchemy", + options: Object.keys(otherMaterialByName).sort((a, b) => a.localeCompare(b, "zh")), + }; + const miscEntry = config.find((entry) => entry.name === "selectMiscellaneous"); + const miscOptions = miscEntry && miscEntry.options ? miscEntry.options : []; + configMap["selectMiscellaneous"] = miscOptions.reduce((acc, k) => { + if (k in otherMaterialByName) { + acc[k] = otherMaterialByName[k]; + } + return acc; + }, {}); + configMap["selectFoodAndAlchemy"] = otherMaterialByName; + + if (Object.keys(otherMaterialByName).length > 0) { + config.push({ type: "separator" }); + config.push(cfgOtherMaterial); + } + + const forgingOreJsonFiles = scanAndFilterJsonFiles("pathing/矿物"); + const forgingOreByname = await groupByMaterialName(forgingOreJsonFiles); + configMap["selectForgingOre"] = forgingOreByname; + const flattenedSpecialties = Object.assign({}, ...Object.values(localSpecialtyByCountry)); + const allMaterials = { + ...flattenedSpecialties, + ...forgingOreByname, + ...(otherMaterialByName["晶蝶"] ? { 晶蝶: otherMaterialByName["晶蝶"] } : {}), + ...otherMaterialByName, + }; + + // 生成按大类选择的配置数据 + configMap["selectByCategory"] = { + 地方特产: specialtyToFiles, + 矿物: forgingOreByname, + 食材与炼金: otherMaterialByName, + }; + + const multiRouteMaterials = {}; + for (const [material, paths] of Object.entries(allMaterials)) { + const dirs = [...new Set(paths.map((p) => p.substring(0, p.lastIndexOf("\\"))))]; + if (dirs.length <= 1) continue; + + // 1. 计算公共前缀长度 + const sorted = [...dirs].sort(); + let pLen = 0; + while (pLen < sorted[0].length && sorted[0][pLen] === sorted[sorted.length - 1][pLen]) pLen++; + + const groupMap = {}; + paths.forEach((path) => { + const dir = path.substring(0, path.lastIndexOf("\\")); + + // 2. 仅去除公共前缀、开头的材料名及反斜杠 + let name = dir.slice(pLen); + if (name.startsWith(material)) name = name.slice(material.length); + name = name.replace(/^\\+/, "") || "(根目录)"; + + (groupMap[name] ??= []).push(path); + }); + + multiRouteMaterials[material] = groupMap; + } + + const cfgMultiRouteMaterials = Object.entries(multiRouteMaterials).map(([material, groupMap], idx) => { + const firstPaths = Object.values(groupMap)[0][0]; // 假设 groupMap 的值是路径数组 + const items = firstPaths.split("\\"); + const mIndex = items.indexOf(material); + const tip_items = items.slice(1, mIndex + 1); + const name = "selectRoute_" + material; + configMap[name] = groupMap; + return { + label: (idx === 0 ? "\n【对于具有多版本路线的物品，选择要使用的路线】\n\n" : "") + tip_items.join("\\"), + type: "multi-checkbox", + name: name, + options: Object.keys(groupMap).sort((a, b) => a.localeCompare(b, "zh")), + }; + }); + if (Object.keys(multiRouteMaterials).length > 0) { + config.push({ type: "separator" }); + config = config.concat(cfgMultiRouteMaterials); + } + // 写入新的配置（格式化输出） file.writeTextSync(settingFile, JSON.stringify(config, null, 2)); - log.info("共{0}组有效路线，请在脚本配置中勾选需要采集的材料", count); - // 5. 分析所需角色信息 - analysisCharacterRequirement(actions_map); - await sleep(3000); + return configMap; } // 采集选中的材料 async function runGatherMode() { - if (settings.stopAtTime) { - stopAtTime = settings.stopAtTime; + if (settings.excludeTimeRange) { + const { duringRange, nearestStopTime } = checkExecutionExcludeTime(settings.excludeTimeRange); + if (duringRange) { + log.info("当前处于设定的不运行时间段: {0}", duringRange); + return; + } + stopAtTime = nearestStopTime; log.info("脚本已被配置为达到{0}后停止运行", stopAtTime); } - const selectedMaterials = getSelectedMaterials(); + const configMap = await runScanMode(); + // file.writeTextSync("configMap.json", JSON.stringify(configMap, null, 2)); + const isAllEmpty = Object.values(configMap.selectByCategory).every((value) => Object.keys(value).length === 0); + if (isAllEmpty) { + log.error("尚未订阅任何路线，请在BetterGI中订阅需要的路线后再运行"); + return; + } - if (selectedMaterials.length === 0) { + const selectedMaterials = getSelectedMaterials(configMap); + const materialNames = Object.keys(selectedMaterials); + if (materialNames.length === 0) { log.error("未选择任何材料，请在脚本配置中勾选所需项目"); return; } + log.info("共选中{0}种材料: {1}", materialNames.length, materialNames.join(", ")); - log.info("共{0}组材料路线待执行:", selectedMaterials.length); - for (const item of selectedMaterials) { - const info = getCooldownInfoFromPath(item.label); - log.info(` - {0} (${info.coolType}刷新)`, item.label || item.name); + let account = settings.manualSetAccountName || ""; + if (!account) { + worldInfo = await getCoOpModeAndHostUid(); + // 使用掩码后的UID作为账户名，避免浮窗和日志等意外暴露用户UID + account = worldInfo.maskUid; } - let account = await get_profile_name(); - log.info("为{0}采集材料并管理CD", account); - - // 1. 先检查是否有任何任务需要执行（CD已刷新） - let hasExpiredTask = false; - const defaultTimeValue = getDefaultTime(); - - for (const pathTask of selectedMaterials) { - const recordFile = getRecordFilePath(account, pathTask); - const jsonFiles = pathTask.jsonFiles; - - // 读取记录文件（与原始逻辑完全相同） - const recordMap = {}; - try { - const text = file.readTextSync(recordFile); - for (const line of text.split("\n")) { - const [p, t] = line.trim().split("\t"); - if (p && t) { - recordMap[p] = new Date(t); - } - } - } catch (error) { - log.debug(`记录文件{0}不存在或格式错误`, recordFile); - // 记录文件不存在或格式错误，说明有任务需要执行 - hasExpiredTask = true; - break; - } - - // 检查是否有文件过期（使用相同的保底机制） - for (const jsonPath of jsonFiles) { - const fileName = basename(jsonPath); - const lastTime = recordMap[fileName] || defaultTimeValue; // 相同的保底逻辑 - if (Date.now() > lastTime) { - hasExpiredTask = true; - break; - } - } - - if (hasExpiredTask) { - break; - } - } - - if (!hasExpiredTask) { + const groupedTasks = groupTasksByMaterialsName(selectedMaterials, account); + const refreshedMaterials = Object.entries(groupedTasks) + .filter(([name, info]) => info.refreshed === true) + .map(([name, info]) => name); + if (refreshedMaterials.length === 0) { log.info("所有选中的材料都还在冷却中，无需执行"); return; } - - // 2. 有任务需要执行，现在才切换队伍 - await switchPartySafely(settings.partyName); - currentParty = settings.partyName; + // 按物品数量计算实际待执行的任务，并按照数量差额从大到小的顺序排序 + updateTargetCountOfTasks(groupedTasks, configMap, account, settings.targetCountOfSelected); + const groupedTasksToRun = await calculateTodoTasksByCount(groupedTasks); + const sortedTasksToRun = sortTasksByGap(groupedTasksToRun); + // file.writeTextSync("sortedTasksToRun.json", JSON.stringify(sortedTasksToRun, null, 2)); + + log.info("共{0}种材料需要采集，将从缺失数量最多的材料开始", Object.keys(sortedTasksToRun).length); + for (const [name, { target, current, tasks }] of Object.entries(sortedTasksToRun)) { + const coolType = tasks[0].coolType; + const targetTxt = target === null ? "∞" : target; + log.info(` - {0} (${coolType}, ${current} -> ${targetTxt})`, name); + // 短暂地休眠以便用户有机会看清日志。相比大世界随便个动作花的时间，这都不算啥 + await sleep(50); + } + + log.info("在{0}的世界采集材料并管理CD", account); + // 传送到神像，回血，安全切换队伍，确保 currentMap 是提瓦特 + log.info("前往神像进行采集前的准备工作"); + await genshin.tpToStatueOfTheSeven(); + if (worldInfo === null) { + worldInfo = await getCoOpModeAndHostUid(); + } + if (worldInfo.coOpMode) { + log.info("当前处于联机模式，不执行队伍切换"); + } else { + await switchPartySafely(settings.partyName); + currentParty = settings.partyName; + } + + // 开始实际采集 dispatcher.addTimer(new RealtimeTimer("AutoPick")); - // 3. 执行所有选中的任务（原始函数内部会再次检查CD） try { - for (const pathTask of selectedMaterials) { - await runPathTaskIfCooldownExpired(account, pathTask); + for (const [name, taskInfo] of Object.entries(sortedTasksToRun)) { + await runPathTaskIfCooldownExpired(name, taskInfo); } } catch (e) { if (e instanceof ReachStopTime) { @@ -210,32 +269,218 @@ async function runGatherMode() { } } -// 清除运行记录（重置材料刷新时间） -async function runClearMode() { - const selectedMaterials = getSelectedMaterials(); +function scanAndFilterJsonFiles(folderPath) { + const jsonFiles = getFilesBySuffix(folderPath, ".json"); + jsonFiles.sort((a, b) => a.localeCompare(b, "zh", { numeric: true })); - if (selectedMaterials.length === 0) { - log.error("未选择任何材料，请在脚本配置中勾选所需项目"); + const filterConfig = settings.filterPathByKeywords; + if (!filterConfig || !filterConfig.trim()) return jsonFiles; + + let finalRegex; + // 1. 如果以 regex: 开头，直接解析后面的内容 + if (filterConfig.startsWith("regex:")) { + const pattern = filterConfig.replace("regex:", "").trim(); + finalRegex = new RegExp(pattern); } - const resetTimeStr = formatDateTime(getDefaultTime()); - let account = await get_profile_name(); - for (const pathTask of selectedMaterials) { - const recordFile = getRecordFilePath(account, pathTask); - const lines = pathTask.jsonFiles.map((filePath) => { - return `${basename(filePath)}\t${resetTimeStr}`; + // 2. 如果以 include: 开头，生成“至少包含其一”的正则 + else if (filterConfig.startsWith("include:")) { + const keywords = filterConfig.replace("include:", "").trim().split(/\s+/); + // 逻辑：(词A|词B|词C) + const pattern = `(${keywords.join("|")})`; + finalRegex = new RegExp(pattern); + } + // 3. 否则，生成“不得包含任一”的正则 (排除模式) + else { + const keywords = filterConfig.trim().split(/\s+/); + // 逻辑：使用负向先行断言 ^((?!词A|词B|词C).)*$ + // 这表示从头到尾的任何位置都不能匹配到关键词 + const pattern = `^((?!(?:${keywords.join("|")})).)*$`; + finalRegex = new RegExp(pattern); + } + + const result = jsonFiles.reduce( + (acc, path) => { + if (finalRegex.test(path)) { + acc.passed.push(path); + } else { + acc.excluded.push(path); + } + return acc; + }, + { passed: [], excluded: [] } + ); + + if (result.excluded.length > 0) { + log.info(`{0}扫描完成：根据配置排除了${result.excluded.length}条路线，详见日志`, basename(folderPath)); + log.debug("过滤配置: {0}, 排除的文件:\n" + result.excluded.join("\n"), filterConfig); + } + return result.passed; +} + +function getMaterialCD(name, path = null) { + let cdType = getItemCD(name); + if (cdType === null && path !== null) { + if (path.includes("地方特产")) { + cdType = "46小时"; + } + } + return cdType; +} + +function groupTasksByMaterialsName(selectedMaterials, account) { + const groupedTasks = {}; + const materialRefreshStatus = {}; + for (const [name, jsonFiles] of Object.entries(selectedMaterials)) { + // 每个材料名下可能有多个不同的目录任务。使用对象暂存，以便按 dirSlug 去重 + const tasksMap = {}; + const coolType = getMaterialCD(name, jsonFiles[0]); + materialRefreshStatus[name] = false; + + for (const jsonPath of jsonFiles) { + const parts = jsonPath.split("\\"); + const fileName = parts[parts.length - 1]; // 获取最后一行（文件名） + // 路径处理：去掉首项(pathing)和末项(文件名)，提取中间目录 + const dirPath = parts.slice(1, parts.length - 1).join("\\"); + const dirSlug = dirPath.replace(/[^\u4e00-\u9fa5\w]+/g, "_"); + const recordFile = `record/${account}/${dirSlug}.txt`; + // 如果这个分组还没初始化，则初始化 + if (!tasksMap.hasOwnProperty(dirSlug)) { + const refreshTime = {}; + if (fileExists(recordFile)) { + try { + const text = readTextSync(recordFile); + if (text) { + for (const line of text.split("\n")) { + const pair = line.trim().split("\t"); + if (pair.length >= 2) { + const [fName, t] = pair; + refreshTime[fName] = new Date(t); + } + } + } + } catch (error) { + log.debug("解析运行记录文件时出错: {0}", error.toString()); + } + } else { + log.debug("记录文件不存在: {0}", recordFile); + } + + // 将同一目录下的所有 JSON 归纳为一个 Task + tasksMap[dirSlug] = { + label: dirSlug, + coolType: coolType, + recordFile: recordFile, + jsonFiles: [], + refreshTime: refreshTime, + }; + } + + // 将当前 JSON 文件加入到对应分组的 jsonFiles 列表中 + if (!tasksMap[dirSlug].jsonFiles.includes(jsonPath)) { + tasksMap[dirSlug].jsonFiles.push(jsonPath); + } + const nextRefreshTime = tasksMap[dirSlug]['refreshTime'][fileName] || defaultTime; + if (Date.now() > nextRefreshTime) { + materialRefreshStatus[name] = true; + } + } + // 将该材料下所有的任务组转为数组存入 groupedTasks + groupedTasks[name] = { refreshed: false, target: null, current: 0, tasks: Object.values(tasksMap) }; + } + Object.entries(materialRefreshStatus).forEach(([name, status]) => { + groupedTasks[name].refreshed = status; + }); + return groupedTasks; +} + +function updateTargetCountOfTasks(groupedTasks, configMap, account, targetCount) { + const csvFile = `record/${account}/采集目标.csv`; + if (targetCount) { + const targetCountText = targetCount.trim().toLowerCase(); + if (targetCountText === "csv") { + log.info("使用{0}中设置的采集目标", csvFile); + // 1 基于当前的 configMap 得到结构 + const { hierarchy, materialPaths } = getInitialHierarchy(configMap); + // 2 与 CSV 文件同步（读取旧值 + 补全缺失 + 写回） + const syncedData = syncWithCsv(csvFile, hierarchy); + // 3 计算最终生效的数量：结果将是 { "绯樱绣球": 20, ... } + const materialsTarget = calculateFinalTargets(syncedData, materialPaths); + for (const [name, target] of Object.entries(materialsTarget)) { + if (groupedTasks.hasOwnProperty(name)) { + groupedTasks[name].target = target; + } + } + } else { + const fixedCount = parseInt(targetCountText, 10); + if (isNaN(fixedCount)) { + log.error("采集目标数量设置无效{0}，终止运行", targetCount); + throw new Error("Invalid target count"); + } + for (const info of Object.values(groupedTasks)) { + info.target = fixedCount; + } + } + } else { + log.info("未设置采集目标数量"); + } +} + +async function calculateTodoTasksByCount(groupedTasks) { + // 获取目标不为null的材料的当前数量 + const materialsHasTarget = Object.keys(groupedTasks).filter((name) => groupedTasks[name].target !== null); + let currentCounts = {}; + if (materialsHasTarget.length === 0) { + log.info("所有选中材料的采集目标均为空"); + } else { + currentCounts = await getItemCount(materialsHasTarget); + const unknownCountMaterials = []; + Object.entries(currentCounts).forEach(([key, value]) => { + if (value < 0) { + unknownCountMaterials.push(key); + } + groupedTasks[key].current = value < 0 ? 0 : value; }); - const content = lines.join("\n"); - file.writeTextSync(recordFile, content); - log.info("已重置{0}的刷新时间", pathTask.label); + if (unknownCountMaterials.length > 0) { + log.warn("获取以下材料的数量失败，默认视为0: {0}", unknownCountMaterials.join(", ")); + } } - log.info("已重置{0}组刷新时间。如需重置所有材料刷新时间，请直接删除record目录下对应账号的文件夹", selectedMaterials.length); + + const groupedTasksToRun = {}; + const skippedSummary = { 未刷新: [], 数量已达标: [] }; + for (const [name, info] of Object.entries(groupedTasks)) { + const { refreshed, target, current } = info; + let reason = ""; + if (refreshed) { + if (target !== null && target <= current) { + log.debug(`{0}的数量已达标 (${current}/${target})`, name); + reason = "数量已达标"; + } + } else { + reason = "未刷新"; + } + if (reason) { + skippedSummary[reason].push(name); + } else { + groupedTasksToRun[name] = info; + } + } + for (const [reason, names] of Object.entries(skippedSummary)) { + if (names.length > 0) { + log.info(`跳过{0}种${reason}的材料: {1}`, names.length, names.join(",")); + await sleep(100); + } + } + return groupedTasksToRun; } function scanSpecialCollectMethod(jsonFiles) { const actions = jsonFiles.flatMap((filePath) => { try { - const data = JSON.parse(file.readTextSync(filePath)); - return data.positions.map((p) => p.action).filter((a) => a); + const data = JSON.parse(readTextSync(filePath)); + return data.positions + .map((p) => p.action) + .filter((a) => a) // 确保 action 存在 + .map((a) => collectAbility[a] ?? a); } catch (e) { log.warn(`json文件无效: {0}: ${e.message}`, filePath); return []; @@ -244,15 +489,310 @@ function scanSpecialCollectMethod(jsonFiles) { return [...new Set(actions)]; } -function readRefreshInfo(filePath) { - const lines = file.readTextSync(filePath).split(/\r?\n/); - const dict = {}; - for (const line of lines) { - if (!line.trim()) continue; // 跳过空行 - const [key, value] = line.split(":"); - dict[key.trim()] = value ? value.trim() : ""; +// 扫描地方特产并按国家排序 +function scanLocalSpecialty() { + const countryToSpecialtiesRaw = {}; // 暂存 国家 -> Set(特产名) + const specialtyToFiles = {}; // 映射 特产名 -> [路径列表] + const separator = "\\"; + + const jsonFiles = scanAndFilterJsonFiles("pathing/地方特产"); + // 1. 遍历并归类数据 + jsonFiles.forEach((path) => { + const parts = path.split(separator); + const idx = parts.indexOf("地方特产"); + if (idx !== -1 && parts[idx + 2]) { + const country = parts[idx + 1]; + const specialty = parts[idx + 2]; + // 填充 特产名 -> 路径列表 + (specialtyToFiles[specialty] ??= []).push(path); + // 填充 国家 -> 特产名集合 (使用 Set 自动去重) + (countryToSpecialtiesRaw[country] ??= new Set()).add(specialty); + } + }); + + // 2. 按照 countryList 排序国家映射，并将 Set 转换为 Array + const sortedCountries = Object.keys(countryToSpecialtiesRaw).sort((a, b) => { + const indexA = countryList.indexOf(a); + const indexB = countryList.indexOf(b); + return (indexA === -1 ? 999 : indexA) - (indexB === -1 ? 999 : indexB); + }); + + const countryToSpecialties = {}; + sortedCountries.forEach((country) => { + // 将 Set 转换为数组，这样结果就是 { "璃月": ["夜泊石", "星螺"] } + countryToSpecialties[country] = Array.from(countryToSpecialtiesRaw[country]); + }); + + return { + countryToSpecialties, // 格式: { "国家名": ["特产1", "特产2"] } + specialtyToFiles, // 格式: { "特产名": ["路径1.json", "路径2.json"] } + }; +} + +async function groupByMaterialName(jsonFiles) { + const missingCdInfo = new Set(); + const materialPathMap = {}; + const separator = "\\"; + + for (const path of jsonFiles) { + const parts = path.split(separator); + if (parts.length > 2) { + const name = parts[2]; + const cdType = getMaterialCD(name, path); + if (cdType === null) { + missingCdInfo.add(name); + } else { + (materialPathMap[name] || (materialPathMap[name] = [])).push(path); + } + } } - return dict; + if (missingCdInfo.size > 0) { + log.warn("未获取到以下物品的CD信息: {0}", Array.from(missingCdInfo).join(", ")); + await sleep(200); + } + return materialPathMap; +} + +/** + * 1. 生成扁平化层级字典 (带名字映射) + */ +function getInitialHierarchy(configMap) { + const hierarchy = {}; + const materialPaths = new Set(); // 用于记录哪些路径是叶子节点（材料） + + const nameMapping = { + selectLocalSpecialtyByCountry: "地方特产", + selectForgingOre: "矿物", + selectFoodAndAlchemy: "食材与炼金", + }; + + function traverse(currentObj, currentPath, currentKey) { + hierarchy[currentPath] = null; + + // 如果是数组，说明 currentPath 是一个具体的材料路径 + if (Array.isArray(currentObj)) { + materialPaths.add(currentPath); + return; + } + + if (typeof currentObj !== "object" || currentObj === null) return; + + for (const key in currentObj) { + if (Object.prototype.hasOwnProperty.call(currentObj, key)) { + traverse(currentObj[key], currentPath + "\\" + key, key); + } + } + } + + for (const [apiKey, chineseName] of Object.entries(nameMapping)) { + if (configMap[apiKey]) traverse(configMap[apiKey], chineseName, chineseName); + } + + return { hierarchy, materialPaths }; +} + +/** + * 2. 同步 CSV 文件并回写 + * 逻辑：保留 CSV 已有的值，新增 configMap 里的新路径，删除已废弃路径 + * 读取时：非法/空内容 -> null + * 写入时：null -> 空字符串 + */ +function syncWithCsv(filePath, configHierarchy) { + const csvData = {}; + + // 1. 读取并解析现有 CSV + if (fileExists(filePath)) { + try { + const content = readTextSync(filePath).replace(/^\ufeff/, ""); + // 使用正则切分行，同时兼容 Windows (\r\n) 和 Linux (\n) 换行符 + const lines = content.split(/\r?\n/).slice(1); // 跳过标题行 + + // 匹配 CSV 字段的正则表达式： + // 1. (?:^|,) -> 匹配行首或逗号 + // 2. "(?:[^"]|"")*" -> 匹配双引号括起来的内容（允许其中包含连续两个双引号 ""） + // 3. [^,]* -> 或者匹配不含逗号的普通文本 + const csvRegex = /"(?:[^"]|"")*"|[^,]+/g; + + lines.forEach((line) => { + const trimmedLine = line.trim(); + if (!trimmedLine) return; // 跳过空行 + + const parts = []; + let match; + + // 使用 exec 循环获取所有匹配的字段 + while ((match = csvRegex.exec(trimmedLine)) !== null) { + let field = match[0]; + + // 如果字段被双引号包裹，进行还原处理 + if (field.startsWith('"') && field.endsWith('"')) { + // 去掉首尾引号，并将内部的 "" 还原为 " + field = field.slice(1, -1).replace(/""/g, '"'); + } + parts.push(field); + } + + if (parts.length >= 2) { + const path = parts[0]; + const rawVal = parts[1]; + + // 尝试解析为整数 + const parsedInt = parseInt(rawVal, 10); + // 无法解析为 int 的内容（NaN）都视为 null + csvData[path] = isNaN(parsedInt) ? null : parsedInt; + } + }); + } catch (e) { + log.debug("读取{0}文件时失败，未正确获取到采集目标 ({1})", filePath, e.toString()); + } + } else { + log.info("{0}不存在，建立新文件供用户使用", filePath); + } + + // 2. 以 configMap 的结构为基准进行合并 + const updatedDict = {}; + Object.keys(configHierarchy).forEach((path) => { + // 如果 CSV 里有就用 CSV 的解析结果，否则初始化为 null + updatedDict[path] = csvData.hasOwnProperty(path) ? csvData[path] : null; + }); + + // 3. 排序（按深度从浅到深） + const sortedKeys = Object.keys(updatedDict).sort((a, b) => { + const depthA = (a.match(/\\/g) || []).length; + const depthB = (b.match(/\\/g) || []).length; + return depthA - depthB || 0; + }); + + // 4. 写回 CSV (UTF-8 BOM) + let csvContent = "\ufeff物品,目标数量\n"; + sortedKeys.forEach((key) => { + const val = updatedDict[key]; + // 写入时：null 表达为空字符串 + const displayVal = val === null ? "" : val; + + // 处理路径中可能存在的特殊字符 + let escapedPath = key; + if (key.includes(",") || key.includes('"')) { + escapedPath = `"${key.replace(/"/g, '""')}"`; + } + + csvContent += `${escapedPath},${displayVal}\n`; + }); + + try { + file.writeTextSync(filePath, csvContent); + log.info("CSV配置同步成功: {0}", filePath); + } catch (e) { + log.info("CSV写入失败: {0} ({1})",filePath, e.toString()); + } + + return updatedDict; +} + +/** + * 计算最终目标数量 (结果只保留材料名称) + * @param {Object} syncedDict - 从 CSV 同步后的带路径字典 + * @param {Set} materialPaths - 材料路径集合 + */ +function calculateFinalTargets(syncedDict, materialPaths) { + const tempPathResults = {}; // 存储路径到计算值的映射 + const finalMaterialResults = {}; // 存储材料名到计算值的映射 + + const sortedPaths = Object.keys(syncedDict); + + sortedPaths.forEach((path) => { + const currentVal = syncedDict[path]; + let calculatedVal; + + // --- 继承逻辑 --- + if (currentVal !== null) { + calculatedVal = currentVal; + } else { + // 当前节点为 null，尝试寻找父级 + const lastSlashIndex = path.lastIndexOf("\\"); + if (lastSlashIndex !== -1) { + const parentPath = path.substring(0, lastSlashIndex); + // 继承父级的值 (如果父级也是 null，则继续保持 null) + calculatedVal = tempPathResults.hasOwnProperty(parentPath) ? tempPathResults[parentPath] : null; + } else { + // 顶层节点且为 null + calculatedVal = null; + } + } + + // 存入临时表供后代节点参考 + tempPathResults[path] = calculatedVal; + + // --- 核心修改：如果是材料节点，则提取名称存入最终结果 --- + if (materialPaths.has(path)) { + const pathParts = path.split("\\"); + const materialName = pathParts[pathParts.length - 1]; + // 最终结果：可能是 数字，也可能是 null + finalMaterialResults[materialName] = calculatedVal; + } + }); + + return finalMaterialResults; +} + +/** + * 对待运行任务进行排序：按缺失数量降序，null 排最后 + * @param {Object} tasksToRun - 筛选出的待运行任务字典 + */ +function sortTasksByGap(tasksToRun) { + // 1. 将对象转换为数组 [ [name, info], [name, info], ... ] + const taskEntries = Object.entries(tasksToRun); + + // 2. 执行排序 + taskEntries.sort((a, b) => { + const infoA = a[1]; + const infoB = b[1]; + + const isANull = infoA.target === null; + const isBNull = infoB.target === null; + + if (isANull && !isBNull) return 1; + if (!isANull && isBNull) return -1; + if (isANull && isBNull) return 0; + + // 正常数值情况：按 (target - current) 降序排列 + const gapA = infoA.target - infoA.current; + const gapB = infoB.target - infoB.current; + + return gapB - gapA; // 降序：差距大的在前 + }); + + // 3. 将排序后的数组重新构建回对象 + const sortedTasks = {}; + taskEntries.forEach(([name, info]) => { + sortedTasks[name] = info; + }); + + return sortedTasks; +} + +function calculateAvatarsAbility(avatars) { + const elements_map = JSON.parse(readTextSync("assets/avatar_elements.json")); + const avatar2element = {}; + for (const key in elements_map) { + if (elements_map.hasOwnProperty(key)) { + const values = elements_map[key]; + values.forEach((ele) => { + avatar2element[ele] = key; + }); + } + } + const ability_set = new Set(); + for (const avatar of avatars) { + if (avatar === "纳西妲") { + ability_set.add(avatar); + } + const element = avatar2element[avatar]; + if (element) { + ability_set.add(element); + } + } + return [...ability_set]; } function analysisCharacterRequirement(actions_map) { @@ -304,7 +844,6 @@ function analysisCharacterRequirement(actions_map) { const outFile = `各条路线所需角色.txt`; let text = ""; - // text = JSON.stringify(analysisResult, null, 2); for (const [key, values] of Object.entries(analysisResult)) { text += `${key}\n`; for (const v of values) { @@ -315,15 +854,6 @@ function analysisCharacterRequirement(actions_map) { log.info("详细路线需求见{x}，可考虑组两支队伍{0}和{1}以满足采集需要", outFile, "钟纳水雷", "钟纳火风"); } -function getRecordFilePath(account, pathTask) { - const taskName = pathTask.name.replace(/^OPT_/, ""); - return `record/${account}/${taskName}.txt`; -} - -function filterFilesInTaskDir(taskDir) { - return getFilesByExtension("pathing\\" + taskDir, ".json"); -} - async function runPathScriptFile(jsonPath) { await pathingScript.runFile(jsonPath); //捕获任务取消的信息并跳出循环 @@ -335,298 +865,270 @@ async function runPathScriptFile(jsonPath) { return false; } -async function runPathTaskIfCooldownExpired(account, pathTask) { - const recordFile = getRecordFilePath(account, pathTask); - const jsonFiles = pathTask.jsonFiles; +async function runPathTaskIfCooldownExpired(material, taskInfo) { + let { current } = taskInfo; + const { target, tasks } = taskInfo; + const totalPathCount = tasks.reduce((sum, t) => sum + t.jsonFiles.length, 0); + log.info("{0}有{1}组任务，共{2}条路线", material, tasks.length, totalPathCount); - log.info("{0}共有{1}条路线", pathTask.label, jsonFiles.length); - - // 2. 读取记录文件（路径 -> 时间） - const recordMap = {}; - try { - const text = file.readTextSync(recordFile); - for (const line of text.split("\n")) { - const [p, t] = line.trim().split("\t"); - if (p && t) { - recordMap[p] = new Date(t); - } - } - } catch (error) { - log.debug(`记录文件{0}不存在或格式错误`, recordFile); - } - - // 坐标检查函数 - async function checkPositionChange(mapName, startX, startY) { - try { - await genshin.returnMainUi(); - const endPos = await genshin.getPositionFromMap(mapName); - const endX = endPos.x; - const endY = endPos.y; - - const diffX = Math.abs(endX - startX); - const diffY = Math.abs(endY - startY); - const totalDiff = diffX + diffY; - - return { - success: true, - totalDiff: totalDiff, - shouldUpdate: totalDiff >= 5 - }; - } catch (error) { - log.error(`获取结束坐标失败: ${error.message}`); - return { - success: false, - totalDiff: 0, - shouldUpdate: false - }; - } - } - - // 3. 检查哪些 json 文件已过刷新时间 - for (let i = 0; i < jsonFiles.length; i++) { - const jsonPath = jsonFiles[i]; - const fileName = basename(jsonPath); - const pathName = fileName.split(".")[0]; - const lastTime = recordMap[fileName] || defaultTime; - const progress = `[${i + 1}/${jsonFiles.length}]`; - - if (stopAtTime && isTargetTimeReached(stopAtTime)) { - throw new ReachStopTime("达到设置的停止时间，终止运行"); - } - - if (Date.now() > lastTime) { - let pathStart = logFakePathStart(fileName); - log.info(`${progress}{0}: 开始执行`, pathName); - - let pathStartTime = new Date(); - - // 声明变量用于坐标检查 - let startX, startY, mapName, gotStartPos = false; - - // 获取地图名称和起始坐标 - try { - await genshin.returnMainUi(); - const jsonContent = file.readTextSync(jsonPath); - const jsonData = JSON.parse(jsonContent); - mapName = jsonData.info?.map_name || "Teyvat"; - const startPos = await genshin.getPositionFromMap(mapName); - startX = startPos.x; - startY = startPos.y; - gotStartPos = true; - } catch (error) { - log.error(`获取起始坐标失败: ${error.message}`); + // 开始执行任务 + const knownAbilities = Object.values(collectAbility); + const allJsonFiles = tasks.flatMap(task => task.jsonFiles); + totalLoop: for (const pathTask of tasks) { + const { coolType, recordFile, jsonFiles, refreshTime } = pathTask; + for (const jsonPath of jsonFiles) { + if (stopAtTime && isTargetTimeReached(stopAtTime)) { + throw new ReachStopTime("达到设置的停止时间，终止运行"); } - // 延迟抛出`UserCancelled`，以便正确更新运行记录 - const cancel = await runPathScriptFile(jsonPath); + const fileName = basename(jsonPath); + const pathName = fileName.split(".")[0]; + const pathRefreshTime = refreshTime[fileName] || defaultTime; + // 使用indexOf计算进度，避免数数的方法在continue时繁琐的处理 + const progress = `[${allJsonFiles.indexOf(jsonPath)+1}/${totalPathCount}]`; - let diffTime = new Date() - pathStartTime; + if (Date.now() > pathRefreshTime) { + log.info(`${progress}{0}: 开始执行`, pathName); - // 如果用户取消，抛出异常 - if (cancel) { - log.info(`${progress}{0}: 用户取消任务，不更新记录`, pathName); - throw new UserCancelled(cancel); - } - - // 如果运行时间太短，尝试切换队伍 - if (diffTime < 1000) { - // "队伍中没有对应元素角色"的错误不会抛出为异常，只能通过路径文件迅速结束来推测 - if (settings.partyName && settings.partyName2nd) { - let newParty = (currentParty === settings.partyName) ? settings.partyName2nd : settings.partyName; - - log.info("当前队伍{0}缺少该路线所需角色，尝试切换到{1}", currentParty, newParty); - - await switchPartySafely(newParty); - - // 切换队伍后重新获取起始坐标 - let secondStartX, secondStartY, secondGotStartPos = false; - try { - await genshin.returnMainUi(); - const secondStartPos = await genshin.getPositionFromMap(mapName); - secondStartX = secondStartPos.x; - secondStartY = secondStartPos.y; - secondGotStartPos = true; - } catch (error) { - log.error(`第二次获取起始坐标失败: ${error.message}`); - } - - // 记录第二次执行的开始时间 - let secondPathStartTime = new Date(); - const secondCancel = await runPathScriptFile(jsonPath); - let secondDiffTime = new Date() - secondPathStartTime; - - if (secondCancel) { - log.info(`${progress}{0}: 用户取消任务，不更新记录`, pathName); - throw new UserCancelled(secondCancel); - } - - // 检查坐标变化 - let positionCheckResult = { success: false, shouldUpdate: false }; - if (secondGotStartPos) { - positionCheckResult = await checkPositionChange(mapName, secondStartX, secondStartY); - } - - // 根据运行时间和坐标变化决定是否更新记录 - if (secondDiffTime < 1000) { - log.info(`${progress}{0}: 切换队伍后仍无法完成，不更新记录`, pathName); - } else if (secondDiffTime >= 5000 && positionCheckResult.success && positionCheckResult.shouldUpdate) { - // 二次执行成功&坐标变化足够 才更新记录 - recordMap[fileName] = calculateNextRunTime(new Date(), jsonPath); - const lines = []; - for (const [p, t] of Object.entries(recordMap)) { - lines.push(`${p}\t${formatDateTime(t)}`); - } - const content = lines.join("\n"); - file.writeTextSync(recordFile, content); - log.info(`${progress}{0}: 已完成，下次刷新: ${formatDateTimeShort(recordMap[fileName])}`, pathName); - } else if (!positionCheckResult.success) { - log.info(`${progress}{0}: 坐标获取失败，不更新记录`, pathName); - } else if (!positionCheckResult.shouldUpdate) { - log.info(`${progress}{0}: 切换队伍后出发点与终点过于接近，不记录运行数据`, pathName); - } else { - log.info(`${progress}{0}: 执行时间过短，不更新记录`, pathName); - } + // 队伍采集能力判定 + let avatarAbilities; + if (currentParty in partyAbility) { + avatarAbilities = partyAbility[currentParty]; } else { - log.info(`${progress}{0}: 执行时间过短，且无第二队伍，不更新记录`, pathName); + avatarAbilities = calculateAvatarsAbility(getAvatars()); + partyAbility[currentParty] = avatarAbilities; } - } else { - // 检查坐标变化 - let positionCheckResult = { success: false, shouldUpdate: false }; - if (gotStartPos) { - positionCheckResult = await checkPositionChange(mapName, startX, startY); + const specialMethods = scanSpecialCollectMethod([jsonPath]); + const requiredAbilities = specialMethods.filter((method) => knownAbilities.includes(method)); + const missingAbilities = requiredAbilities.filter((element) => { + return !avatarAbilities.includes(element); + }); + if (requiredAbilities.length > 0) { + log.debug("所需角色: {0}", requiredAbilities.join(", ")); + } + if (missingAbilities.length > 0 && (! worldInfo.coOpMode)) { + // 联机模式下无法自动切换队伍，同时此时BGI本体的报错信息也足够详细，因此也不再打印日志 + if (settings.partyName && settings.partyName2nd) { + let newParty = currentParty === settings.partyName ? settings.partyName2nd : settings.partyName; + if (!partyAbility[newParty]) { + log.info("当前队伍{0}缺少该路线所需角色{1}，尝试切换到{2}", currentParty, missingAbilities.join(", "), newParty); + const teleported = await switchPartySafely(newParty); + currentParty = newParty; + if (teleported) { + currentMap = "Teyvat"; + } + partyAbility[newParty] = calculateAvatarsAbility(getAvatars()); + } + + const avatarAbilities = partyAbility[newParty]; + const missingAbilitiesNew = requiredAbilities.filter((element) => { + return !avatarAbilities.includes(element); + }); + if (missingAbilitiesNew.length > 0) { + log.warn("另一队伍{0}也缺少该路线所需角色{1}，跳过路线", newParty, missingAbilitiesNew.join(", ")); + continue; + } + } else { + log.warn("当前队伍缺少该路线要求的采集角色，且用户未配置两支队伍，跳过路线"); + continue; + } } - // 根据运行时间和坐标变化决定是否更新记录 - if (diffTime >= 5000 && positionCheckResult.success && positionCheckResult.shouldUpdate) { - recordMap[fileName] = calculateNextRunTime(new Date(), jsonPath); + let pathStart = logFakePathStart(fileName); + let pathStartPos = await genshin.getPositionFromMap(currentMap); + // 延迟抛出`UserCancelled`，以便正确更新运行记录 + let cancel = await runPathScriptFile(jsonPath); + + await genshin.returnMainUi(); + let pathEndPos = await genshin.getPositionFromMap(currentMap); + let distance = calculateDistance(pathStartPos, pathEndPos); + if (distance >= 5) { + const jsonData = JSON.parse(readTextSync(jsonPath)); + const jsonRegion = jsonData.info?.map_name || "Teyvat"; + if (jsonRegion !== currentMap) { + log.info("当前地图区域: {0}", currentMap); + currentMap = jsonRegion; + } + + refreshTime[fileName] = calculateNextRefreshTime(new Date(), coolType); const lines = []; - for (const [p, t] of Object.entries(recordMap)) { + for (const [p, t] of Object.entries(refreshTime)) { lines.push(`${p}\t${formatDateTime(t)}`); } const content = lines.join("\n"); file.writeTextSync(recordFile, content); - log.info(`${progress}{0}: 已完成，下次刷新: ${formatDateTimeShort(recordMap[fileName])}`, pathName); - } else if (!positionCheckResult.success) { - log.info(`${progress}{0}: 坐标获取失败，不更新记录`, pathName); - } else if (!positionCheckResult.shouldUpdate) { - log.info(`${progress}{0}: 出发点与终点过于接近，不记录运行数据`, pathName); + log.info(`${progress}{0}: 已完成，下次刷新: ${formatDateTimeShort(refreshTime[fileName])}`, pathName); } else { - log.info(`${progress}{0}: 执行时间过短，不更新记录`, pathName); + log.info(`${progress}{0}: 位置几乎未变化，不更新刷新时间`, pathName); + } + logFakePathEnd(fileName, pathStart); + + if (cancel) { + throw new UserCancelled(cancel); + } + // 不嵌套到if-distance里，以确保fake log和cancel得到正确执行 + if (distance >= 5 && target !== null) { + const match = pathName.match(/-(\d+)个/); + const collectByPath = parseInt(match ? match[1] : null, 10); + if (!isNaN(collectByPath) && collectByPath > 0) { + current = current + collectByPath; + if (current > target) { + log.info("{0}可能已达成目标数量，打开背包确认", material); + const result = await getItemCount(material); + current = result[material] || 0; + if (current >= target) { + log.info("{0}已达成目标数量({1}>={2})，停止该材料剩余任务", material, current, target); + break totalLoop; + } else { + log.info("{0}实际数量未达标({1}<{2})，更新材料当前数量", material, current, target); + } + } + } + } + } else { + log.info(`${progress}{0}: 已跳过 (${formatDateTimeShort(refreshTime[fileName])}刷新)`, pathName); + } + } + } +} + +function getSelectedMaterials(configMap) { + const configText = readTextSync(settingFile); + const config = JSON.parse(configText); + + const selectedMaterials = {}; + const knownKeys = ["selectForgingOre", "selectMiscellaneous", "selectFoodAndAlchemy"]; + + // 辅助函数：合并路径并记录日志 + const mergeToResult = (materialName, paths) => { + if (!Array.isArray(paths)) return; + if (!selectedMaterials[materialName]) { + selectedMaterials[materialName] = []; + } + selectedMaterials[materialName].push(...paths); + }; + + config.forEach((entry) => { + if (!entry.name || entry.type !== "multi-checkbox") return; + + const { name, label } = entry; + const options = settings[name] ? Array.from(settings[name]) : []; + + // 2. 处理 selectLocalSpecialtyByCountry + if (name === "selectByCategory") { + if (options.length === 0) return; + const categoryMap = configMap[name]; + if (!categoryMap) return; + + options.forEach((categoryName) => { + const materialsInCategory = categoryMap[categoryName]; + if (materialsInCategory) { + log.debug("选择了{0}下的所有材料: {1}", categoryName, Object.keys(materialsInCategory).join(", ")); + for (const [materialName, paths] of Object.entries(materialsInCategory)) { + mergeToResult(materialName, paths); + } + } + }); + } else if (name === "selectLocalSpecialtyByCountry") { + if (options.length === 0) return; + const countryMap = configMap[name]; + if (!countryMap) return; + + options.forEach((countryName) => { + const materialsInCountry = countryMap[countryName]; + if (materialsInCountry) { + log.debug("选择了{0}的所有地方特产: {1}", countryName, Object.keys(materialsInCountry).join(", ")); + for (const [materialName, paths] of Object.entries(materialsInCountry)) { + mergeToResult(materialName, paths); + } + } + }); + } + // 3. 处理已知 key 或以 selectLocalSpecialty_ 开头的项 + else if (knownKeys.includes(name) || name.startsWith("selectLocalSpecialty_")) { + if (options.length === 0) return; + const categoryMap = configMap[name]; + if (!categoryMap) return; + + const lines = label.trim().split(/\r?\n/); + const last_line = lines[lines.length - 1]; + log.debug("选择了{0}分类下的材料: {1}", last_line, options.join(", ")); + options.forEach((materialName) => { + const paths = categoryMap[materialName]; + if (paths) { + mergeToResult(materialName, paths, "分类选择:" + name); + } + }); + } + // 4. 处理 selectRoute_：执行覆盖逻辑并记录日志 + else if (name.startsWith("selectRoute_")) { + const targetMaterial = name.replace("selectRoute_", ""); + const routeMap = configMap[name]; + if (!routeMap) return; + + let finalRouteKeys = []; + let logAction = ""; + + if (options.length > 0) { + if (selectedMaterials.hasOwnProperty(targetMaterial)) { + // 已存在该材料，使用用户勾选的路线 + finalRouteKeys = options; + logAction = "使用用户勾选的路线"; + } else { + log.debug("未选中材料{0}，忽略该材料勾选的路线{1}", targetMaterial, options.join(", ")); + return; + } + } else { + // 如果 selectRoute 这一项用户什么都没勾，强制选择 entry.options 中的第一项 + if (entry.options && entry.options.length > 0 && selectedMaterials.hasOwnProperty(targetMaterial)) { + finalRouteKeys = [entry.options[0]]; + logAction = "用户未指定路线，自动选择第一组"; } } - logFakePathEnd(fileName, pathStart); - } else { - log.info(`${progress}{0}: 已跳过 (${formatDateTimeShort(recordMap[fileName])}刷新)`, pathName); + if (finalRouteKeys.length > 0) { + // 执行取代：先清空，再添加 + selectedMaterials[targetMaterial] = []; + finalRouteKeys.forEach((routeKey) => { + const specificPaths = routeMap[routeKey]; + if (specificPaths) { + selectedMaterials[targetMaterial].push(...specificPaths); + } + }); + log.debug(`{0}: ${logAction} {1}`, targetMaterial, finalRouteKeys.join(", ")); + } } - } + }); + + return selectedMaterials; } /** - * 根据路径逐级查找最匹配的物品，返回去除前缀的路径、标准化名称、刷新时间 - * @param {string} fullPath - 单个完整路径（包含公共前缀） - * @returns {{ label: string, name: string, coolType: string }} + * 获取世界主人的UID */ -function getCooldownInfoFromPath(fullPath) { - const parts = fullPath.split(/[\\/]/); // 支持 \ 或 / 分隔符 - let cooldown = null; - let cleanPart = ""; - - for (const part of parts) { - cleanPart = part.split("@")[0]; // 去除 @ 后缀 - - if (CooldownDataBase.hasOwnProperty(cleanPart)) { - cooldown = CooldownDataBase[cleanPart]; - break; - } - } - - const label = parts.slice(1).join("\\"); // 去除公共前缀 - const name = "OPT_" + label.replace(/[^\u4e00-\u9fa5\w]/g, "_"); // 添加前缀并格式化名称 - - return { - label, - name, - coolType: cooldown, - }; -} - -function calculateNextRunTime(base, fullPath) { - const { coolType } = getCooldownInfoFromPath(fullPath); - let nextTime = calculateNextRefreshTime(base, coolType); - return nextTime; -} - -function getSelectedMaterials() { - const configText = file.readTextSync(settingFile); - const config = JSON.parse(configText); // 配置数组 - - const selectedMaterials = []; - - const selectAllMaterials = subscribeMode.includes("采集扫描到的所有材料"); - for (const entry of config) { - if (entry.name && entry.name.startsWith("OPT_") && entry.type === "checkbox") { - if (selectAllMaterials || settings[entry.name] === true) { - let index = entry.label.indexOf(" "); - entry.label = entry.label.slice(index + 1); // 去除⬇️指示 - const jsonFiles = filterFilesInTaskDir(entry.label); - if (jsonFiles.length > 0) { - entry.jsonFiles = jsonFiles; - selectedMaterials.push(entry); - } else { - log.debug("跳过空文件夹: {0}", entry.label); - } - } - } - } - - const materialDict = {}; - selectedMaterials.forEach((item) => { - const label = item.label; - const match = label.match(/\\(.*?)\\\1/); // \落落莓\落落莓@Author - let materialName; - - if (match) { - materialName = match[1]; +async function getCoOpModeAndHostUid() { + await genshin.returnMainUi(); + keyPress("F2"); + await waitForTextAppear("多人游戏", [130, 20, 129, 57]); + let uid = await getGameAccount(true, false); + const coOpMode = !(await isTextExistedInRegion("搜索", [1638, 90, 87, 63])); + if (coOpMode) { + const btnText = await getTextInRegion([1560, 992, 191, 55]); + // 仅在多人模式且非房主时需要 + if (btnText === "离开队伍") { + log.info("当前处于联机模式，且玩家不是房主"); + click(332, 218); + await recognizeTextAndClick("查看资料", [555, 182, 118, 49]); + await waitForTextAppear("角色展柜", [1082, 204, 107, 49]); + await sleep(100); + uid = await getTextInRegion([623, 192, 118, 37]); } else { - const parts = label.split("\\"); - materialName = parts[parts.length - 1]; - } - - if (!materialDict[materialName]) { - materialDict[materialName] = []; - } - materialDict[materialName].push(item); - }); - - const firstRoutes = []; - const multiRoutes = {}; - for (const materialName in materialDict) { - const routes = materialDict[materialName]; - if (routes.length > 0) { - firstRoutes.push(routes[0]); - if (materialDict[materialName].length > 1) { - multiRoutes[materialName] = materialDict[materialName]; - } + log.info("当前处于联机模式，玩家是房主"); } + } else { + log.info("当前处于单人模式"); } - const countOfMultiRoutes = Object.keys(multiRoutes).length; - if (countOfMultiRoutes > 0) { - let text = `${countOfMultiRoutes}种材料存在多个版本的路线:\n`; - for (const [key, values] of Object.entries(multiRoutes)) { - text += `${key}\n`; - for (const v of values) { - text += ` ${v.label}\n`; - } - } - log.debug(text); - if (settings.acceptMultiplePathOfSameMaterial) { - log.warn("{0}种材料选中了多个版本的路线（详见日志文件），根据脚本设置，将执行全部版本", countOfMultiRoutes); - } else { - log.warn("{0}种材料选中了多个版本的路线（详见日志文件），默认只执行第一个版本", countOfMultiRoutes); - return firstRoutes; - } - } - - return selectedMaterials; -} \ No newline at end of file + await genshin.returnMainUi(); + const maskUid = uid.replace(/\d\d(\d{3})\d{4}/, (match, group1) => match.replace(group1, "xxx")); + return { coOpMode: coOpMode, uid: uid, maskUid: maskUid }; +} diff --git a/repo/js/CD-Aware-AutoGather/manifest.json b/repo/js/CD-Aware-AutoGather/manifest.json index a164d1ace..2f9877bb3 100644 --- a/repo/js/CD-Aware-AutoGather/manifest.json +++ b/repo/js/CD-Aware-AutoGather/manifest.json @@ -1,19 +1,21 @@ { "manifest_version": 1, - "name": "带CD管理的自动采集", - "version": "1.7.9", - "bgi_version": "0.45.0", - "description": "自动同步你通过BetterGI订阅的地图追踪任务，执行采集任务，并管理材料刷新时间（支持多账号）。\n首次使用前请先简单阅读说明（可在`全自动`——`JS脚本`页面，点击本脚本名称查看）", + "name": "带CD管理和目标设定的自动采集", + "version": "2.0", + "bgi_version": "0.54.1-alpha.1", + "description": "自动同步你通过BetterGI订阅的地图追踪任务，执行采集任务，并管理材料采集目标和刷新时间。\n支持联机模式采集和多账号记录。\n首次使用前请先简单阅读说明", "authors": [ { "name": "Ayaka-Main", "links": "https://github.com/Patrick-Ze" - }, - { - "name": "蜜柑魚", - "links": "https://github.com/this-Fish" } ], "settings_ui": "settings.json", - "main": "main.js" + "main": "main.js", + "saved_files": [ + "pathing", + "record/*.csv", + "record/*.txt", + "record/*.json" + ] } \ No newline at end of file diff --git a/repo/js/CD-Aware-AutoGather/settings.json b/repo/js/CD-Aware-AutoGather/settings.json index e32d58edb..e78573190 100644 --- a/repo/js/CD-Aware-AutoGather/settings.json +++ b/repo/js/CD-Aware-AutoGather/settings.json @@ -1,48 +1,95 @@ -[ - { - "name": "runMode", - "type": "select", - "label": "运行模式", - "options": [ - "扫描文件夹更新可选材料列表", - "采集选中的材料", - "清除运行记录（重置材料刷新时间）" - ] - }, - { - "name": "subscribeMode", - "type": "select", - "label": "'地图追踪'中已订阅的任务目录的处理方式：", - "options": [ - "每次自动扫描，并采集扫描到的所有材料", - "手动扫描，并采集扫描到的所有材料", - "手动扫描，只采集已勾选的材料" - ] - }, - { - "name": "partyName", - "type": "input-text", - "label": "设置首选队伍名称（留空则不进行切换）" - }, - { - "name": "partyName2nd", - "type": "input-text", - "label": "设置备选队伍名称（首选队伍缺少对应的采集角色时使用）" - }, - { - "name": "stopAtTime", - "type": "input-text", - "label": "停止运行时间（HH:mm，24小时制。例如09:28为上午9点28分）" - }, - { - "name": "iHaveMultipleAccounts", - "type": "input-text", - "label": "我肝的账号不止一个\n根据唯一ID区分账号维护对应的材料刷新时间\n留空时将使用右下角UID", - "default": "默认账号" - }, - { - "name": "acceptMultiplePathOfSameMaterial", - "type": "checkbox", - "label": "即使同一种材料有多个版本的路线，也全都执行采集" - } +[ + { + "name": "runMode", + "type": "select", + "label": "运行模式", + "options": [ + "扫描文件夹更新可选材料列表", + "采集选中的材料" + ], + "default": "扫描文件夹更新可选材料列表" + }, + { + "name": "filterPathByKeywords", + "type": "input-text", + "label": "按关键词筛选材料路线（使用空格分隔，默认为黑名单模式）", + "default": "低成功率 不建议" + }, + { + "name": "partyName", + "type": "input-text", + "label": "设置首选队伍名称（留空则不进行切换）" + }, + { + "name": "partyName2nd", + "type": "input-text", + "label": "设置备选队伍名称（首选队伍缺少对应的采集角色时使用）" + }, + { + "name": "excludeTimeRange", + "type": "input-text", + "label": "不在以下时间段内运行（HH:mm-HH:mm，24小时制）：" + }, + { + "name": "targetCountOfSelected", + "type": "input-text", + "label": "物品采集数量目标（可使用csv为不同物品设置不同数量）" + }, + { + "name": "manualSetAccountName", + "type": "input-text", + "label": "使用指定的账号名保存运行记录" + }, + { + "type": "separator" + }, + { + "label": "\n【常用采集选项】\n\n按大类选择", + "type": "multi-checkbox", + "name": "selectByCategory", + "options": [ + "地方特产", + "矿物", + "食材与炼金" + ] + }, + { + "label": "按地区选择地方特产", + "type": "multi-checkbox", + "name": "selectLocalSpecialtyByCountry", + "options": [ + "蒙德", + "璃月", + "稻妻", + "须弥", + "枫丹", + "纳塔", + "挪德卡莱" + ] + }, + { + "label": "矿物", + "type": "multi-checkbox", + "name": "selectForgingOre", + "options": [ + "白铁块", + "水晶块", + "星银矿石", + "紫晶块", + "萃凝晶", + "虹滴晶" + ] + }, + { + "label": "特殊物品", + "type": "multi-checkbox", + "name": "selectMiscellaneous", + "options": [ + "晶蝶", + "沉玉仙茗" + ] + }, + { + "type": "separator" + } ] \ No newline at end of file diff --git a/repo/js/CD-Aware-AutoGather/settings.template.json b/repo/js/CD-Aware-AutoGather/settings.template.json deleted file mode 100644 index 6316beb99..000000000 --- a/repo/js/CD-Aware-AutoGather/settings.template.json +++ /dev/null @@ -1,48 +0,0 @@ -[ - { - "name": "runMode", - "type": "select", - "label": "运行模式", - "options": [ - "扫描文件夹更新可选材料列表", - "采集选中的材料", - "清除运行记录（重置材料刷新时间）" - ] - }, - { - "name": "subscribeMode", - "type": "select", - "label": "'地图追踪'中已订阅的任务目录的处理方式：", - "options": [ - "每次自动扫描，并采集扫描到的所有材料", - "手动扫描，并采集扫描到的所有材料", - "手动扫描，只采集已勾选的材料" - ] - }, - { - "name": "partyName", - "type": "input-text", - "label": "设置首选队伍名称（留空则不进行切换）" - }, - { - "name": "partyName2nd", - "type": "input-text", - "label": "设置备选队伍名称（首选队伍缺少对应的采集角色时使用）" - }, - { - "name": "stopAtTime", - "type": "input-text", - "label": "停止运行时间（HH:mm，24小时制。例如09:28为上午9点28分）" - }, - { - "name": "iHaveMultipleAccounts", - "type": "input-text", - "label": "我肝的账号不止一个\n根据唯一ID区分账号维护对应的材料刷新时间\n填空将使用右下角帐号UID区分账号维护对应的材料刷新时间", - "default": "默认账号" - }, - { - "name": "acceptMultiplePathOfSameMaterial", - "type": "checkbox", - "label": "即使同一种材料有多个版本的路线，也全都执行采集" - } -] \ No newline at end of file diff --git a/repo/js/CD-Aware-AutoGather/脚本思路.txt b/repo/js/CD-Aware-AutoGather/脚本思路.txt deleted file mode 100644 index 3b4bc18ad..000000000 --- a/repo/js/CD-Aware-AutoGather/脚本思路.txt +++ /dev/null @@ -1,44 +0,0 @@ -提供一个bat文件 -1. 创建符号链接，指向路径追踪文件夹 - -js脚本逻辑： -1. 设置文件完全由js脚本生成（可以提交一个生成版本进库作为参考） -2. 提供3种运行模式 - a 扫描文件夹更新可用配置 - b 采集选中的材料 - c 清除运行记录（重置刷新时间） - -可行性探索： -1. 当配置选项新增可选物品时：获取该项目的值会得到undefined（等同于未配置） -2. 当已选中物品从配置选项中删除时：获取该项目的值会得到undefined，但会保存在脚本组的配置里。如果再加回这个选项，会获得之前设置的值。不存在于当前settings.json文件的字段不会自动从脚本组配置中删除 -3. 设置属性里不支持特殊字符 -多账户支持：单账户时记录保存到`默认账号`文件夹，多账户时根据UID创建对应的记录文件夹 - -索引文件列属性： -只记录采集物名称以及对应CD，不记录完整路径。这样的话只要新的路径追踪是符合文件夹结构的，也能自动支持。 -工作时，基于文件夹路径，从前到后全词匹配路径的每个部分，直到找到对应的项目 - -a 扫描模式 -1. 提示可以运行bat脚本或者手动创建符号链接 -2. 遍历追踪文件夹内的所有子文件夹 -3. 基于子文件夹的相对路径，查找索引文件，对于那些在索引中的条目：更新settings.json，创建 options 可选列表，并记录所有选项 -4. settings.json中还需要提供的配置项： - - 运行模式 - - 队伍名称（如果不同的采集物需要使用不同队伍，那要求用户重复添加多个JS运行项） - - 终止运行时间 - - 要采集的物品列表 - - 我肝的账号不止一个 -5. 如果用户添加的文件夹太多，设置项也会很多。可以建议用户适当删除一些 - -b 采集模式： -1. 根据用户选中的采集物，枚举对应文件夹下的路径追踪文件。逐个处理完所有选项 -2. 根据子文件夹的相对路径，查找索引文件，得知其刷新模式 -3. 对于每个追踪文件，循环执行： - a. 查询运行记录，获知刷新时间。如果查询不到，视为未运行过 - b. 如果当前时间大于刷新时间，则执行采集 - c. 执行采集后，计算下次刷新时间并更新运行记录 - -c 清除模式 -1. 根据用户选中的采集物，获取其对应的运行记录 -2. 重置运行记录中的刷新时间为绫华生日 -