Constrat
c3dffe9929
fix: future alter operators EN
2026-06-22 18:34:10 +02:00
github-actions[bot]
94e0addc9a
chore: Auto Update Game Resources - 2026-06-22
...
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27953171369
[skip changelog]
2026-06-22 12:38:44 +00:00
github-actions[bot]
1083ee342e
chore: Auto Update Game Resources - 2026-06-22
...
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27933177568
[skip changelog]
2026-06-22 06:11:46 +00:00
uye
f9dbbb36b9
Release v6.13.0-beta.2 ( #17170 )
...
## Summary by Sourcery
错误修复：
- 在 `MultiCopilotTaskPlugin` 中遍历导航重试循环时，使用正确的最大重试配置。
<details>
<summary>Original summary in English</summary>
## Summary by Sourcery
Bug Fixes:
- Use the correct maximum retry configuration when iterating the
navigation retry loop in MultiCopilotTaskPlugin.
</details>
2026-06-22 12:36:59 +08:00
uye
1c4aba28fd
docs: Bump version to v6.13.0-beta.2 in CHANGELOG
...
Updated changelog to reflect version bump to v6.13.0-beta.2 and added fix details.
2026-06-22 12:34:42 +08:00
status102
ba47dd16cf
fix: 猪猪
2026-06-22 12:24:31 +08:00
uye
db6bb9c4e6
Release v6.13.0-beta.1 ( #17131 )
...
## Summary by Sourcery
为 v6.13.0-beta.1 做准备，加入基于 Android NCNN 的 OCR、Webhook 预设模板，以及多项稳定性与 CI
改进。
New Features:
- 为 Android 构建引入基于 NCNN 的 OCR 实现，同时在其他平台继续使用 FastDeploy OCR。
- 在外部通知设置中新增可选择的 Webhook 预设模板，包括 MeoW 预设。
- 支持「仅配置」的 6 星自动公招确认，并固定公招时间为 9:00。
Bug Fixes:
- 确保 Maa API 更新检查能够遵循全局更新代理配置。
- 修复任务停止与 UI 重置逻辑，避免竞争条件，并确保超时能强制恢复 UI。
- 当在连接过程中已发出停止请求时，阻止协助器（copilot）继续启动。
- 当 Windows 无法显示系统 Toast 通知时，避免显示应用内 Toast 日志，而是改用 Growl 作为回退方案。
Enhancements:
- 重构 OCR 包实现，在其背后使用 pimpl 隔离平台相关的后端实现。
- 调整多协助器导航重试逻辑，更好地尊重已配置的重试次数。
- 改进手动停止行为，将 Core 停止处理和任务结束脚本集中到统一逻辑中。
- 在 Toast 通知失败的情况下，始终使用 Growl 显示失败消息，而不是写入任务日志。
- 刷新明日方舟的关卡方块、关卡、肉鸽和任务元数据资源，以支持最新活动。
- 收紧公招时间处理，将 5 星 / 6 星公招时间固定为 9:00，并打通序列化和工具箱相关逻辑。
- 更新 MaaDeps 下载脚本以拉取 v2.13.1，并使依赖安装脚本路径与当前目录结构保持一致。
Build:
- 在 MaaCore 的 CMake 中拆分 OCR 实现选择：桌面端使用 FastDeploy，Android 使用
NCNN，并相应调整链接依赖。
- 将 Avalonia CI 触发条件限制为相关源码与构建文件，并将默认推送分支切换为 dev-v2。
CI:
- 将各工作流中对 actions/checkout 的使用升级到 v7。
- 在资源同步与模板优化工作流中，将 ad-m/github-push-action 固定到 v1.3.0。
- 将 softprops/action-gh-release 升级到 v3.0.1，用于发布 GitHub Release。
<details>
<summary>Original summary in English</summary>
## Summary by Sourcery
Prepare v6.13.0-beta.1 by adding Android NCNN-based OCR, webhook preset
templates, and various stability and CI improvements.
New Features:
- Introduce NCNN-based OCR implementation for Android builds while
keeping FastDeploy OCR for other platforms.
- Add selectable preset webhook templates, including a MeoW preset, in
external notification settings.
- Support configuration-only 6-star auto-recruit confirmation with fixed
9:00 recruit time.
Bug Fixes:
- Ensure Maa API update checks respect the global update proxy
configuration.
- Fix task stopping and UI reset logic to avoid race conditions and
ensure timeouts force UI recovery.
- Prevent copilot start from proceeding if a stop request was issued
during connection.
- Avoid showing in-app toast logs when Windows toast notifications are
unavailable, instead using Growl fallback.
Enhancements:
- Refactor OCR pack implementation behind a pimpl to separate
platform-specific backends.
- Adjust multi-copilot navigation retry logic to better respect
configured retry counts.
- Improve manual stop behavior to centralize Core stop handling and
end-of-task scripts.
- Always use Growl for toast notification failure messages instead of
task log entries.
- Refresh Arknights tile, stage, roguelike, and task metadata resources
for new events.
- Tighten recruit time handling by fixing 5-star/6-star recruit times to
9:00 and wiring them through serialization and toolbox.
- Update MaaDeps downloader script to pull v2.13.1 and align dependency
setup script paths with current layout.
Build:
- Split OCR implementation selection in MaaCore CMake to use FastDeploy
on desktop and NCNN on Android, adjusting link dependencies accordingly.
- Restrict Avalonia CI triggers to relevant source and build files and
switch its default push branch to dev-v2.
CI:
- Upgrade actions/checkout usage across workflows to v7.
- Pin ad-m/github-push-action to v1.3.0 in resource sync and template
optimization workflows.
- Bump softprops/action-gh-release to v3.0.1 for GitHub release
publishing.
</details>
新功能：
- 为外部通知配置引入内置 webhook 预设模板，包括 MeoW 预设。
- 在外部通知设置界面中开放预设 webhook 的选择，并提供本地化显示名称。
错误修复：
- 在通过 Maa API 检查更新时，使用全局更新代理配置。
优化改进：
- 刷新《明日方舟》的地块位置、关卡、肉鸽和任务元数据资源，并提升资源版本以适配新一批活动。
CI：
- 更新 GitHub workflow，使用 `ad-m/github-push-action` v1.3.0 进行自动推送。
日常维护：
- 调整依赖安装批处理脚本的路径/名称，以与当前工具布局保持一致。
<details>
<summary>Original summary in English</summary>
## Summary by Sourcery
为 v6.13.0-beta.1 做准备，加入基于 Android NCNN 的 OCR、Webhook 预设模板，以及多项稳定性与 CI
改进。
New Features:
- 为 Android 构建引入基于 NCNN 的 OCR 实现，同时在其他平台继续使用 FastDeploy OCR。
- 在外部通知设置中新增可选择的 Webhook 预设模板，包括 MeoW 预设。
- 支持「仅配置」的 6 星自动公招确认，并固定公招时间为 9:00。
Bug Fixes:
- 确保 Maa API 更新检查能够遵循全局更新代理配置。
- 修复任务停止与 UI 重置逻辑，避免竞争条件，并确保超时能强制恢复 UI。
- 当在连接过程中已发出停止请求时，阻止协助器（copilot）继续启动。
- 当 Windows 无法显示系统 Toast 通知时，避免显示应用内 Toast 日志，而是改用 Growl 作为回退方案。
Enhancements:
- 重构 OCR 包实现，在其背后使用 pimpl 隔离平台相关的后端实现。
- 调整多协助器导航重试逻辑，更好地尊重已配置的重试次数。
- 改进手动停止行为，将 Core 停止处理和任务结束脚本集中到统一逻辑中。
- 在 Toast 通知失败的情况下，始终使用 Growl 显示失败消息，而不是写入任务日志。
- 刷新明日方舟的关卡方块、关卡、肉鸽和任务元数据资源，以支持最新活动。
- 收紧公招时间处理，将 5 星 / 6 星公招时间固定为 9:00，并打通序列化和工具箱相关逻辑。
- 更新 MaaDeps 下载脚本以拉取 v2.13.1，并使依赖安装脚本路径与当前目录结构保持一致。
Build:
- 在 MaaCore 的 CMake 中拆分 OCR 实现选择：桌面端使用 FastDeploy，Android 使用
NCNN，并相应调整链接依赖。
- 将 Avalonia CI 触发条件限制为相关源码与构建文件，并将默认推送分支切换为 dev-v2。
CI:
- 将各工作流中对 actions/checkout 的使用升级到 v7。
- 在资源同步与模板优化工作流中，将 ad-m/github-push-action 固定到 v1.3.0。
- 将 softprops/action-gh-release 升级到 v3.0.1，用于发布 GitHub Release。
<details>
<summary>Original summary in English</summary>
## Summary by Sourcery
Prepare v6.13.0-beta.1 by adding Android NCNN-based OCR, webhook preset
templates, and various stability and CI improvements.
New Features:
- Introduce NCNN-based OCR implementation for Android builds while
keeping FastDeploy OCR for other platforms.
- Add selectable preset webhook templates, including a MeoW preset, in
external notification settings.
- Support configuration-only 6-star auto-recruit confirmation with fixed
9:00 recruit time.
Bug Fixes:
- Ensure Maa API update checks respect the global update proxy
configuration.
- Fix task stopping and UI reset logic to avoid race conditions and
ensure timeouts force UI recovery.
- Prevent copilot start from proceeding if a stop request was issued
during connection.
- Avoid showing in-app toast logs when Windows toast notifications are
unavailable, instead using Growl fallback.
Enhancements:
- Refactor OCR pack implementation behind a pimpl to separate
platform-specific backends.
- Adjust multi-copilot navigation retry logic to better respect
configured retry counts.
- Improve manual stop behavior to centralize Core stop handling and
end-of-task scripts.
- Always use Growl for toast notification failure messages instead of
task log entries.
- Refresh Arknights tile, stage, roguelike, and task metadata resources
for new events.
- Tighten recruit time handling by fixing 5-star/6-star recruit times to
9:00 and wiring them through serialization and toolbox.
- Update MaaDeps downloader script to pull v2.13.1 and align dependency
setup script paths with current layout.
Build:
- Split OCR implementation selection in MaaCore CMake to use FastDeploy
on desktop and NCNN on Android, adjusting link dependencies accordingly.
- Restrict Avalonia CI triggers to relevant source and build files and
switch its default push branch to dev-v2.
CI:
- Upgrade actions/checkout usage across workflows to v7.
- Pin ad-m/github-push-action to v1.3.0 in resource sync and template
optimization workflows.
- Bump softprops/action-gh-release to v3.0.1 for GitHub release
publishing.
</details>
</details>
2026-06-21 17:07:07 +08:00
uye
349a0bf730
docs: changelog
2026-06-21 16:47:41 +08:00
uye
e2400684bb
chore: 通知不可用时记录日志
2026-06-21 16:46:15 +08:00
uye
6cec1e9ced
chore: 移除未使用变量
2026-06-21 16:18:38 +08:00
uye
d821607983
chore: copilot stop 改为 Task
2026-06-21 16:18:37 +08:00
Status102
8f860635aa
fix: 错误短路
2026-06-21 16:05:40 +08:00
uye
222c853263
rft: 无法显示系统通知时回退到软件内通知，启动时日志中的通知不可用提示改为 growl 提示 ( #17165 )
2026-06-21 15:43:34 +08:00
dependabot[bot]
8276849f1a
ci：将 /.github/workflows 中的 github-actions 组更新 2 次 ( #17163 )
...
Bumps the github-actions group in /.github/workflows with 2 updates: [actions/checkout](https://github.com/actions/checkout ) and [softprops/action-gh-release](https://github.com/softprops/action-gh-release ).
Updates `actions/checkout` from 6 to 7
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/checkout/compare/v6...v7 )
Updates `softprops/action-gh-release` from 3.0.0 to 3.0.1
- [Release notes](https://github.com/softprops/action-gh-release/releases )
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md )
- [Commits](https://github.com/softprops/action-gh-release/compare/v3.0.0...v3.0.1 )
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-version: '7'
dependency-type: direct:production
update-type: version-update:semver-major
dependency-group: github-actions
- dependency-name: softprops/action-gh-release
dependency-version: 3.0.1
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: github-actions
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-06-20 23:08:27 +08:00
uye
f24c0e237a
feat: 新增可通过手动修改配置文件开启 6 星自动公招，将是否招募和招募时间选项移入常规设置 ( #17154 )
2026-06-20 16:46:05 +08:00
Halo
e04e656f45
修复MAAUnified CI 选错ref的问题 ( #17143 )
...
* ci: checkout PR head for MAAUnified debug builds
* fix(Avalonia): 删除倒反天罡的对主仓CI的相关测试
2026-06-19 17:22:15 +08:00
uye
9104f1a06a
chore: 调整日志超时提示
2026-06-19 17:08:36 +08:00
github-actions[bot]
9344e38fec
chore: Auto Templates Optimization
...
Triggered by d2cb0fd435
2026-06-19 05:59:02 +00:00
HX3N
d2cb0fd435
chore: YostarKR crop JieGarden@Roguelike@StartAction.png to improve match score
2026-06-19 14:55:29 +09:00
HX3N
645b86babd
fix: YostarKR correct ClickChapterNewDefaultProgress roi
...
Yostar changed the UI layout
2026-06-19 13:57:58 +09:00
github-actions[bot]
70a3a5a6eb
feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
...
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27723628023
[skip changelog]
2026-06-17 22:24:57 +00:00
github-actions[bot]
6b7ec43006
chore: Auto update by pre-commit hooks
...
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27721405857
[skip changelog]
2026-06-17 21:41:25 +00:00
github-actions[bot]
3578c255be
chore: Auto Update Game Resources - 2026-06-17
...
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27710873810
[skip changelog]
2026-06-17 18:29:27 +00:00
status102
0d66797b34
fix: 漏了
2026-06-17 18:21:06 +08:00
Aliothmoon
9097d4e1c1
feat: Android OCR 推理使用 NCNN ( #17133 )
2026-06-17 16:56:03 +08:00
uye
0f4497da86
rft: 统一停止逻辑 ( #17087 )
...
* rft: 统一停止逻辑
* chore: 连接时停止脚本
2026-06-17 15:02:24 +08:00
Manicsteiner
ded0682bcc
chore: Yostar SSS#10 极寒 ( #17137 )
2026-06-17 14:58:52 +08:00
Manicsteiner
8c560b8bc6
ci: 优化Avalonia构建工作流触发条件 ( #17139 )
...
- push 触发改为 dev-v2 分支。
- 不再在仅有 resources 更改时触发。
- 新增该文件本身和cmake、3rdparty触发条件，不再在仅md文件更改时触发，与 ci.yml 保持一致。
~另外这玩意失败概率有点高啊~
## 由 Sourcery 提供的摘要
调整 Avalonia CI 工作流的触发条件，以更好地匹配相关的源码变更和分支使用情况。
CI：
- 将 Avalonia CI 的 push 触发分支从 `dev` 限制为 `dev-v2`。
- 当仅有 Markdown 或资源文件发生变更时跳过运行；同时确保对工作流文件、CMake、第三方依赖（3rdparty
includes）以及核心源码路径的变更仍会触发构建。
<details>
<summary>Original summary in English</summary>
## Summary by Sourcery
Adjust Avalonia CI workflow triggers to better match relevant source
changes and branch usage.
CI:
- Limit Avalonia CI push triggers to the dev-v2 branch instead of dev.
- Exclude runs when only markdown or resource files change while
ensuring the workflow, CMake, 3rdparty includes, and core source paths
still trigger builds.
</details>
2026-06-17 14:57:42 +08:00
status102
0b281e6ff6
fix: 自动战斗导航retry异常, 跳过作业
2026-06-17 14:24:55 +08:00
github-actions[bot]
9f831564be
feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
...
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27652374477
[skip changelog]
2026-06-16 22:30:10 +00:00
status102
3b1eb29e20
chore: 怪猎一期复刻 CF-EX-8, CF-S-1 view1参数
2026-06-15 20:11:45 +08:00
status102
41dfee2d92
fix: HandleUpdateFromMaaApi 未能遵循正确的代理设置
2026-06-15 20:09:35 +08:00
uye
a2d1cd93a2
chore: "text": ["苍暮", "山", "地"]
...
[skip changelog]
2026-06-15 18:27:59 +08:00
github-actions[bot]
7946a61441
chore: Auto Update Game Resources - 2026-06-15
...
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27536955354
[skip changelog]
2026-06-15 09:30:35 +00:00
SherkeyXD
110baa4fdf
fix: 修正落叶落叶逐火入口OCR文本
2026-06-15 17:30:23 +08:00
uye
b99c07b234
chore: 移除依赖库安装的提权操作
2026-06-15 17:13:45 +08:00
SherkeyXD
f3e8070e1d
feat: 添加落叶逐火复刻入口任务
2026-06-15 17:01:50 +08:00
Saratoga-Official
4034bc58e4
fix: 肉鸽战斗结束后招募误入StartExplore
...
fix #17120
2026-06-15 12:38:20 +08:00
github-actions[bot]
0dde389e34
chore: Auto Update Game Resources - 2026-06-15
...
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27521713212
[skip changelog]
2026-06-15 03:12:52 +00:00
Saratoga-Official
3f18299322
fix: 水月大海的遗产和狗眼婆娑事件名识别错误
2026-06-15 11:07:41 +08:00
Saratoga-Official
e47d6a56a3
fix: GetDrop增加LoadingText等待
...
fix #17118
2026-06-15 10:59:14 +08:00
Saratoga-Official
d74fa22fb6
fix: 修复CloseEvent和CloseCollection同时出现导致的问题
...
fix #17121
2026-06-15 10:36:12 +08:00
github-actions[bot]
d0fee36c76
chore: Auto Update Game Resources - 2026-06-14
...
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27511123959
[skip changelog]
2026-06-14 20:31:01 +00:00
AnnAngela
4af887cd0f
ci: Update GitHub push action version comment in workflow ( #17124 )
2026-06-14 23:08:04 +08:00
dependabot[bot]
043b78e19f
ci: bump ad-m/github-push-action from d30dc2d070765d7e509df00c34c5fa2dd636ff74 to 881a6320fdb16eb5318c5054f31c218aec2b324c in /.github/workflows in the github-actions group across 1 directory ( #16934 )
...
Signed-off-by: dependabot[bot] <support@github.com >
2026-06-14 23:02:55 +08:00
pboymt
e02f75adea
feat: Custom Webhook 新增预置模板功能 ( #17081 )
...
* feat: Custom Webhook 新增预置模板功能
为 Custom Webhook 添加预置模板下拉框，内置 MeoW 模板。
选中模板后自动填入 URL/Headers/Body，用户手动替换占位符。
- 新增 WebhookPresetTemplate 模型类及 BuiltInTemplates 静态列表
- 新增预置模板 ComboBox 及 tooltip 提示
- 选中模板时自动填入并持久化 URL/Headers/Body
- 新增 4 条本地化 key（5 种语言）
* fix: 处理 Code Review 反馈
- WebhookPresetTemplate.BuiltInTemplates 改为 IReadOnlyList 防止外部修改
- 切换回自定义时不再清空字段，保留用户已编辑内容
* chore: 移除 MeoW 模板中不需要的 Headers 配置
* feat: 使用尖括号标识用户需替换的占位符，移除多余的 UI 通知
- WebhookPresetTemplate URL 中的 {nickname} 改为 <nickname>，
以区别于系统自动替换的 {title}/{content}/{time}
- 移除 SelectedPresetTemplateId 中多余的 NotifyOfPropertyChange 调用
（属性 setter 已通过 SetAndNotify 自动通知 UI 更新）
2026-06-14 20:06:21 +08:00
github-actions[bot]
f6aa5b4797
chore: Auto Update Game Resources - 2026-06-14
...
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27496235398
[skip changelog]
2026-06-14 10:40:16 +00:00
HY
578d23e6ae
chore: 調整繁中服 "CharsNameOcrReplace" 部分內容 ( #17113 )
2026-06-14 12:37:27 +02:00
uye
ac38ea9e43
Release v6.12.2 ( #17109 )
...
## Summary by Sourcery
改进 Windows 更新程序的鲁棒性、实例协调机制以及 CI/发布工作流程，以支持 v6.12.2 版本发布。
New Features:
- 允许 Windows 更新程序接收一个可选的命名互斥量参数，在更新期间阻止新的应用实例启动，并与 WPF 启动器使用的互斥量进行协调。
- 在 Windows 更新应用程序失败时，自动回滚已备份的文件。
Bug Fixes:
- 通过重试、强制删除和原子安装策略加固 Windows 更新程序的文件操作，以更好地处理被锁定或正在使用的文件。
- 确保 POSIX 命令运行器在无法在给定超时时间内建立套接字连接时，会超时并干净地杀死子进程。
- 在应用新更新之前，清理上一次中断更新遗留的待删除文件。
Enhancements:
- 调整备份和回收逻辑，在回收站操作失败时回退到强制删除。
- 改进关于 MuMu 渲染器库加载路径的日志记录，以提升诊断能力。
- 优化 CI 中并发组（concurrency group）的处理，并保护某些工作流不在 fork 的拉取请求上运行。
- 重构 WPF 引导程序中的互斥量/实例键处理逻辑，以便其他组件（如更新程序）复用。
- 将 Windows CI 和打包工作流切换为使用 `windows-2025-vs2026` 运行器镜像。
CI:
- 通过使用显式环境变量、适当引用（quoting），并将执行限制在非 fork PR 上，加固发布准备和 PR 自动打标签工作流。
- 通过环境变量对标签/更新日志生成以及标签合并步骤进行参数化，使 GitHub Actions 脚本更加健壮。
<details>
<summary>Original summary in English</summary>
## Summary by Sourcery
Improve Windows updater robustness, instance coordination, and
CI/release workflows for the v6.12.2 release.
New Features:
- Allow the Windows updater to take an optional named mutex parameter to
block new app instances during updates and coordinate with the WPF
launcher mutex.
- Add automatic rollback of backed-up files when the Windows update
application fails.
Bug Fixes:
- Harden Windows updater file operations with retry, force-delete, and
atomic install strategies to better handle locked or in-use files.
- Ensure the POSIX command runner times out and cleanly kills child
processes if a socket connection cannot be established within the given
timeout.
- Clean up stale pending-delete files from previous interrupted updates
before applying a new update.
Enhancements:
- Adjust backup and recycle logic to fall back to force deletion when
recycle bin operations fail.
- Improve logging around MuMu renderer library loading paths for better
diagnostics.
- Refine concurrency group handling in CI and guard certain workflows
from running on forked pull requests.
- Refactor mutex/instance-key handling in the WPF bootstrapper for reuse
by other components like the updater.
- Switch Windows CI and packaging workflows to the windows-2025-vs2026
runner image.
CI:
- Harden release-preparation and PR auto-tag workflows by using explicit
environment variables, quoting, and restricting execution to non-fork
PRs.
- Parameterize tag/changelog generation and tag merge steps via
environment variables for more robust GitHub Actions scripting.
</details>
2026-06-14 17:27:06 +08:00
uye
5bdf6b9320
docs: changelog
2026-06-14 17:25:25 +08:00
