Commit Graph

3316 Commits

Author SHA1 Message Date
e4732dcc6d 狗粮小布丁 (#3215) 2026-05-16 10:42:20 +08:00
提瓦特钓鱼玳师
95380eee23 AEscoffier_chef【更新】 (#3214)
* 删除旧版MIDI制谱器

* 更新月之六数据

* 添加BGI本体的自动烹饪方法

* Update manifest.json

* 添加了智能拾取模式

* fix

* fix

* Update MIDI制谱器.html

* fix
2026-05-16 10:41:47 +08:00
b46ae7f705 锄地5.13 (#3212) 2026-05-14 21:19:26 +08:00
this-Fish
a3931857d9 自动购买商品 3.3.3 (#3209)
* Update manifest.json

* Update records.json

* Add files via upload
2026-05-12 00:59:07 +08:00
5117600049
6ab9f99902 养成一条龙新增boss守望者·堕天,修复了2k场景部分图片点击错误的情况 (#3206)
* Update manifest.json

* Update README.md

* Update main.js

* Update settings.json

* Add files via upload

* Add files via upload

* Add files via upload

* Update main.js

* Update README.md

* Add files via upload
2026-05-12 00:50:16 +08:00
火山
ac0a23ee1d refactor(js): AutoFriendshipFight 2.0.0 重构合入,修复 V8 弹窗报错与内存溢出 (#3207) 2026-05-11 14:40:41 +08:00
mno
82e1d75e46 采集和批发更新 (#3198)
* js:批发2.5.2

优化联机适配

* js:采集cd管理

新增配置项,开启后路径组中每条路线完成后都检查前面所有路线所有已经cd好了可以执行,用于卡时间
2026-05-10 18:22:35 +08:00
吉吉喵
3fd54e52fa 增加和修改说明 (#3202)
主要是涉及超量阈值和目标数量对路径的约束
2026-05-10 18:22:20 +08:00
躁动的氨气
ebb4a65b6a feat: 补全莉奈娅挖矿工具链 (#3203)
* feat: 优化路径

* feat: 优化路径

* feat: 矿石数量检测

* feat: 临时注释背包检测

* fix: 修复问题

* feat: 优化路线

* feat: 优化路线
2026-05-10 13:32:15 +08:00
躁动的氨气
c868dc6ee8 feat: 千星脚本添加html遮罩 (#3081)
* feat: 版本检测工具

* feat: 千星脚本添加html遮罩

* 添加存档

* feat: 版本检测
2026-05-10 11:39:14 +08:00
火山
46d00e0373 AutoFriendshipFight 稳定性重构:资源清理、异步收口、配置统一(v1.5.8) (#3197)
* 战斗好感js:释放前增加延迟,并简化清理逻辑

通过等待 500 毫秒的休眠操作,为.NET 任务在释放 V8 对象后预留额外执行时间,以此避免触发对象已释放异常(ObjectDisposedException)。简化finally代码块中battleTask的清理逻辑:仅当battleTask和awaitBattleTask均已赋值时才执行清理操作;将任务与等待超时设置为竞争执行;清理过程中静默忽略所有错误,防止因取消操作或超时问题导致finally代码块阻塞

* Bump version to 1.5.5 and update changelog

Update manifest version to 1.5.5 and add a v1.5.5 entry to the README changelog. The release notes mention stability improvements: add a short delay after releasing resources to reduce ObjectDisposedException likelihood and optimize fight task cleanup to avoid stuck cleanup phases.

* v1.5.6:移除游泳状态持久化监测,统一使用 Assets/ 路径

将资源 / 路径引用从 assets/ 重命名为 Assets/(涉及 README 文档、main.js 路径加载逻辑、AutoPath 查找逻辑)。
移除持久化游泳追踪功能及相关设置 / 逻辑:删除 DEFAULT_SWIM_CONSECUTIVE_LIMIT 常量、SwimTracker 实现代码、游泳相关错误码 / 提示信息,以及 settings.json 中的 swimConsecutiveLimit 配置项。
简化游泳处理逻辑:检测到盗宝团进入游泳状态时,立即恢复至雕像状态,并将该回合判定为失败。
在释放图像素材前添加 500 毫秒的异步等待休眠,降低对象已释放异常(ObjectDisposedException)的触发风险。
更新 README 文档的更新日志,记录移除持久化游泳追踪功能、修改 Assets/ 路径的变更。

* AutoFriendshipFight: resource cleanup & swim fix

Bump version to v1.5.7 and add changelog entry. Improve resource lifecycle handling by making template recognition objects mutable, extending post-exit sleep, explicitly disposing template/mat objects, and nulling references to reduce ObjectDisposedException risk. Add SwimTracker helper to centralize swim/statue recovery detection for 盗宝团. Harden executeBattleTasks: introduce awaitBattleTask flag and longer wait, better race/cleanup semantics for background AutoFight tasks, improved error handling/logging, and ensure path promises are caught when timing out. README and manifest updated accordingly.

* Make swim recovery per-enemy configurable

Introduce a swimRecoveryEnabled flag in the enemy config and change SwimTracker to read that flag (falling back to previous behaviour: only 武盗/盗宝团 enabled). Replace the hardcoded enemyType === "盗宝团" check in executeSingleFriendshipRound with SwimTracker(enemyType).enabled. Remove the now-unused getTodayKey helper and delete swim_stats.json as part of cleanup. This centralizes the swim-recovery toggle so it can be extended per enemy and removes obsolete daily swim stats storage.

* Force recover flag on statue recovery

When battleResult.status is "recovered_to_statue", always call recoverAfterFailure with a true second argument and add a Chinese comment explaining the game auto-returned to the seven-day statue. This simplifies the previous conditional (enemyType === "盗宝团") and ensures consistent recovery handling for this status.

* Make disableAsyncFight apply to all enemies

Respect the disableAsyncFight setting for all enemy types (including 盗宝团). main.js now only uses the async/ocr detect flow for 盗宝团 when disableAsyncFight is false. README and settings.json labels were updated to reflect that disabling async fights makes synchronous mode apply to every enemy, improving stability and unifying behavior across encounters.

* Toggle battle path flag for 盗宝团

Pass a conditional flag to runBattlePathToBattlePoint so it receives true when enemyType === "盗宝团" (previously always false). This enables a special path/behavior for the 盗宝团 enemy during executeSingleFriendshipRound to handle its unique movement/positioning.

* Update repo/js/AutoFriendshipFight/README.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Fix README quotes and assets path casing

Replace ASCII quotes with Chinese-style quotes around “战斗结束检测” for typographic consistency, and correct the assets directory name from `Assets/AutoPath/` to `assets/AutoPath/` in the README to match repository naming and avoid confusion.

* Use lowercase 'assets' paths

Normalize asset path casing in repo/js/AutoFriendshipFight/main.js by replacing "Assets" with "assets" for image and AutoPath JSON references. Updated template image loads (exp.png, mora.png) and pathing file accesses in AutoPath, getBattlePointFromBattlePath, and runBattlePathToBattlePoint to avoid file-not-found issues on case-sensitive filesystems. No behavioral logic changes.

* Add managed game region caching and OCR helpers

Introduce a gameRegionManager to centralize screenshot capture/caching and lifecycle management (retain/release, disposeOldGameRegions, flushGameRegionCache, getManagedGameRegion) to reduce ObjectDisposedException risks and enforce minimum capture intervals. Add OCR utilities (normalizeOcrText, readActivityListText, readActivityListTextFromCapture) and replace direct captureGameRegion usages in task detection, result waiting and exp/mora detection with the managed API. Add SWIM_RECOVERED error message constant and use it for swim-recovery paths. Bump manifest version to 1.5.8 and update README (note stability/paths change and assets path case). Misc: small style/robustness fixes (logging, null checks, cancellation handling) and ensure cache is flushed on exit.

* Improve flushGameRegionCache disposal and timeouts

Add timeouts and safer disposal logic to flushGameRegionCache to avoid indefinite waits. Wait for capturing/disposing flags with a short deadline and log+abort if exceeded; during flush only remove regions that are not currently borrowed (borrowCount<=0), with a secondary deadline to avoid blocking. Preserve borrow counts for still-borrowed regions, remove stale borrowCount entries for regions no longer in cache, and reset lastCaptureTs when cache becomes empty. Adds warning logs for timeout cases.

* Refactor formatting and resource handling

Reformat code for readability and tighten resource management: multiline/enhanced formatting for ENEMY_CONFIG and template matches, normalize indentation/spacing across functions. Improve gameRegionManager lifecycle (clearer isCapturing/isDisposing handling), add waits and timeout warnings in flushGameRegionCache, ensure borrowCountByRegion is cleaned for removed regions, and make getManagedGameRegion capture/dispose flow more robust. Also standardize safeDispose and empty-catch behavior, tidy OCR/battle/task related flows and error handling. These changes aim to reduce resource leaks, race conditions and improve maintainability without altering core logic.

* Refactor battle flow and naming; add helpers

Refactor battle execution and main loop for clarity and robustness. Renamed core functions for clarity (AutoFriendshipDev -> runFriendshipLoop, LogTimeTaken -> formatElapsedTime, CalculateEstimatedCompletion -> estimateCompletionTime) and added numerous helper utilities to centralize behavior: cancellation/silence helpers, timeout/error detection, wrapper helpers, cleanup logic, and separate sync/async battle execution paths. Extracted specialized flows (treasure hoarder async round, swim-recovery-aware path runner, and unified battle result handling) to reduce duplication and improve error/recovery handling (including auto-return-to-statue logic). Overall changes improve async coordination, avoid unhandled promise rejections, and make time formatting/logging consistent.

* Improve battle timeout & party switch error handling

Propagate battle timeouts and rejection errors as exceptions and map timeouts to a script error code for consistent reporting. In executeBattleTasksSyncMode, throw a battle_timeout instead of returning a false result. In executeBattleTasksAsyncMode, always throw battle_rejected errors (removed the cancellation-only check). In executeBattleTasks catch, convert battle_timeout to a standardized script error (ERROR_CODES.BATTLE_TIMEOUT).

Enhance switchPartyIfNeeded: after teleporting to the Statue of The Seven, verify the switch result and if it still fails, log and notify the user, return to the main UI and throw an error instead of silently continuing. Also ensure cancellation errors are rethrown and other errors are propagated instead of being swallowed.

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
2026-05-10 09:53:20 +08:00
吉吉喵
6756c844aa Change recentRecords slice to first 5 elements (#3196) 2026-05-09 20:40:19 +08:00
躁动的氨气
275e497e4e feat: 优化路径 (#3194) 2026-05-08 00:53:20 +08:00
Gedley
210a6e8c18 JS脚本:禽肉好感,增加是否到达事件触发点的判断 (#3192) 2026-05-07 21:08:08 +08:00
mno
1e6019ebea js:锄地一条龙2.9.2 (#3193)
调试输出修正关于路径组一的部分
2026-05-07 19:03:09 +08:00
zaodonganqi
fe7279b32a JS脚本:最低好感入队 2026-05-06 23:13:49 +08:00
zaodonganqi
472e83bdad 修正路径 2026-05-06 20:56:35 +08:00
大帅比
eee1baa3cc 微调了一下路线 (#3189)
* 微调了一下路线

两条路线容易卡死,微调了一下路线

* 自动修复 JSON 格式和版本号 [ci skip]

* 小修一下路线

部分路线卡死

* 自动修复 JSON 格式和版本号 [ci skip]

---------

Co-authored-by: GitHub Actions Bot <actions@github.com>
2026-05-06 19:38:36 +08:00
this-Fish
a133fe4af0 松茸路徑小修 (#3188)
* Delete repo/pathing/食材与炼金/松茸/无草神@蜜柑魚 directory

* 松茸路徑小修

* 自动修复 JSON 格式和版本号 [ci skip]

---------

Co-authored-by: GitHub Actions Bot <actions@github.com>
2026-05-06 19:37:08 +08:00
Ruoxuan Qi
94b529f2ea 更新月结晶锄地战地脚本 增加2命兹白适配和其他优化 (#3187)
* 混经验系列锄地目压精调月结晶队队-兹少叶莉(兼容五郎爱诺钟离)

目押特调锄地混经验,有完整的设置攻略给新人.
适配版本0.60.0
已经正常锄地目压测试2小时了.

* 缩短文件名, 删旧, 上新.

1) 缩短文件名, 删旧, 上新.
2) 增加注释内容. 脚本主题没变

继承管理员批示与讨论,欢迎指正, 可以再改.

* Delete repo/combat/207.[锄地]月结晶混经验-兹少叶莉(兼容五郎爱诺钟离)-锄地混经验-晴雪精调版.txt

看文件名长度, 删旧上新.
已经按照上面对管理员的回复删旧文件, 上新新文件. 1) 砍文件名长度 2) 增加了更多注释. 脚本主体未变动.

* 再次缩短文件名完成

再次缩短文件名完成

* Delete repo/combat/27.[锄地]月结晶混经验-兹少叶莉(兼容五郎爱诺钟离).txt

再次缩短文件名

* Update [锄地]月结晶混经验-兹少叶莉兼容五郎爱诺钟离.txt

更新: 1)新增兹白2命适配(选配),2)优化莉奈娅Q释放适配,3)大幅度缩减2命兹白输出时间 4)增加迪奥娜[更新1]

* Update [锄地]月结晶混经验-兹少叶莉兼容五郎爱诺钟离.txt

更新: 1)新增兹白2命适配(选配),2)优化莉奈娅Q释放适配,3)大幅度缩减2命兹白输出时间 4)增加迪奥娜[更新1]
2026-05-06 19:36:44 +08:00
d5dc8c0236 锄地精英zc018 (#3185)
修一下下落点
2026-05-06 19:35:57 +08:00
Jamis
0020d355b8 升级JS脚本AbundantOre以优化莉奈娅挖矿 (#3184)
* Update AbundantOre

* update path
2026-05-06 19:35:36 +08:00
Jamis
dc4de05ac4 AbundantOre 0.32 (#3182) 2026-05-04 19:42:17 +08:00
躁动的氨气
5ffacb1fa1 feat: 格式化周本一条龙代码 (#3183) 2026-05-04 19:34:22 +08:00
躁动的氨气
c21fd63ec4 feat: 使用带过期检测的打开背包 (#3181) 2026-05-03 22:36:06 +08:00
DarkFlameMaster
a6379d69cf 批量讨伐角色养成材料BOSS 0.6.2 (#3180)
* 同步批量讨伐角色养成材料BOSS更新

* fix:修复若干bug

---------

Co-authored-by: DarkFlameMaster <actions@github.com>
2026-05-03 22:11:16 +08:00
躁动的氨气
6ca414296f fix: 调整游戏时间 (#3178) 2026-05-02 09:37:54 +08:00
81e8256b78 狗粮小布丁5.1 (#3177) 2026-05-02 07:32:44 +08:00
躁动的氨气
ffe9d777c6 feat: 莉奈娅挖矿一条龙 (#3174)
* feat: 莉奈娅挖矿一条龙

* feat: 更新版本号

* fix: 修复一些问题

* feat: 清理路线

* feat: 添加选择
2026-05-01 21:30:13 +08:00
秋云
ee862b4a8c 版本号 2026-05-01 21:14:52 +08:00
秋云
02b22be73f fix: 修复战斗任务取消逻辑,增加异常处理
Co-authored-by: Copilot <copilot@github.com>
2026-05-01 21:02:44 +08:00
秋云
94cc989f88 Merge remote-tracking branch 'upstream/main' 2026-05-01 20:39:53 +08:00
mno
4c8f66e2cf js:锄地一条龙2.9.0 (#3173)
* js:锄地一条龙2.9.0

1.优化数值类型配置项的读取和使用,通过统一函数管理
2.优化忽略比例相关机制,允许0和小数的忽略比例
3.优化分组机制,移除路径组一标签配置项,路径组一为其他组选剩下的路线,排除使用排除标签
4.优化readme说明,澄清分组机制
5.优化自定义配置的表述

* Update settings.json

移除说明中的”描述“

* Update README.md
2026-05-01 19:30:10 +08:00
ShadowLemoon
624cd61f5a fix: 修复切换账号的OCR方法 (#3176)
* fix: 修复切换账号的OCR方法

* 更新版本号
2026-05-01 19:23:52 +08:00
大帅比
a88b9823a1 微调了一下路线 (#3171)
* 微调了一下路线

两条路线容易卡死,微调了一下路线

* 自动修复 JSON 格式和版本号 [ci skip]

---------

Co-authored-by: GitHub Actions Bot <actions@github.com>
2026-05-01 12:59:34 +08:00
躁动的氨气
0462b6aacd feat: 莉奈娅挖矿一条龙 (#3172) 2026-05-01 11:41:57 +08:00
this-Fish
cf591bb376 自动购买商品 3.3.2 (#3169)
* 自动购买商品 3.3.2

添加新标签 杂货店

* Add files via upload
2026-04-30 10:10:05 +08:00
this-Fish
e5d65cfcf5 new 松茸 (#3170)
* new 松茸

* 自动修复 JSON 格式和版本号 [ci skip]

---------

Co-authored-by: GitHub Actions Bot <actions@github.com>
2026-04-30 08:53:54 +08:00
呱呱z
fd9e3b2516 添加【新增示例】,以便于用户自定义添加矿石可选项 (#3165)
1. README文件新增【自定义扩展】模块;
    2. 文件内增新增 矿物/路线【新增示例】,以便于后续自定义增添矿物。
2026-04-30 08:52:19 +08:00
躁动的氨气
7d21ecf376 feat: 莉奈娅挖矿一条龙 (#3166) 2026-04-29 22:49:04 +08:00
火山
d3165db775 更新战斗好感js (#3164)
* 更新战斗好感js

尝试优化了一下

* 修正代码

* 补充JSDoc

* Update main.js
2026-04-28 12:31:15 +08:00
Gedley
1772354e60 JS脚本:禽肉好感 (#3155)
* 提交新的好感任务脚本

* 完善JS脚本:禽肉好感

* 完善JS脚本:禽肉好感

* 完善JS脚本:禽肉好感

* JS脚本:禽肉好感,增加预估剩余时间显示

* 替换JS脚本:鸡腿好感
2026-04-27 22:20:51 +08:00
this-Fish
29036bf402 new 苦种全收集 (#3163) 2026-04-27 22:15:53 +08:00
火山
8e4b02d627 改进 AutoFriendshipFight 的稳定性与错误处理 (#3161)
* 改进 AutoFriendshipFight 的稳定性与错误处理

改进 AutoFriendshipFight 的稳定性与错误处理:

- 新增 swimConsecutiveLimit 设置项,并通过 swim_stats.json 记录每日/连续触发“游泳”事件的次数。
- 重构战斗流程: runBattlePathAndFight 、 executeBattleTasks 、 waitForBattleResult 现在返回明确的状态(success/failure/out_of_area/cancelled),并更好地处理取消/超时等情况。
- 改进 OCR 与资源管理:复用并释放经验/摩拉模板 Mat(exp/mora),安全释放截图/OCR 对象,减少循环中的资源泄露风险。
- 增加 AutoPath 封装与安全的文件/路径工具( fileExistsSafe 、 normalizePathForCompare ),避免路径执行/ runFile 出错时出现未处理异常。
- 增加通用工具:安全读取地图坐标、取消检测辅助函数、每日游泳统计的加载/保存/重置,以及战斗点缓存等。
- 其它修复:超时参数校验、正确声明 runTimes 、改进切队逻辑,以及更健壮的日志与通知输出等。
这些改动旨在防止后台残留导致的资源占用问题,更好地检测与处理游泳相关失败,并让战斗/OCR 循环更确定、更可恢复。

* Change fight timeout default from 120 to 30 seconds

* Update fight timeout default value to 120 seconds

* 更改版本号
2026-04-26 21:00:34 +08:00
this-Fish
6e6aeb0545 自动购买商品 3.3.1 (#3160)
* 修改挪德卡莱-那夏镇-采若路線

* Update manifest.json
2026-04-25 22:37:12 +08:00
this-Fish
f05fa2b277 自动购买商品 3.3.0 (#3158)
* Add files via upload

* Add files via upload

* Add files via upload
2026-04-25 17:49:42 +08:00
云端客
913f8445f5 docs(AutoPlan): 更新文档说明与工具版本建议 (#3157)
- 更新 bettergi-scripts-tools 版本建议为 v0.0.8+
- 添加 init-api 配置界面截图
- 优化文档结构和图片展示顺序
2026-04-25 12:28:53 +08:00
云端客
9fdefe24c2 main-asn (#3156)
* refactor(ActivitySwitchNotice): 优化通知配置构建逻辑

- 将 configNotice 变量改为 let 声明以支持动态更新
- 新增 async 函数 buildConfigNotice 用于构建通知配置
- 在 sendNotice 函数中调用 buildConfigNotice 确保配置最新
- 在 sendText 函数中添加 buildConfigNotice 调用保证配置同步

* refactor(utils): 导出工具函数并移除全局挂载

- 将 activity.js 中的 activityMain 函数改为导出函数
- 将 campaignArea.js 中的 ocrDailyCommission、ocrWeeklyCount、campaignAreaMain、dailyCommissionMain 函数改为导出函数
- 将 mapMission.js 中的 ocrMapMission、openMap、mapMission 函数改为导出函数
- 将 tool.js 中的 findTextAndClick、getDayOfWeek 函数改为导出函数
- 将 uid.js 中的 saveOnlyNumber、ocrUID、compareUid、checkUid、check 函数改为导出函数
- 将 ws.js 中的 send、sendText 函数改为导出函数
- 移除所有 utils 文件中对 this 对象的挂载操作
- 在 main.js 中导入新的工具函数并移除重复定义的函数

* fix(ActivitySwitchNotice): 修复圣遗物空间检查功能中的显示和逻辑问题

- 修正圣遗物空间不足提醒消息中的标点符号格式
- 修复圣遗物空间阈值错误日志中的数字格式
- 移除不必要的延时操作以优化执行效率
- 调整代码结构以提高运行性能

fix(ActivitySwitchNotice): 修复圣遗物空间检查功能中的显示和逻辑问题

- 修正圣遗物空间不足提醒消息中的标点符号格式
- 修复圣遗物空间阈值错误日志中的数字格式
- 移除不必要的延时操作以优化执行效率
- 调整代码结构以提高运行性能

refactor(ActivitySwitchNotice): 优化圣遗物检查功能中的延迟配置

- 将硬编码的延迟时间替换为可配置的常量
- 统一延迟时间管理,提高代码可维护性
- 保持原有功能逻辑不变的情况下提升代码质量

feat(ActivitySwitchNotice): 更新版本并新增圣遗物空间检测提醒功能

- 将插件版本从 0.1.3 更新至 0.1.5
- 新增圣遗物剩余空间检测提醒功能
- 在版本历史中添加 0.1.5 版本记录

fix(ActivitySwitchNotice): 修复圣遗物剩余空间阈值解析错误

- 添加 try-catch 块处理 parseInt 异常情况
- 当阈值格式错误时默认使用 400 的阈值
- 添加警告日志记录格式错误的阈值设置
- 确保程序在无效配置下仍能正常运行

feat(bag): 添加圣遗物背包空间检查功能

- 新增 HolyRelics.js 工具模块实现圣遗物数量检查逻辑
- 集成 OCR 识别功能用于获取圣遗物数量信息
- 添加背包空间不足提醒功能,可自定义阈值
- 在 main.js 中集成圣遗物检查流程
- 添加新的配置选项包括打开背包按键和圣遗物阈值设置
- 扩展工具类增加 findText、findImg 和 OcrFind 等通用识别方法
- 实现自动打开背包并处理过期物品弹窗功能

* fix(HolyRelics): 修复圣遗物背包空间检测功能

- 添加了进入圣遗物背包的点击状态验证,避免无法进入时继续执行
- 增强了OCR文本解析逻辑,添加了字符串分割长度验证和数值解析校验
- 优化了阈值参数解析,在main.js中添加了更安全的数值转换和错误处理
- 修复了工具函数中资源释放问题,在isInMainUI函数中使用try-finally确保资源被正确释放
- 更新了提醒消息文本,明确标识阈值设置参数
2026-04-25 12:28:42 +08:00
云端客
d8f4afbbf3 (适配 https://github.com/babalae/better-genshin-impact/pull/3069) feat(ActivitySwitchNotice): 实现单例模式配置唯一实例 (#3154) 2026-04-23 12:42:13 +08:00
云端客
8de0bf9b39 (适配 https://github.com/babalae/better-genshin-impact/pull/3069) (#3153) 2026-04-23 12:39:29 +08:00