Commit Graph

18848 Commits

Author SHA1 Message Date
github-actions[bot]
ef96d2828b chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/25522707840
[skip changelog]
alpha/v6.9.4-alpha.1.d004.gef96d2828b
2026-05-07 21:21:32 +00:00
uye
8a1ceafaa0 fix: 部分成就分期错误 2026-05-08 03:20:10 +08:00
HY
48e007035f chore: 繁中服界園肉鴿 DLC1 & sss 9 炭火安保派駐 (#16516)
* chore: 繁中服界園肉鴿 DLC1

* chore: sss9 保全派駐
2026-05-08 00:11:27 +08:00
HY
38c5e74404 chore: 繁中服「界園」主題與「齊聚」主題 (#16515) 2026-05-08 00:10:50 +08:00
Status102
77d6ac7118 Release v6.9.3 (#16513)
趁着没新feat赶紧发先

## Summary by Sourcery

为 UI 和版本显示实现一个伪更新流程,加强更新应用和视觉匹配的健壮性,并在构建和资源更新的同时,调整战斗和信用战任务的行为。

New Features:
- 添加 `FakeUpdateHelper`,并将伪更新模式集成到版本显示、更新对话框和窗口标题中,以在不需要实际发布的情况下模拟更新。

Bug Fixes:
- 在委托应用挂起更新时处理缺失的外部更新器可执行文件,并弹出清晰的错误对话框,而不是让安装停留在错误状态。
- 通过在没有捕获发生时正确重置运行状态,修复小游戏的终止流程。
- 当未配置 ROI 时提前返回,防止视觉分析器中的崩溃或无效处理。
- 当默认窗口标题配置被保留时,避免解锁标题自定义成就。
- 调整信用战的停止条件及其相应的 GUI 处理,使其依赖更新后的 copilots 任务管线,而不是旧的动作结束任务。

Enhancements:
- 使用带重试和实时图像刷新的 `PipelineAnalyzer` 改进战斗阵型验证,使阵型检查更加稳健。
- 通过始终从解压内容中准备更新器可执行文件并记录缺失更新器的场景,优化挂起更新的委托处理。
- 更新基础设施布局、全局版本元数据、任务以及本地化资源,以支持新版本发布。

Build:
- 增强本地安装脚本,通过临时 `global.json` 固定本地 .NET SDK, 在 `dotnet publish` 之前运行
`dotnet restore`,并在之后清理临时的 SDK 固定配置。

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

## Summary by Sourcery

Implement a fake update flow for UI and version display, harden update
application and vision matching, and adjust battle and credit fight task
behaviors alongside build and resource updates.

New Features:
- Add a FakeUpdateHelper and integrate a fake update mode into version
display, update dialogs, and window title to simulate updates without
requiring real releases.

Bug Fixes:
- Handle missing external updater executables during delegated pending
update application and surface clear error dialogs instead of leaving
installs in a bad state.
- Fix mini-game termination flow by correctly resetting running state
when no catch occurs.
- Prevent crashes or invalid processing in vision analyzers by
early-returning when no ROI is configured.
- Avoid unlocking the title customization achievement when the default
window title configuration is preserved.
- Adjust credit fight stop conditions and corresponding GUI handling to
rely on the updated copilot task pipeline instead of the old
end-of-action task.

Enhancements:
- Improve battle formation validation by using PipelineAnalyzer with
retries and live image refresh, making formation checks more robust.
- Refine pending update delegation by always preparing the updater
executable from extracted content and logging missing-updater scenarios.
- Update infrastructure layouts, global version metadata, tasks, and
localization resources for the new release.

Build:
- Enhance the local-install script to pin a local .NET SDK via a
temporary global.json, run dotnet restore before publish, and clean up
the temporary SDK pin afterwards.

</details>
v6.9.3
2026-05-07 20:00:48 +08:00
uye
d63e6d5d8d docs: Update CHANGELOG for version 6.9.3
Updated changelog for version 6.9.3 with new features, improvements, and fixes.
2026-05-07 19:58:11 +08:00
status102
5b8ae926c2 fix: Analyzer执行前未检查m_roi是否未空 2026-05-07 19:34:21 +08:00
github-actions[bot]
8289328484 chore: Auto Update Game Resources - 2026-05-07
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/25492702308

[skip changelog]
2026-05-07 11:22:20 +00:00
uye
b117ace40e fix: 修复小游戏界面的开始按钮在连接模拟器失败时仍然发送开始信号 2026-05-07 18:53:03 +08:00
github-actions[bot]
54e9bc97b9 chore: Auto Update Game Resources - 2026-05-06
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/25456822699

[skip changelog]
alpha/v6.9.3-alpha.1.d016.g54e9bc97b9
2026-05-06 19:36:55 +00:00
uye
112b242020 feat: 优先使用更新包中的 updater 2026-05-06 21:51:15 +08:00
uye
792214af34 feat: 添加因为缺少 MAA.Updater.exe 导致更新失败的弹窗提示 2026-05-06 21:33:58 +08:00
github-actions[bot]
5295f63a27 chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/25402988047
[skip changelog]
alpha/v6.9.3-alpha.1.d013.g5295f63a27
2026-05-05 21:23:27 +00:00
status102
728f9ca077 fix: 自动战斗进入等待过长
#16391
2026-05-06 03:16:23 +08:00
status102
22f3175b42 fix: OF-1战斗后等待过长导致部分后续流程失败
#16444
2026-05-06 02:15:22 +08:00
status102
4bc96d57da perf: 自动战斗结束增加LoadingIcon等待项 2026-05-06 02:15:22 +08:00
uye
1d60c2363b chore: 调整 global.json 文件创建时机
[skip changelog]
2026-05-06 00:37:18 +08:00
uye
be568fbc1e perf: 优化进度显示
[skip changelog]
2026-05-06 00:28:24 +08:00
uye
505c8e9d10 fix: 修复部分成就判断条件错误 2026-05-06 00:04:17 +08:00
uye
26972c2769 chore: local-install 使用 ci 同款处理方法 2026-05-05 23:55:24 +08:00
Manicsteiner
3c88f16dde docs: update JP preview image (#16485) 2026-05-05 23:46:22 +08:00
uye
70235d7fd5 feat: fake update
[skip changelog]
2026-05-05 23:34:59 +08:00
github-actions[bot]
b38e1b46ba chore: Auto Templates Optimization
Triggered by 4083e21521

[skip changelog]
2026-05-05 12:58:42 +00:00
uye
4083e21521 docs: 更新 README 预览图片 2026-05-05 20:57:45 +08:00
uye
1d909ea38a feat: 更新 153-4 基建作业 2026-05-05 18:37:35 +08:00
Status102
e5365c1447 Release v6.9.2 (#16473)
## Summary by Sourcery

为 v6.9.2 版本发布做准备,更新文档、CI 中的 .NET SDK 配置,并修复运行时任务行为。

增强功能:
- 调整启动和阶段导航任务流程,包括处理特定的“annihilation”(歼灭/剿灭)场景,并改进账号切换日志记录。
- 整理 AutoRecruitTask 中 `recruit_result` 枚举的格式,使其更加一致。

CI:
- 配置 CI 工作流使用生成的 `global.json` 来锁定 .NET SDK 版本,而不是在配置中硬编码版本。

文档:
- 在中文手册中新增 FAQ 条目,描述 DLL 注入问题及其缓解步骤。

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

## Summary by Sourcery

Prepare v6.9.2 release by updating documentation, CI .NET SDK
configuration, and fixing runtime task behaviors.

Enhancements:
- Adjust startup and stage navigation task flows, including handling
specific annihilation scenarios and improving account switch logging.
- Tidy AutoRecruitTask recruit_result enumeration formatting for
consistency.

CI:
- Configure CI workflows to use a generated global.json to pin the .NET
SDK version instead of hardcoding it.

Documentation:
- Add FAQ entry describing DLL injection issues and mitigation steps in
the Chinese manual.

</details>
v6.9.2
2026-05-05 14:47:10 +08:00
github-actions[bot]
4e35863be0 docs: Auto Update Changelogs of v6.9.2 (#16474)
* docs: Auto Generate Changelog of Release v6.9.2

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Status102 <102887808+status102@users.noreply.github.com>
2026-05-05 14:46:59 +08:00
ocsin1
9d5ab6d7c5 docs: 添加 DLL 注入问题解决方案并优化 FAQ 描述 (#16404)
* docs: 添加 DLL 注入问题解决方案并优化 FAQ 描述

* docs: 大小写和 pangu

修正了 MAA 启动时 DLL 注入问题的描述,更新了链接格式。

^以上 Commit Message 是 Copilot 帮我写的

---------

Co-authored-by: Rbqwow <55343783+Rbqwow@users.noreply.github.com>
2026-05-05 09:52:39 +08:00
github-actions[bot]
469c1e670c chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/25344285069
[skip changelog]
alpha/v6.9.2-alpha.1.d004.g469c1e670c
2026-05-04 21:25:03 +00:00
status102
c4c15ef103 rft: 剿灭入口检测支持代理卡耗尽情况 2026-05-05 05:01:59 +08:00
status102
3c20e21182 ci: 限定.Net SDK为10.0.203 2026-05-05 04:03:08 +08:00
status102
9a2d43ca7e fix: 开始唤醒流程 2026-05-05 03:27:45 +08:00
uye
f831d19c57 Release v6.9.1 (#16433)
## Summary by Sourcery

强化安装/更新安全检查,改进更新包处理和确认流程,优化自动公招、药剂使用、肉鸽以及副驾驶行为,并更新构建工具链与集成文档。

New Features:
- 为完整更新包新增手动确认流程,包括显示计划执行路径,并可复用用于本地丢弃包的检查结果。
- 为需要基于包名执行 ADB 命令的连接引入按实例配置的客户端类型选项。

Bug Fixes:
- 防止从不受支持的安装位置运行或更新,例如磁盘根目录、临时文件夹、Windows 和常见程序目录。
- 修复自动公招循环逻辑,不再统计或重试被跳过的槽位,并区分已确认、已跳过和失败的招募尝试。
- 修正药剂计数日志记录、理智 OCR 处理,以及对不过期药剂的优先级逻辑。
- 修复肉鸽支援干员计时器解析和投资上限比较逻辑。
- 确保精英等级分析在检测失败时回退到精英 0,并在视野矩形校正中防范空 ROI。
- 调整启动任务顺序,使账号切换只在启动成功后执行。
- 在使用附加的 PC 客户端窗口时跳过外部报告上传,并通过连接配置对某些依赖客户端类型的命令加以限制。
- 修复 Foldartal 获取中对 foldartal 类型过滤条件的问题,以及像素分析器灰度上限设置器。

Enhancements:
- 允许通过可复用的检查结果对本地完整更新包进行检查和注册,并在完整更新过程中保留额外的资源目录。
- 改进 WPF GUI 中与战斗相关的日志与命名一致性(理智/战斗报告、即将过期药剂日志、客户端类型处理)。
- 提高副驾驶与多副驾驶导航和停止任务的稳定性,加入新的“等待动作结束”行为,并增加重试次数。

Build:
- 增强本地安装脚本,支持并行构建、.NET 发布选项、通过 nbeauty2 进行资源补丁处理以及更好的错误处理。

CI:
- 更新资源更新工作流,以使用最新版本的 wait-for-jobs action。

Documentation:
- 在所有支持的语言的集成协议文档中记录新的 ClientType 实例选项。

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

## Summary by Sourcery

Harden installation/update safety checks, improve update package
handling and confirmations, refine auto-recruit, medicine usage,
roguelike, and copilot behaviors, and update build tooling and
integration docs.

New Features:
- Add manual confirmation flow for full update packages, including
planned path display and reuse for dropped local packages.
- Introduce per-instance client type option for connections that need
package-name-aware ADB commands.

Bug Fixes:
- Prevent running or updating from unsupported install locations such as
drive roots, temp folders, Windows and common program directories.
- Fix auto-recruit loop to not count or retry skipped slots and
distinguish confirmed, skipped, and failed recruit attempts.
- Correct medicine counter logging, sanity OCR handling, and
non-expiring medicine prioritization logic.
- Fix roguelike support recruit timer parsing and investment limit
comparison logic.
- Ensure elite level analysis falls back to elite 0 when detection
fails, and guard against empty ROIs in vision rect correction.
- Adjust startup task sequencing so account switching runs only after
startup succeeds.
- Skip external report uploads when using attached PC client windows,
and gate certain client-type-dependent commands by connection config.
- Fix Foldartal gain foldartal-type filtering condition and pixel
analyzer gray upper bound setter.

Enhancements:
- Allow local full update packages to be inspected and registered via a
reusable inspection result, and preserve additional asset directories
during full updates.
- Improve fight-related logging and naming consistency in the WPF GUI
(sanity/fight reports, expiring medicine logs, client type handling).
- Increase robustness of copilot and multi-copilot navigation and stop
tasks with new wait-until-end-of-action behavior and higher retry
counts.

Build:
- Enhance local-install script with parallel builds, .NET publish
options, resource patching via nbeauty2, and better error handling.

CI:
- Update resource update workflow to use the latest version of the
wait-for-jobs action.

Documentation:
- Document the new ClientType instance option in integration protocol
docs for all supported languages.

</details>

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

## Summary by Sourcery

强化安装/更新安全检查,改进更新包处理和确认流程,优化自动公招、药剂使用、肉鸽以及副驾驶行为,并更新构建工具链与集成文档。

New Features:
- 为完整更新包新增手动确认流程,包括显示计划执行路径,并可复用用于本地丢弃包的检查结果。
- 为需要基于包名执行 ADB 命令的连接引入按实例配置的客户端类型选项。

Bug Fixes:
- 防止从不受支持的安装位置运行或更新,例如磁盘根目录、临时文件夹、Windows 和常见程序目录。
- 修复自动公招循环逻辑,不再统计或重试被跳过的槽位,并区分已确认、已跳过和失败的招募尝试。
- 修正药剂计数日志记录、理智 OCR 处理,以及对不过期药剂的优先级逻辑。
- 修复肉鸽支援干员计时器解析和投资上限比较逻辑。
- 确保精英等级分析在检测失败时回退到精英 0,并在视野矩形校正中防范空 ROI。
- 调整启动任务顺序,使账号切换只在启动成功后执行。
- 在使用附加的 PC 客户端窗口时跳过外部报告上传,并通过连接配置对某些依赖客户端类型的命令加以限制。
- 修复 Foldartal 获取中对 foldartal 类型过滤条件的问题,以及像素分析器灰度上限设置器。

Enhancements:
- 允许通过可复用的检查结果对本地完整更新包进行检查和注册,并在完整更新过程中保留额外的资源目录。
- 改进 WPF GUI 中与战斗相关的日志与命名一致性(理智/战斗报告、即将过期药剂日志、客户端类型处理)。
- 提高副驾驶与多副驾驶导航和停止任务的稳定性,加入新的“等待动作结束”行为,并增加重试次数。

Build:
- 增强本地安装脚本,支持并行构建、.NET 发布选项、通过 nbeauty2 进行资源补丁处理以及更好的错误处理。

CI:
- 更新资源更新工作流,以使用最新版本的 wait-for-jobs action。

Documentation:
- 在所有支持的语言的集成协议文档中记录新的 ClientType 实例选项。

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

## Summary by Sourcery

Harden installation/update safety checks, improve update package
handling and confirmations, refine auto-recruit, medicine usage,
roguelike, and copilot behaviors, and update build tooling and
integration docs.

New Features:
- Add manual confirmation flow for full update packages, including
planned path display and reuse for dropped local packages.
- Introduce per-instance client type option for connections that need
package-name-aware ADB commands.

Bug Fixes:
- Prevent running or updating from unsupported install locations such as
drive roots, temp folders, Windows and common program directories.
- Fix auto-recruit loop to not count or retry skipped slots and
distinguish confirmed, skipped, and failed recruit attempts.
- Correct medicine counter logging, sanity OCR handling, and
non-expiring medicine prioritization logic.
- Fix roguelike support recruit timer parsing and investment limit
comparison logic.
- Ensure elite level analysis falls back to elite 0 when detection
fails, and guard against empty ROIs in vision rect correction.
- Adjust startup task sequencing so account switching runs only after
startup succeeds.
- Skip external report uploads when using attached PC client windows,
and gate certain client-type-dependent commands by connection config.
- Fix Foldartal gain foldartal-type filtering condition and pixel
analyzer gray upper bound setter.

Enhancements:
- Allow local full update packages to be inspected and registered via a
reusable inspection result, and preserve additional asset directories
during full updates.
- Improve fight-related logging and naming consistency in the WPF GUI
(sanity/fight reports, expiring medicine logs, client type handling).
- Increase robustness of copilot and multi-copilot navigation and stop
tasks with new wait-until-end-of-action behavior and higher retry
counts.

Build:
- Enhance local-install script with parallel builds, .NET publish
options, resource patching via nbeauty2, and better error handling.

CI:
- Update resource update workflow to use the latest version of the
wait-for-jobs action.

Documentation:
- Document the new ClientType instance option in integration protocol
docs for all supported languages.

</details>

</details>
v6.9.1
2026-05-05 02:16:43 +08:00
github-actions[bot]
d345466992 docs: Auto Update Changelogs of v6.9.1 (#16434)
* docs: Auto Generate Changelog of Release v6.9.1

* docs: Update CHANGELOG for versions 6.9.0 and 6.9.1

Add detailed highlights and improvements for version 6.9.1 and 6.9.0, including new features, fixes, and documentation updates.

* docs: Remove version 6.9.0 entry from CHANGELOG

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2026-05-05 02:15:26 +08:00
status102
4dc9a4ed27 chore: rename 2026-05-05 01:52:13 +08:00
Status102
736bab5427 rft: 重构战斗失败识别, 顺带支持沙盘战斗结束 (#16449) 2026-05-05 01:51:02 +08:00
status102
a8ceb64f16 fix: 理智药识别支持3位数库存 2026-05-05 01:49:52 +08:00
github-actions[bot]
3d4a3eb578 chore: Auto Update Game Resources - 2026-05-04
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/25333746690

[skip changelog]
2026-05-04 17:40:48 +00:00
status102
38494fa461 perf: 给WSA也加个 2026-05-05 01:31:16 +08:00
status102
e3570d17e8 fix(wpf): 仅在应用宝连接时额外指定InstanceOption级的ClientType 2026-05-05 01:27:40 +08:00
uye
4c9c1d12ce feat: 增加使用完整包更新时的强制提示,安装在根目录时禁止启动与更新 (#16435)
* feat: 增加使用完整包更新时的强制提示

* feat: 安装在根目录时阻止启动与更新

* feat: 更新检测排除 achievement 与 background

* perf: 优化日志记录,优化根目录判断逻辑

* feat: 禁止在部分特殊目录的根目录启动

* chore: warning

* perf: 优化本地安装脚本

* perf: 优化 temp 文件夹检测
2026-05-05 01:03:33 +08:00
Roland125
a0588e7da6 fix: 绿票商店稳定性提升 (#16369)
fix: 添加1层ocr识别失败时备用逻辑
fix:2层只购买公招券和单抽券
2026-05-05 01:01:56 +08:00
uye
0404959bd1 fix: 调整信用商店识别区域,修复 4 位数信用识别问题
close #16395

Co-authored-by: ZiyinLin <xuanbing1464129430@gmail.com>
2026-05-05 00:55:52 +08:00
status102
a387d5f8a4 perf: 自动编队Elite 图标匹配失败时认为elite = 0 2026-05-04 23:25:09 +08:00
uye
d913335886 fix: 编队时无精英化的干员练度会被当成 <-1, -1>
fix: #16464
2026-05-04 23:07:38 +08:00
Roland125
08f71fcfc0 fix: 修改recruit_one的返回值,适配更精细的招募计数(#16355) (#16371) 2026-05-04 22:53:04 +08:00
uye
cac4c27bbc feat: pc 跳过数据上报 2026-05-04 20:40:02 +08:00
status102
3ef75d587c chore: remove debug code 2026-05-04 20:19:20 +08:00
Roland125
4a14245283 fix: 修复剿灭结算时,识别不到合成玉基线 (#16460)
<img width="508" height="175" alt="FABI(C}_VIB}7@N5KI51H R"
src="https://github.com/user-attachments/assets/1bb987c5-d0cc-41cd-92da-d31045490028"
/>
这是报告者的掉落图

<img width="630" height="166" alt="628X1BM7GI6$8 4(T%2}Q$0"
src="https://github.com/user-attachments/assets/8ecc8d6d-f44b-4540-93bd-8b73ef18f854"
/>
这是我本机的掉落图

明显看得出我本机的图,报酬二字上方那根线亮一些。

由于在我本机无法复现识别BUG,所以我只能用理论计算值来推断一个阈值。

根据反馈者的图提取出来的RGB值,算法计算出来的灰度是38.7(左)/44(右)。

均低于45的阈值,所以不可能有100像素长的线,于是合成玉基线被过滤掉了。

识别不到基线就不会识别对应的掉落物,就会触发无合成玉掉落导致的退出。

## Summary by Sourcery

将针对湮灭阶段的可选掉落识别处理置于仅调试用的宏之后进行控制,并在启用时将其接入自定义任务。

Enhancements:
- 当启用调试宏时,允许 `StageDropsTaskPlugin` 响应通用的动作结束任务。
- 在 `CustomTask` 中启用可选的 `StageDropsTaskPlugin` 注册,用于调试掉落识别问题。

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

## Summary by Sourcery

Gate optional drop-recognition handling for annihilation stages behind a
debug-only macro and wire it into custom tasks when enabled.

Enhancements:
- Allow StageDropsTaskPlugin to respond to generic end-of-action tasks
when a debug macro is enabled.
- Enable optional registration of StageDropsTaskPlugin in CustomTask for
debugging drop recognition issues.

</details>
2026-05-04 19:35:35 +08:00
status102
b3122fbd94 fix: 肉鸽投资存款检测校验数据 2026-05-04 19:15:20 +08:00