Commit Graph

19380 Commits

Author SHA1 Message Date
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]
alpha/v6.12.3-alpha.1.d028.g70a3a5a6eb
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]
alpha/v6.12.3-alpha.1.d019.g9f831564be
2026-06-16 22:30:10 +00:00
status102
3b1eb29e20 chore: 怪猎一期复刻 CF-EX-8, CF-S-1 view1参数 alpha/v6.12.3-alpha.1.d018.g3b1eb29e20 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]
alpha/v6.12.3-alpha.1.d006.gd0fee36c76
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>
v6.12.2
2026-06-14 17:27:06 +08:00
uye
5bdf6b9320 docs: changelog 2026-06-14 17:25:25 +08:00
uye
cafc394605 Merge commit from fork
- release-preparation.yml: bind PR_TITLE/PR_URL/TAG_NAME via env instead of inlining expressions in run blocks; add fork guard to both jobs
- pr-auto-tag.yml: bind EVENT_NAME/PR_TITLE/INPUT_TAG/TAG_NAME via env; replace bash inline expression with [ ] test
- ci.yml: bind CONCURRENCY_GROUP via env instead of inlining github.head_ref in run block
2026-06-14 13:05:13 +08:00
Saratoga-Official
0d2e18a476 chore: 更新肉鸽招募干员
fix #17094
alpha/v6.12.2-alpha.1.d010.g0d2e18a476
2026-06-13 15:58:22 +08:00
Saratoga-Official
1dfac534d0 fix: 界园移时换物放弃探索
fix #17055
2026-06-13 14:14:06 +08:00
github-actions[bot]
f7262208f0 feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27446261928
[skip changelog]
alpha/v6.12.2-alpha.1.d008.gf7262208f0
2026-06-12 22:18:01 +00:00
status102
99167c3298 fix: 水月肉鸽事件DiceConfirm后事件不处理 2026-06-12 19:57:13 +08:00
status102
c5f51f56fe perf: 初始化期TaskQueue滑动宽限 2026-06-12 19:00:43 +08:00
soundofautumn
38527ffe08 build: use vs2026 in publish (#15806)
* build: publish remove Visual Studio 17 2022

* build: test vs2026

* fix: 不小心删多了

* fix: nightly 应该也要改

* fix: 这个好像也得改?
2026-06-12 15:45:24 +08:00
uye
21a8d170d7 chore: 移除未使用的变量 2026-06-12 14:13:39 +08:00
soundofautumn
208d28d6fa feat: MAA updater 增加文件被占用时增加重试、互斥量协调与回滚机制 (#16703)
* feat: updater和maa本体共享一个mutex锁

* feat: updater和maa本体共享一个mutex锁

* feat: 改进MAA updater

* feat: instance key改成mutex name

* fix: unused function
2026-06-12 13:56:32 +08:00
Halo
a73ce8efeb fix: respect timeout while waiting for macOS socket data (#17027)
fix: respect timeout while waiting for POSIX socket data
alpha/v6.12.2-alpha.1.d002.ga73ce8efeb
2026-06-12 01:35:09 +08:00
uye
562ff75c5a chore: 简化 external_renderer_ipc 加载成功的日志 2026-06-12 00:27:03 +08:00
uye
b318e3698f Release v6.12.1 (#17078)
## Summary by Sourcery

调整多协作助手任务中的阶段导航颜色阈值参数和 OCR 调试输出。

Enhancements:
- 在 `MultiCopilotTaskPlugin` 中,用 `special_params` 代替 `bin_threshold`
来配置阶段颜色阈值。
- 将阶段检测的阶段图像预处理从灰度转换为 HSV 颜色空间。
- 扩展 OCR 调试绘制,在分数旁边同时显示识别到的文本。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Adjust stage navigation color thresholding parameters and OCR debugging
output for multi-copilot tasks.

Enhancements:
- Use special_params instead of bin_threshold for stage color threshold
configuration in MultiCopilotTaskPlugin.
- Switch stage image preprocessing from grayscale to HSV color space for
stage detection.
- Extend OCR debug drawing to include recognized text alongside the
score.

</details>
v6.12.1
2026-06-11 22:14:54 +08:00
uye
edb9b268e7 docs: changelog 2026-06-11 22:12:12 +08:00
status102
263a84831d fix: 自动战斗导航选错关卡无法重选 2026-06-11 21:09:30 +08:00
status102
e44ccffe0e perf: 不再使用不必要的子任务 2026-06-11 21:09:29 +08:00
uye
d900c20b65 chore: 加两个提前返回 2026-06-11 21:02:20 +08:00
status102
d373e3a094 fix: 多作业模式关卡名复核失效 2026-06-11 20:41:04 +08:00
github-actions[bot]
cf370818e0 chore: Auto Update Game Resources - 2026-06-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27343798086

[skip changelog]
2026-06-11 11:33:56 +00:00