19448 Commits

Author SHA1 Message Date
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
Rin
018e4ba38f fix: 处理界园事件内通宝交换后的事件结束页 (#16936)
* fix: 处理界园事件内通宝交换后的事件结束页

* fix: 优化事件内放弃通宝的#next
2026-06-11 17:12:30 +08:00
status102
9b51d03415 fix: 有小猪 2026-06-11 13:10:41 +08:00
status102
54d00e741d perf(core): OCRer DEBUG下m_image_draw绘制增加结果文本 2026-06-11 13:08:39 +08:00
uye
ff47c11d99 Release v6.12.0 (#17074)
* Revert "fix: Potential fix for pull request finding"

This reverts commit 588bfb3778.

* Revert "chore: 删除多余验证"

This reverts commit e208a2f94e.

* chore: Auto Update Game Resources - 2026-06-09

https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27222080798

[skip changelog]

* fix: build warning

* feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27239478748
[skip changelog]

* chore: 还原牛杂 i18n 实现方式

* chore: 阵地足球开始后增加动画延迟,避免点入编队界面

* chore: 足球需要更多的 325

* chore: 调整部署速度

* chore: Auto Update Game Resources - 2026-06-10

https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27265152626

[skip changelog]

* fix(gui): 释放 StartSettings 中未释放的 Process 对象 (#17060)

StartEmulator / RestartAdb / ReconnectByAdb 中 new 出来的 Process 对象在使用后
未被释放,会泄漏进程相关句柄(CA2000)。改为 using 声明,使其在作用域结束时
释放。释放 Process 托管对象只回收本地句柄,不会终止已启动的进程,因此对仿真器
的 fire-and-forget 启动也是安全的。

不改动 catch 兜底里的静态 Process.Start,以及 GetProcesses() 的查询写法。

* chore: OF1把嵯峨换成银灰避免可能打不过

* fix(gui): 修复 MuMu 12 任务完成后无法关闭模拟器 (#17067)

* fix(gui): 修复 MuMu 12 任务完成后无法关闭模拟器

感谢 @lingwateryang 在 issue 中给出的详细分析。

* fix(gui): MuMu 12 关闭模拟器改用 control 命令

旧的 `api -v {index} shutdown_player` 已失效。按 @ABA2396 的 review 意见,本 PR
仅将关闭命令替换为 `control -v {index} shutdown`;调用 MuMu 的接口之后模拟器是否
真正退出由 MuMu 负责,不在 MAA 的处理范围内,故不再附加进程确认与强杀等逻辑。

* chore: 繁中服「雪山降臨1101」活動導航 & 「喀蘭貿易技術研發部」小遊戲 (#17073)

* chore: 繁中服「雪山降臨1101」活動導航

* chore: 喀蘭貿易技術研發部 小遊戲

* feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27299220997
[skip changelog]

* chore: Auto Update Game Resources - 2026-06-10

https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27300017468

[skip changelog]

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Zmjjeff7 <2519416535@qq.com>
Co-authored-by: Saratoga-Official <1819530756@qq.com>
Co-authored-by: HY <45387477+momomochi987@users.noreply.github.com>
v6.12.0
2026-06-11 03:42:32 +08:00
uye
ec76f93881 docs: changelog 2026-06-11 03:41:14 +08:00
github-actions[bot]
305b67bbb9 chore: Auto Update Game Resources - 2026-06-10
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27300017468

[skip changelog]
2026-06-10 19:15:44 +00:00
github-actions[bot]
e23d910fd7 feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27299220997
[skip changelog]
2026-06-10 19:01:50 +00:00
HY
880a1987b6 chore: 繁中服「雪山降臨1101」活動導航 & 「喀蘭貿易技術研發部」小遊戲 (#17073)
* chore: 繁中服「雪山降臨1101」活動導航

* chore: 喀蘭貿易技術研發部 小遊戲
2026-06-11 01:25:52 +08:00
Zmjjeff7
f64a0af6c3 fix(gui): 修复 MuMu 12 任务完成后无法关闭模拟器 (#17067)
* fix(gui): 修复 MuMu 12 任务完成后无法关闭模拟器

感谢 @lingwateryang 在 issue 中给出的详细分析。

* fix(gui): MuMu 12 关闭模拟器改用 control 命令

旧的 `api -v {index} shutdown_player` 已失效。按 @ABA2396 的 review 意见,本 PR
仅将关闭命令替换为 `control -v {index} shutdown`;调用 MuMu 的接口之后模拟器是否
真正退出由 MuMu 负责,不在 MAA 的处理范围内,故不再附加进程确认与强杀等逻辑。
2026-06-11 01:14:05 +08:00
Saratoga-Official
28b6264a3c chore: OF1把嵯峨换成银灰避免可能打不过 2026-06-10 22:26:25 +08:00
Zmjjeff7
79a8a9bcca fix(gui): 释放 StartSettings 中未释放的 Process 对象 (#17060)
StartEmulator / RestartAdb / ReconnectByAdb 中 new 出来的 Process 对象在使用后
未被释放,会泄漏进程相关句柄(CA2000)。改为 using 声明,使其在作用域结束时
释放。释放 Process 托管对象只回收本地句柄,不会终止已启动的进程,因此对仿真器
的 fire-and-forget 启动也是安全的。

不改动 catch 兜底里的静态 Process.Start,以及 GetProcesses() 的查询写法。
2026-06-10 20:19:39 +08:00
github-actions[bot]
26011dae85 chore: Auto Update Game Resources - 2026-06-10
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27265152626

[skip changelog]
2026-06-10 08:58:55 +00:00
uye
be1087846b chore: 调整部署速度 2026-06-10 12:02:42 +08:00
uye
127fed5318 chore: 足球需要更多的 325 2026-06-10 11:59:35 +08:00
uye
3a9e059299 chore: 阵地足球开始后增加动画延迟,避免点入编队界面 2026-06-10 11:53:58 +08:00
uye
11c8170e7b chore: 还原牛杂 i18n 实现方式 2026-06-10 11:11:42 +08:00
github-actions[bot]
88bc6533fa feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27239478748
[skip changelog]
alpha/v6.12.0-beta.1.d015.g88bc6533fa
2026-06-09 22:17:52 +00:00
uye
4b50961a75 fix: build warning 2026-06-10 01:37:28 +08:00
github-actions[bot]
7d5648fe1a chore: Auto Update Game Resources - 2026-06-09
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27222080798

[skip changelog]
2026-06-09 17:09:13 +00:00
uye
4245829444 Revert "chore: 删除多余验证"
This reverts commit e208a2f94e.
2026-06-10 00:56:33 +08:00
uye
127e84462e Revert "fix: Potential fix for pull request finding"
This reverts commit 588bfb3778.
2026-06-10 00:56:33 +08:00
uye
15d1848e8e Release v6.12.0-beta.2 (#17054)
## Summary by Sourcery

改进交易订单处理、配置保存和小游戏元数据,同时新增一个小游戏任务定义。

新功能:
- 为新的 PF 小游戏添加配置和任务定义。

错误修复:
- 在配置保存时使用带有适当异常处理的信号量,以避免竞态条件,并确保在应用程序释放时可靠地进行最终保存。
- 通过重试、验证和失败上报来保护交易订单变更,减少制造状态不一致的情况。
- 调整小游戏显示和提示解析逻辑,优先采用 API 提供的值,防止本地化文本不正确或缺失。

改进:
- 简化 MuMu 外部渲染器加载的日志输出。
- 精简最终配置保存的日志,以清晰表明成功或失败。

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

## Summary by Sourcery

Improve trade order handling, configuration saving, and mini‑game
metadata while adding a new mini‑game task definition.

New Features:
- Add configuration and task definitions for a new PF mini‑game.

Bug Fixes:
- Make configuration saving use a semaphore with proper exception
handling to avoid race conditions and ensure reliable final save on
application release.
- Guard trade order changes with retry, verification, and failure
reporting to reduce inconsistent manufacturing state.
- Adjust mini‑game display and tip resolution to prefer API‑provided
values, preventing incorrect or missing localized text.

Enhancements:
- Simplify MuMu external renderer load logging output.
- Streamline final configuration save logging to clearly indicate
success or failure.

</details>

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

## Summary by Sourcery

改进交易订单处理、配置保存和小游戏元数据,同时新增一个小游戏任务定义。

新功能:
- 为新的 PF 小游戏添加配置和任务定义。

错误修复:
- 在配置保存时使用带有适当异常处理的信号量,以避免竞态条件,并确保在应用程序释放时可靠地进行最终保存。
- 通过重试、验证和失败上报来保护交易订单变更,减少制造状态不一致的情况。
- 调整小游戏显示和提示解析逻辑,优先采用 API 提供的值,防止本地化文本不正确或缺失。

改进:
- 简化 MuMu 外部渲染器加载的日志输出。
- 精简最终配置保存的日志,以清晰表明成功或失败。

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

## Summary by Sourcery

Improve trade order handling, configuration saving, and mini‑game
metadata while adding a new mini‑game task definition.

New Features:
- Add configuration and task definitions for a new PF mini‑game.

Bug Fixes:
- Make configuration saving use a semaphore with proper exception
handling to avoid race conditions and ensure reliable final save on
application release.
- Guard trade order changes with retry, verification, and failure
reporting to reduce inconsistent manufacturing state.
- Adjust mini‑game display and tip resolution to prefer API‑provided
values, preventing incorrect or missing localized text.

Enhancements:
- Simplify MuMu external renderer load logging output.
- Streamline final configuration save logging to clearly indicate
success or failure.

</details>

</details>
v6.12.0-beta.2
2026-06-10 00:46:50 +08:00
uye
e2f4762f2c docs: Update CHANGELOG for v6.12.0-beta.2 release 2026-06-10 00:44:23 +08:00
uye
e208a2f94e chore: 删除多余验证 2026-06-10 00:36:35 +08:00
uye
588bfb3778 fix: Potential fix for pull request finding
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
2026-06-10 00:35:07 +08:00
uye
614c344def i18n: 小游戏翻译 2026-06-10 00:31:12 +08:00
github-actions[bot]
68f029cf42 feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27220085543
[skip changelog]
2026-06-09 16:20:30 +00:00
github-actions[bot]
c7f9646c52 chore: Auto Templates Optimization
Triggered by da7fabd57e

[skip changelog]
2026-06-09 16:16:34 +00:00
uye
da7fabd57e feat: 添加阵地足球锦标赛小游戏 2026-06-10 00:13:27 +08:00
Status102
357823e0d3 fix: ConfigFactory Save锁统一 (#17052)
## 由 Sourcery 提供的总结

使配置保存使用基于异步和信号量的机制,并确保最终保存时采用一致的锁定方式。

错误修复:
- 通过统一使用基于信号量的 `Save` 实现,防止在保存配置文件时可能出现的竞态条件和不一致的锁定问题。

增强内容:
- 重构配置的 `Save` 方法,使其异步化并使用异步文件 I/O,在需要的地方将调用方更新为以同步方式调用该方法。
- 从配置工厂中移除未使用的 WPF 命名空间导入。

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

## Summary by Sourcery

通过切换为基于信号量的保护机制来统一配置保存时的加锁方式,并将其一致地应用于同步保存和发布时(release-time)的保存。

Bug Fixes:
- 通过使用与其他地方相同的信号量来保护同步保存操作,防止配置保存时的竞态条件。

Enhancements:
- 优化配置保存逻辑,在使用信号量时采用 try/catch/finally 结构,并将保存成功或失败的日志记录逻辑集中化。
- 从配置工厂中移除未使用的 WPF 命名空间引用。

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

## Summary by Sourcery

Unify configuration save locking by switching to semaphore-based
protection and apply it consistently to synchronous and release-time
saves.

Bug Fixes:
- Prevent configuration save race conditions by guarding synchronous
saves with the same semaphore used elsewhere.

Enhancements:
- Refine configuration save logic to use try/catch/finally around
semaphore usage and centralize logging of save success or failure.
- Remove an unused WPF namespace import from the configuration factory.

</details>

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

## Summary by Sourcery

通过切换为基于信号量的保护机制来统一配置保存时的加锁方式,并将其一致地应用于同步保存和发布时(release-time)的保存。

Bug Fixes:
- 通过使用与其他地方相同的信号量来保护同步保存操作,防止配置保存时的竞态条件。

Enhancements:
- 优化配置保存逻辑,在使用信号量时采用 try/catch/finally 结构,并将保存成功或失败的日志记录逻辑集中化。
- 从配置工厂中移除未使用的 WPF 命名空间引用。

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

## Summary by Sourcery

Unify configuration save locking by switching to semaphore-based
protection and apply it consistently to synchronous and release-time
saves.

Bug Fixes:
- Prevent configuration save race conditions by guarding synchronous
saves with the same semaphore used elsewhere.

Enhancements:
- Refine configuration save logic to use try/catch/finally around
semaphore usage and centralize logging of save success or failure.
- Remove an unused WPF namespace import from the configuration factory.

</details>

</details>

</details>
2026-06-09 23:42:47 +08:00
Rin
0b3f97dea9 fix: 增加贸易站订单切换重试和产物确认逻辑 (#16954) 2026-06-09 11:25:39 +08:00
github-actions[bot]
605b1518b4 chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27168308205
[skip changelog]
alpha/v6.12.0-beta.1.d001.g605b1518b4
2026-06-08 21:34:20 +00:00