Commit Graph

19323 Commits

Author SHA1 Message Date
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
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
uye
f3e4313e3a Release v6.12.0-beta.1 (#17029)
## Summary by Sourcery

更新 copilot、paradox 和任务处理逻辑,以跟踪每个 copilot 的独立 ID、改进阶段导航和 OCR
的稳健性,并通过强类型事件将子任务消息接入 WPF UI,同时为更多任务添加截图插件并改进工具和文档。

New Features:
- 在核心任务和 WPF 模型中支持按 copilot 区分的 ID,以更好地跟踪和操作特定的 copilot 条目。
- 在 WPF 层将子任务消息暴露为强类型事件,并在相关的设置视图模型中进行消费。
- 为 copilot 条目新增独立的视频 URL 字段和存在标记,而不是复用 copilot URL 字段。

Bug Fixes:
- 修复在缺少提交作者或使用 web-flow 时的变更日志生成问题,通过在 PR 或提交中解析作者登录名来解决。
- 通过使用双精度累积来提高掩码模板匹配的数值稳定性,以避免灾难性消除。
- 修正模拟器自动启动逻辑,并在测试模拟器路径时增加校验。

Enhancements:
- 重构 copilot 阶段导航,使用图像分析和 OCR 更可靠地定位和确认阶段,包括重试和对图表的处理。
- 在子任务的额外信息消息中包含 copilot ID,使 UI 能将结果与选中的条目进行关联。
- 为奖励、商店、仓库、战斗启动、基建开始和干员仓库进入等任务添加截图采集插件,以获得更好的诊断能力。
- 通过用事件机制替换静态分发器来简化任务子消息的传播。
- 对文档中的 copilot 协议命名进行轻微措辞调整,并更新若干资源和本地化内容。

Documentation:
- 在主 README 和中文 README 中将 copilot 协议描述由「自动抄作业协议」重命名为「自动战斗协议」。

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

## Summary by Sourcery

Update copilot, paradox, and task handling to track per-copilot IDs,
improve stage navigation and OCR robustness, and wire subtask messages
into the WPF UI via strongly typed events, while adding screenshot
plugins to more tasks and refining tooling and docs.

New Features:
- Support per-copilot IDs through core tasks and WPF models to better
track and act on specific copilot entries.
- Expose subtask messages as strongly typed events in the WPF layer and
consume them from relevant settings view models.
- Add a dedicated video URL field and presence flag for copilot entries
instead of overloading the copilot URL.

Bug Fixes:
- Fix changelog generation when commit authors are missing or web-flow
by resolving author logins via PRs or commits.
- Improve masked template matching numerical stability by using double
precision accumulation to avoid catastrophic cancellation.
- Correct emulator auto-start logic and add validation around testing
the emulator path.

Enhancements:
- Rework copilot stage navigation to use image analysis and OCR to
locate and confirm stages more reliably, including retries and plot
handling.
- Include copilot IDs in subtask extra info messages so the UI can
correlate results with selected items.
- Add screenshot capture plugins to award, mall, depot, fight startup,
infrastructure begin, and operator box enter tasks for better
diagnostics.
- Simplify task submessage propagation by replacing the static
dispatcher with an event-based mechanism.
- Minor wording updates in documentation for the copilot protocol naming
and various resource and localization updates.

Documentation:
- Rename the copilot protocol description from "自动抄作业协议" to "自动战斗协议" in
the main and Chinese READMEs.

</details>
v6.12.0-beta.1
2026-06-09 02:53:37 +08:00
uye
12f481706e docs: changelog 2026-06-09 02:43:48 +08:00
uye
07c923c894 docs: changelog 2026-06-09 02:32:50 +08:00
uye
204c9498ac fix: 错误隐藏开局分队与开局干员选项 2026-06-09 02:32:50 +08:00
Status102
f3df45bac4 feat: 理智药使用增加使用中的药品信息 (#17034)
- close #17032
@MaaAssistantArknights/i18n-dev 

## Summary by Sourcery

为理智药剂使用添加详细的报告和 UI 处理,包括按药剂的使用信息,并重构处理该子任务消息的位置。

新特性:
- 在理智药剂使用的 `SubTaskExtraInfo` 消息中加入按药剂的使用详情,并在任务队列日志中展示这些信息。

增强:
- 将药剂使用子任务的处理从 `AsstProxy` 移动到
`FightSettingsUserControlModel`,并扩展以展示当前使用的药剂信息,同时保留成就追踪功能。

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

## Summary by Sourcery

Add detailed reporting and UI handling for sanity medicine usage,
including per-medicine information, and refactor where this subtask
message is processed.

New Features:
- Include per-medicine usage details in SubTaskExtraInfo messages for
sanity medicine usage and surface them in the task queue logs.

Enhancements:
- Move medicine usage subtask handling from AsstProxy into
FightSettingsUserControlModel and extend it to show currently used
medicine information while preserving achievement tracking.

</details>
2026-06-09 02:05:32 +08:00
uye
80aa69e710 docs: changelog 2026-06-09 02:04:19 +08:00
status102
9b951cbabf perf: 优化部分情况下自动战斗导航OCR结果中会出现误识别的前缀 2026-06-09 01:54:04 +08:00
uye
edeaeeba49 feat: 支持 mumu 6.0 截图增强路径 (#16994)
* feat: 支持 mumu 6.0 截图增强路径

* chore: Update src/MaaCore/Controller/MumuExtras.cpp

Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>

* fix: 示例路径

---------

Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
2026-06-09 01:52:02 +08:00
status102
5fd74495a2 chore: rename Wpf ProcSubTaskMsg param name 2026-06-09 01:29:52 +08:00
status102
48f98ad413 perf(wpf): DEBUG 环境下Init时TaskQueue状态限制缓解 2026-06-09 01:29:52 +08:00
github-actions[bot]
ee6d2c9867 feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27154116231
[skip changelog]
2026-06-08 17:08:54 +00:00
github-actions[bot]
348825ef33 chore: Auto Update Game Resources - 2026-06-08
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27142132661

[skip changelog]
2026-06-08 13:49:39 +00:00
Constrat
0ade8f5c7c chore: revert all changes to remainingcandleflame IS6 EN 2026-06-08 13:44:13 +02:00
MistEO
b18068c846 ci: user MistEO/codex bot (#17040) 2026-06-08 18:16:04 +08:00
Constrat
5ae734461e fix: EN IS6 bosky updated template 2026-06-08 01:06:58 +02:00
status102
e4c6a740c4 perf 2026-06-07 19:55:09 +08:00
Constrat
b281f258cd fix: EN IS6 bosky text size changed alpha/v6.11.2-alpha.1.d036.gb281f258cd 2026-06-07 12:59:39 +02:00
status102
b488aca991 perf: 2026-06-07 18:12:49 +08:00
status102
85ed1fb38b perf: null check 2026-06-07 18:08:35 +08:00
status102
8e3bfe3783 i18n: ai trans 2026-06-07 18:07:41 +08:00
status102
6e1f9e0fce feat: 理智药使用增加使用中的药品信息 2026-06-07 18:03:17 +08:00
HX3N
b461960985 chore: YostarKR winden colorScale for compatibility 2026-06-07 13:38:37 +09:00
github-actions[bot]
2a8c952b24 feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27075305432
[skip changelog]
alpha/v6.11.2-alpha.1.d034.g2a8c952b24
2026-06-06 22:12:57 +00:00
Status102
353c0ec972 fix: 修正特克诺干员名 OCR 误识别 (#17030)
## 问题与修复
issue 日志中,排序重选阶段 OCR 将“特克诺”识别为“持克诺”,导致后续按精确干员名匹配时无法命中。
在全局干员名 OCR 替换表中加入规则,仅将完整识别结果“持克诺”替换为“特克诺”。

```
15912:[2026-06-06 11:07:15.290][TRC][Px20248][Tx37564] asst::WordOcr [{ text: 褐果, rect: [ 0 (80), 0 (1), 40, 19 ], score: 0.999965 }] by OCR Rec , cost 16 ms
15913:[2026-06-06 11:07:15.290][TRC][Px20248][Tx37564] Proceed [{ text: 褐果, rect: [ 80, 1, 40, 19 ], score: 0.999965 }]
15914:[2026-06-06 11:07:15.290][WRN][Px20248][Tx37564] asst::VisionHelper::correct_rect roi is empty, use whole image
15915:[2026-06-06 11:07:15.307][TRC][Px20248][Tx37564] asst::WordOcr [{ text: 持克诺, rect: [ 0 (60), 0 (1), 60, 19 ], score: 0.881702 }] by OCR Rec , cost 16 ms
15916:[2026-06-06 11:07:15.307][TRC][Px20248][Tx37564] Proceed [{ text: 持克诺, rect: [ 60, 1, 60, 19 ], score: 0.881702 }]
15917:[2026-06-06 11:07:15.307][WRN][Px20248][Tx37564] asst::VisionHelper::correct_rect roi is empty, use whole image
15918:[2026-06-06 11:07:15.354][TRC][Px20248][Tx37564] asst::WordOcr [{ text: 凯尔希思衡托, rect: [ 0 (6), 0 (2), 114, 16 ], score: 0.992512 }] by OCR Rec , cost 45 ms
15919:[2026-06-06 11:07:15.354][TRC][Px20248][Tx37564] Proceed [{ text: 凯尔希·思衡托, rect: [ 6, 2, 114, 16 ], score: 0.992512 }]
```

fixes #17018

## Summary by Sourcery

错误修复:
- 通过在全局替换表中将误识别的“持克诺”映射为“特克诺”,纠正对运营商名称的 OCR 识别。

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

## Summary by Sourcery

Bug Fixes:
- Correct OCR recognition of the operator name by mapping the misread
form “持克诺” to “特克诺” in the global replacement table.

</details>
2026-06-07 03:26:53 +08:00
ZiyinLin
4e5a234ece fix: 修正特克诺干员名 OCR 误识别 2026-06-07 00:57:00 +08:00