Commit Graph

19240 Commits

Author SHA1 Message Date
github-actions[bot]
aff4e4d5db docs: Auto Generate Changelog of Release v6.11.1 2026-06-01 21:14:28 +00:00
uye
f3a2d90472 chore: 延长 TD-Open 延迟 2026-06-02 04:53:53 +08:00
uye
c533a44a9a chore: TDChapterToTD 添加重试 2026-06-02 04:48:47 +08:00
uye
6037746760 Release v6.11.0 (#16963)
## Sourcery 总结

更新宿舍干员选择、信用商店购买、账号切换和通知行为,并为 v6.11.0 版本新增协议、UI 和资源支持。

新功能(New Features):
- 在账号切换与启动配置中新增对 txwy(繁体中文)客户端的支持。
- 允许为外部 Webhook 通知配置自定义 HTTP 请求头。
- 支持使用基于文件的输入进行悖论模拟助手的批量识别。
- 为助手的“用户附加信息”弹出网格引入动态尺寸和对齐方式。

缺陷修复(Bug Fixes):
- 修复宿舍自动填充逻辑,更好地协调基于心情的选择、信赖刷取以及“未进驻”筛选条件,并增强筛选开关的稳定性。
- 通过使用 OCR 等价处理、保留物品名称以及在点击前校验商品,改进信用商店物品识别与购买流程,避免买错物品。
- 确保任务完成后的检查仅在任务队列由 link-start 启动时才执行。
- 修正信用商店售罄检测与白名单排序逻辑,使其能基于结构化的 TextRect 结果而非裸矩形数据工作。
- 修复悖论模拟助手的识别逻辑,使其正确读取和引用悖论配置文件,而不是干员名称。
- 解决外部通知自定义 Webhook 配置相关问题,通过安全持久化请求头并在请求中正确应用。
- 明确并修正针对更多客户端类型和 OCR 设置的账号切换行为。

增强优化(Enhancements):
- 将宿舍选择状态重构为更清晰的选择阶段,并为信赖阈值和设施标签抽取常量。
- 收紧基建任务中的筛选菜单交互,确保“未进驻”和“全部设施”筛选条件能稳定应用和取消。
- 优化信用商店购买逻辑,更好地遵守“仅折扣”和“信用预留”选项,并具有更清晰的停止条件。
- 打磨外部通知、战斗设置和启动设置的 ViewModel 与 XAML 绑定,实现更清晰的行为与格式。
- 更新变更日志生成器和依赖下载脚本,以改善格式并跟踪最新 MaaDeps 版本。

构建(Build):
- 在下载辅助脚本中将 MaaDeps 依赖版本提升至 v2.11.0。

文档(Documentation):
- 扩展多语言的集成与启动文档,加入对繁体中文(txwy)账号的使用指南以及账号名匹配示例。

杂项维护(Chores):
- 刷新多项游戏数据与任务 JSON 资源,包括最新关卡与记忆关卡的地块坐标定义、物品与关卡索引以及本地化资源。

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

## Summary by Sourcery

准备 v6.11.0 版本发布,本次更新包括:改进宿舍自动填充逻辑、更安全且更精准的信用点商店购买、扩展悖论模拟器批量识别、增强外部
Webhook 通知、支持 txwy(繁体中文)账号、更新工具链,以及刷新游戏数据/资源。

New Features:
- 在账号切换与启动配置中,新增对 txwy(繁体中文)游戏客户端的支持。
- 允许为外部 Webhook 通知配置自定义 HTTP 请求头,并在发送请求时应用这些请求头。
- 支持使用基于文件的输入而非干员名称进行悖论模拟批量识别。
- 为 UI 中 copilot 的“User additional information”弹出网格添加动态尺寸和对齐能力。
- 让 ImageCropper 工具在 ADB 设备之外,额外支持通过 Win32/WGC 捕获 PC 窗口。

Bug Fixes:
- 通过更好地协调基于心情的选择、信赖刷取以及“未进驻”筛选状态,稳定宿舍自动填充行为。
- 改进信用点商店物品检测和购买逻辑,避免购买错误物品,包括更健壮的 OCR 等价处理以及在购买前对单件物品进行校验。
- 确保战斗结束后的任务完成检查仅在通过 link-start 启动任务队列时才会运行。
- 修复信用点商店中已售罄检测和白名单排序,使其基于结构化的 TextRect 结果而非原始矩形进行处理。
- 修正悖论模拟器识别逻辑,改为读取悖论配置文件,而不是直接使用干员名称。
- 修复自定义 Webhook 通知设置的持久化与应用问题,包括请求头的安全存储和正确使用。
- 在更多客户端类型和 OCR 设置(包括 txwy)下,澄清并修正账号切换逻辑。

Enhancements:
- 将宿舍选择流程细化为更清晰的阶段(低心情、信赖自动填充、填满剩余),并强化对“未进驻”筛选和信赖阈值的处理。
- 收紧基建筛选菜单交互,使“未进驻”和“全部设施”筛选能稳定生效与清除。
- 优化信用点商店购买逻辑,更好地遵守“仅折扣”和“保留信用点”选项,并具有更清晰的停止条件。
- 打磨外部通知、战斗设置、启动和 copilot 视图的 ViewModel 与 XAML 绑定,以获得更可预期的行为和布局。
- 改进更新日志生成和依赖下载脚本,包括格式调整以及对最新 MaaDeps 版本的跟踪。

Build:
- 在辅助下载脚本中将 MaaDeps 依赖版本提升至 v2.11.0。
- 将 ImageCropper 的 Python 依赖更新为 MaaFw 5.10 和 OpenCV 4.13。

Documentation:
- 扩展多语言集成与启动文档,增加关于使用 txwy(繁体中文)账号以及登录名匹配的说明与示例。
- 更新 ImageCropper 使用文档,涵盖通过 WGC/Win32 捕获 PC 窗口及相关配置选项。

Chores:
- 刷新多项游戏数据和任务 JSON 资源,包括新关卡、记忆关卡、地块坐标、物品索引、关卡索引、UI
主题任务、肉鸽任务,以及最新内容的本地化资源。
- 更新所有已支持语言的协议与启动文档,说明 txwy 账号格式及相关使用建议。

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

## Summary by Sourcery

Prepare the v6.11.0 release with improved dormitory auto-fill logic,
safer and more accurate credit shop purchasing, expanded paradox
simulator batch recognition, enhanced external webhook notifications,
txwy (Traditional Chinese) account support, updated tooling, and
refreshed game data/resources.

New Features:
- Add support for the txwy (Traditional Chinese) game client in account
switching and startup configuration.
- Allow configuring custom HTTP headers for external webhook
notifications and apply them when sending requests.
- Support batch paradox simulation recognition using file-based inputs
instead of operator names.
- Add dynamic sizing and alignment for the copilot "User additional
information" popup grid in the UI.
- Enable the ImageCropper tool to capture PC windows via Win32/WGC in
addition to ADB devices.

Bug Fixes:
- Stabilize dormitory auto-fill behavior by better coordinating
mood-based selection, trust farming, and the "not stationed" filter
state.
- Improve credit shop item detection and purchasing to avoid buying
incorrect items, including more robust OCR equivalence handling and
per-item verification before purchase.
- Ensure post-battle task completion checks only run when the task queue
is started via link-start.
- Fix sold-out detection and whitelist sorting in the credit shop to
operate on structured TextRect results rather than raw rectangles.
- Correct paradox simulator recognition to read paradox configuration
files instead of using operator names directly.
- Fix persistence and application of custom webhook notification
settings, including secure storage and usage of request headers.
- Clarify and correct account switching logic across more client types
and OCR settings, including txwy.

Enhancements:
- Refine dormitory selection into clearer phases (low mood, trust
autofill, fill remaining) and tighten handling of "not stationed"
filtering and trust thresholds.
- Tighten infrastructure filter menu interactions so "not stationed" and
"all facilities" filters apply and clear reliably.
- Optimize credit shop buying logic to better respect discount-only and
credit-reserve options with clearer stopping conditions.
- Polish ViewModel and XAML bindings for external notifications, fight
settings, startup, and copilot views for more predictable behavior and
layout.
- Improve changelog generation and dependency download scripts,
including formatting tweaks and tracking the latest MaaDeps version.

Build:
- Bump MaaDeps dependency version to v2.11.0 in the helper download
script.
- Update ImageCropper Python dependencies to MaaFw 5.10 and OpenCV 4.13.

Documentation:
- Extend multi-language integration and startup documentation with
guidance and examples for using txwy (Traditional Chinese) accounts and
login-name matching.
- Update ImageCropper usage docs to cover PC window capture via
WGC/Win32 and related configuration options.

Chores:
- Refresh multiple game data and task JSON resources, including new
stages, memory stages, tile coordinates, item indices, stage indices, UI
theme tasks, roguelike tasks, and localization resources for the latest
content.
- Update protocol and startup documentation across all supported
languages to describe txwy account formats and recommendations.

</details>

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

## Summary by Sourcery

准备 v6.11.0 版本发布,本次更新包括:改进宿舍自动填充逻辑、更安全且更精准的信用点商店购买、扩展悖论模拟器批量识别、增强外部
Webhook 通知、支持 txwy(繁体中文)账号、更新工具链,以及刷新游戏数据/资源。

New Features:
- 在账号切换与启动配置中,新增对 txwy(繁体中文)游戏客户端的支持。
- 允许为外部 Webhook 通知配置自定义 HTTP 请求头,并在发送请求时应用这些请求头。
- 支持使用基于文件的输入而非干员名称进行悖论模拟批量识别。
- 为 UI 中 copilot 的“User additional information”弹出网格添加动态尺寸和对齐能力。
- 让 ImageCropper 工具在 ADB 设备之外,额外支持通过 Win32/WGC 捕获 PC 窗口。

Bug Fixes:
- 通过更好地协调基于心情的选择、信赖刷取以及“未进驻”筛选状态,稳定宿舍自动填充行为。
- 改进信用点商店物品检测和购买逻辑,避免购买错误物品,包括更健壮的 OCR 等价处理以及在购买前对单件物品进行校验。
- 确保战斗结束后的任务完成检查仅在通过 link-start 启动任务队列时才会运行。
- 修复信用点商店中已售罄检测和白名单排序,使其基于结构化的 TextRect 结果而非原始矩形进行处理。
- 修正悖论模拟器识别逻辑,改为读取悖论配置文件,而不是直接使用干员名称。
- 修复自定义 Webhook 通知设置的持久化与应用问题,包括请求头的安全存储和正确使用。
- 在更多客户端类型和 OCR 设置(包括 txwy)下,澄清并修正账号切换逻辑。

Enhancements:
- 将宿舍选择流程细化为更清晰的阶段(低心情、信赖自动填充、填满剩余),并强化对“未进驻”筛选和信赖阈值的处理。
- 收紧基建筛选菜单交互,使“未进驻”和“全部设施”筛选能稳定生效与清除。
- 优化信用点商店购买逻辑,更好地遵守“仅折扣”和“保留信用点”选项,并具有更清晰的停止条件。
- 打磨外部通知、战斗设置、启动和 copilot 视图的 ViewModel 与 XAML 绑定,以获得更可预期的行为和布局。
- 改进更新日志生成和依赖下载脚本,包括格式调整以及对最新 MaaDeps 版本的跟踪。

Build:
- 在辅助下载脚本中将 MaaDeps 依赖版本提升至 v2.11.0。
- 将 ImageCropper 的 Python 依赖更新为 MaaFw 5.10 和 OpenCV 4.13。

Documentation:
- 扩展多语言集成与启动文档,增加关于使用 txwy(繁体中文)账号以及登录名匹配的说明与示例。
- 更新 ImageCropper 使用文档,涵盖通过 WGC/Win32 捕获 PC 窗口及相关配置选项。

Chores:
- 刷新多项游戏数据和任务 JSON 资源,包括新关卡、记忆关卡、地块坐标、物品索引、关卡索引、UI
主题任务、肉鸽任务,以及最新内容的本地化资源。
- 更新所有已支持语言的协议与启动文档,说明 txwy 账号格式及相关使用建议。

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

## Summary by Sourcery

Prepare the v6.11.0 release with improved dormitory auto-fill logic,
safer and more accurate credit shop purchasing, expanded paradox
simulator batch recognition, enhanced external webhook notifications,
txwy (Traditional Chinese) account support, updated tooling, and
refreshed game data/resources.

New Features:
- Add support for the txwy (Traditional Chinese) game client in account
switching and startup configuration.
- Allow configuring custom HTTP headers for external webhook
notifications and apply them when sending requests.
- Support batch paradox simulation recognition using file-based inputs
instead of operator names.
- Add dynamic sizing and alignment for the copilot "User additional
information" popup grid in the UI.
- Enable the ImageCropper tool to capture PC windows via Win32/WGC in
addition to ADB devices.

Bug Fixes:
- Stabilize dormitory auto-fill behavior by better coordinating
mood-based selection, trust farming, and the "not stationed" filter
state.
- Improve credit shop item detection and purchasing to avoid buying
incorrect items, including more robust OCR equivalence handling and
per-item verification before purchase.
- Ensure post-battle task completion checks only run when the task queue
is started via link-start.
- Fix sold-out detection and whitelist sorting in the credit shop to
operate on structured TextRect results rather than raw rectangles.
- Correct paradox simulator recognition to read paradox configuration
files instead of using operator names directly.
- Fix persistence and application of custom webhook notification
settings, including secure storage and usage of request headers.
- Clarify and correct account switching logic across more client types
and OCR settings, including txwy.

Enhancements:
- Refine dormitory selection into clearer phases (low mood, trust
autofill, fill remaining) and tighten handling of "not stationed"
filtering and trust thresholds.
- Tighten infrastructure filter menu interactions so "not stationed" and
"all facilities" filters apply and clear reliably.
- Optimize credit shop buying logic to better respect discount-only and
credit-reserve options with clearer stopping conditions.
- Polish ViewModel and XAML bindings for external notifications, fight
settings, startup, and copilot views for more predictable behavior and
layout.
- Improve changelog generation and dependency download scripts,
including formatting tweaks and tracking the latest MaaDeps version.

Build:
- Bump MaaDeps dependency version to v2.11.0 in the helper download
script.
- Update ImageCropper Python dependencies to MaaFw 5.10 and OpenCV 4.13.

Documentation:
- Extend multi-language integration and startup documentation with
guidance and examples for using txwy (Traditional Chinese) accounts and
login-name matching.
- Update ImageCropper usage docs to cover PC window capture via
WGC/Win32 and related configuration options.

Chores:
- Refresh multiple game data and task JSON resources, including new
stages, memory stages, tile coordinates, item indices, stage indices, UI
theme tasks, roguelike tasks, and localization resources for the latest
content.
- Update protocol and startup documentation across all supported
languages to describe txwy account formats and recommendations.

</details>

</details>

</details>
v6.11.0
2026-06-02 03:07:02 +08:00
github-actions[bot]
02d2180092 docs: Auto Update Changelogs of v6.11.0 (#16965)
* docs: Auto Generate Changelog of Release v6.11.0

* docs: changelog

* docs: mac

---------

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-06-02 03:01:30 +08:00
status102
fbf66862b3 perf(wpf): PostAction清空按钮新增仅一次状态同步 2026-06-02 01:43:59 +08:00
uye
4aa5d0c330 Revert "perf: 仅在LinkStart时执行完成后动作, 避免单次运行时触发"
This reverts commit b3801e64ee.
2026-06-02 00:27:06 +08:00
uye
66f2e9e752 chore: 调整吐司通知禁用说明 2026-06-02 00:26:40 +08:00
DavidWang19
067fdab400 feat: 支持 ImageCropper 截取 PC 窗口 (#16969) 2026-06-01 16:51:55 +01:00
SherkeyXD
c277a69110 feat: 界面主题「出猎」 2026-06-01 22:19:04 +08:00
uye
7bca192a21 fix: roi 2026-06-01 21:22:48 +08:00
github-actions[bot]
b2510df2ed feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26757428388
[skip changelog]
2026-06-01 13:19:48 +00:00
Rin
1d46ff16a1 feat: 增加怪猎联动二期 TD-6/7/8 (#16962)
* feat: 增加怪猎联动二期 TD-6/7/8

* chore: revert stage.json

* chore: 移除多余逻辑

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2026-06-01 21:18:32 +08:00
Aliothmoon
c8d6d99010 chore: update MaaDeps version to v2.11.0 (#16961)
see https://github.com/MaaAssistantArknights/MaaDeps/pull/36
2026-06-01 20:42:37 +08:00
github-actions[bot]
3a4e2ebd53 chore: Auto Update Game Resources - 2026-06-01
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26750150948

[skip changelog]
2026-06-01 10:46:42 +00:00
status102
d4ce454114 i18n: 修改描述文本 过期关卡重置为 -> 过期活动关卡重置为 以更加符合当前重置范围 2026-06-01 17:50:04 +08:00
status102
90cd87d7f3 perf(wpf): 临期药下拉框显示24h x n 2026-06-01 17:42:57 +08:00
status102
e7151cdf8d rft: 悖论模拟作业列表变量名与实际不符 2026-06-01 17:40:14 +08:00
github-actions[bot]
d0d492b5b3 chore: Auto Templates Optimization
Triggered by 857742dfdc

[skip changelog]
2026-06-01 09:24:06 +00:00
momomochi987
857742dfdc docs: 帳號切換手冊與整合協議補上繁中服說明
- manual/introduction/startup.md:example 區加入繁中服 Email 帳號範例
- protocol/integration.md:account_name 範例區加入繁中服說明
- ko-kr/manual/introduction/startup.md:移除『不支援全球服 (CN만 가능)』
  字樣,並對齊其他語系的條列範例格式
- zh-tw / zh-cn / en-us / ja-jp / ko-kr 五個語系同步更新
2026-06-01 17:17:17 +08:00
momomochi987
9f16ccd95f docs: 更新帳號切換小提示,加入繁中服 Email 帳號說明
- 將支援客戶端清單從『官服、B服』擴充為『官服、B服、繁中服』
- 新增繁中服 Email 帳號的填寫範例,建議使用不含星號的明文片段
- 將原本『不支援登入帳號』改為更精準的『不支援第三方登入方式』
- zh-tw / zh-cn / en-us / ja-jp / ko-kr 五個語系同步更新
2026-06-01 17:11:28 +08:00
momomochi987
c20c103176 feat: GUI 啟動設定支援繁中服顯示帳號名欄位
- StartUpTaskUserControl.xaml:帳號名 TextBox 與『立即切換』按鈕的 Visibility 條件加入 txwy
- StartUpSettingsUserControlModel.cs:序列化時將 Txwy 視為支援帳號切換的客戶端類型
2026-06-01 17:09:47 +08:00
momomochi987
db665d52a9 feat: 繁中服資源補上帳號切換流程與模板
- tasks.json 新增帳號切換相關 task override:
  - LoginOther 加入 AccountManagerTxwy 為候選入口
  - AccountManagerTxwy 設定 ROI (供 template match 使用)
  - Settings 改成直接接 LogoutOCR/Logout,跳過繁中沒有的 UserCenter/ExitOld 中間層
  - LogoutOCR / LogoutConfirm / AccountCurrentOCR / AccountManagerLoginButton /
    AccountManagerListAccount / AccountManagerTrashButton / AccountManager
    依繁中介面位置調整 ROI 與識別文字
  - AccountManager 改用 OCR detect 偵測「帳號管理」,避開原 template 比 ROI 大的問題
  - LogoutConfirm 直接 reuse 既有的 PopupConfirm.png
- 新增 AccountManagerTxwy.png:繁中服帳號管理頁的 GRYPHLINE 標誌特徵塊
2026-06-01 17:09:18 +08:00
momomochi987
9237dddda4 feat: AccountSwitchTask 支援繁中服客戶端
- 在 _run/select_account 將 txwy 視為與 Official 同類,套用 char model OCR
- navigate_to_start_page 認得 AccountManagerTxwy 作為登入頁入口
- SupportedClientType 將 txwy 從註解移到實際列表
2026-06-01 17:08:26 +08:00
Saratoga-Official
22635a7b60 fix: 御龙装置识别 2026-06-01 14:19:30 +08:00
github-actions[bot]
cae85ce6da chore: Auto Update Game Resources - 2026-05-31
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26727125523

[skip changelog]
2026-05-31 23:08:28 +00:00
github-actions[bot]
b1436cb7c7 chore: Auto Update Game Resources - 2026-05-31
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26723878173

[skip changelog]
alpha/v6.11.0-beta.2.d015.gb1436cb7c7
2026-05-31 20:41:18 +00:00
Rin
9bd27f7968 Revert "fix: 调整基建干员名 OCR 区域" (#16937)
* Revert "fix: 调整基建干员名 OCR 区域 (#16905)"

This reverts commit 89377eba94.

* revert: EN changes no longer needed

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2026-05-31 22:34:18 +08:00
github-actions[bot]
3ebdd1f03f feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26696235621
[skip changelog]
alpha/v6.11.0-beta.2.d013.g3ebdd1f03f
2026-05-30 22:10:57 +00:00
github-actions[bot]
4496d5c9da chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26695211011
[skip changelog]
2026-05-30 21:21:39 +00:00
Rin
137f7764bd fix: 优化追加自定干员弹窗删除时的布局 (#16921)
* fix: 优化追加自定干员弹窗删除时的布局

* refactor: 统一追加自定干员列表高度配置
2026-05-30 23:53:43 +08:00
github-actions[bot]
6c4527e00d chore: Auto Update Game Resources - 2026-05-30
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26682018364

[skip changelog]
2026-05-30 10:55:40 +00:00
Constrat
127ef87f9c fix: revert OCR changes 2026-05-30 12:37:41 +02:00
status102
b3801e64ee perf: 仅在LinkStart时执行完成后动作, 避免单次运行时触发 2026-05-30 17:51:11 +08:00
Status102
7d6ad3b4c1 rft: 水月萨卡兹肉鸽 关闭next弹窗 (#16918)
* rft: 水月肉鸽 关闭next弹窗

* rft: 萨卡兹part

* perf: 简化模板声明
2026-05-30 17:21:21 +08:00
uye
a10391e9d4 perf: 优化信用商店复核逻辑 (#16932)
* perf: 优化信用商店复核逻辑

* chore: 增加对 OCR 结果为空的处理
2026-05-30 17:12:59 +08:00
github-actions[bot]
5f1869ab46 chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26663324632
[skip changelog]
alpha/v6.11.0-beta.2.d005.g5f1869ab46
2026-05-29 21:35:11 +00:00
Rin
89377eba94 fix: 调整基建干员名 OCR 区域 (#16905)
- 扩大笑脸锚点派生的干员名识别范围
2026-05-30 01:10:32 +08:00
Rin
4b520aaac9 fix: 修复宿舍自定义干员+信赖补位的bug&外服同步修复&提升代码可读性 (#16659)
* fix: 修复宿舍自定义干员+信赖补位的bug

* chore: EN

* fix: 补充宿舍筛选全部按钮的日韩识别文本

补充日服“全て”和韩服“전부”,用于取消宿舍“未进驻”筛选时点击“全部”选项。

* refactor: improve infrast dorm task readability

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: Roland125 <oroland125@outlook.com>
2026-05-30 00:56:57 +08:00
status102
0f25895c6d feat(wpf): CustomWebhook支持自定义Headers 2026-05-30 00:25:48 +08:00
github-actions[bot]
5681d6a37e chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26603778911
[skip changelog]
alpha/v6.11.0-beta.2.d001.g5681d6a37e
2026-05-28 21:39:41 +00:00
uye
23ad7fd301 Release v6.11.0-beta.2 (#16919) v6.11.0-beta.2 2026-05-29 01:46:14 +08:00
uye
ed817cce19 fix: changelog 猪了 2026-05-29 01:45:36 +08:00
uye
854b9ec9b0 Release v6.11.0-beta.2 (#16916)
## Summary by Sourcery

通过将串口配置与命令执行分离,并对共享客户端实例的访问强制使用互斥锁保护,改进 ADB-lite 客户端管理。

改进内容:
- 添加锁定辅助工具,在执行 connect、shell、exec、push 和交互式 shell 命令之前,验证并保护对共享 ADB-lite
客户端的访问。
- 在 PlatformIO/AdbLiteIO 上引入可配置的 ADB
串口,并在客户端(重新)初始化时提供安全机制,同时在客户端创建失败时记录错误日志。
- 调整 ADB 释放逻辑,仅在存在 ADB-lite 客户端时才发出释放命令,从而减少不必要的操作。
- 连接 AdbController,将设备地址向下传递到平台 I/O 层,以在各类命令中实现 ADB-lite 客户端的一致使用。

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

## Summary by Sourcery

Improve ADB-lite client management by separating serial configuration
from command execution and enforcing mutex-guarded access to the shared
client instance.

Enhancements:
- Add a locking helper to validate and guard access to the shared
ADB-lite client before executing connect, shell, exec, push, and
interactive shell commands.
- Introduce a configurable ADB serial on PlatformIO/AdbLiteIO with safe
client (re)initialization and error logging when client creation fails.
- Adjust ADB release logic to only issue release commands when an
ADB-lite client is present, reducing unnecessary operations.
- Wire AdbController to propagate the device address into the platform
I/O layer for consistent ADB-lite client usage across commands.

</details>
2026-05-29 01:42:01 +08:00
uye
b3eb6cbbc5 ai: changelog details 增加日期 2026-05-29 01:41:21 +08:00
uye
f4fafde9bf docs: changelog 2026-05-29 01:33:56 +08:00
github-actions[bot]
952c97d9a6 chore: Auto Update Game Resources - 2026-05-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26589446911

[skip changelog]
2026-05-28 17:00:23 +00:00
Loong
b2fa9a1c3e fix: 显式声明 adb-lite client 对应的 serial (#16853)
## 概述

- 在 `AdbController::connect` 确定目标 address/serial 后,通过
`PlatformIO::set_adb_serial` 显式声明当前 adb 设备。
- NativeIO 默认忽略该调用;AdbLiteIO 使用该 serial 初始化或切换内部 adb-lite client。
- adb-lite 的 `shell`、`exec-out`、`push` 和交互式 shell 只使用已声明的
client,不再从命令路径里隐式初始化 client。
- AdbLiteIO 内部集中校验 client/serial,并用 mutex 覆盖 `m_adb_client` /
`m_adb_serial` 以及对 adb-lite client 的调用,避免 `call_command` 与
`interactive_shell` 并发访问同一状态。

## 背景

#16850 已修复 `adb connect` 被跳过后 adb-lite client 未初始化的问题,并补充了内部锁保护。这个 PR
是后续调整:把 client 初始化入口从命令执行路径挪到连接生命周期中,让状态声明更明确。

## 修复方式

连接阶段已经知道当前 address/serial,所以在设置 connect/release 命令后调用:

```cpp
m_platform_io->set_adb_serial(address);
```

对 NativeIO 来说这是 no-op;对 AdbLiteIO 来说,这是初始化或切换 `adb::client` 的入口。

后续 adb-lite 命令路径通过 `lock_adb_client(serial)` 统一校验命令中的 `-s <serial>` 与当前
client 对应的 serial 一致,并在同一把锁仍然持有时调用 adb-lite client。这样避免在
`interactive_shell` 中隐式写入 client/serial 状态,也避免把 `m_adb_client` 暴露给无锁调用。

`set_adb_serial` 也改为先创建临时 `adb::client`,创建成功后再提交 `m_adb_serial` /
`m_adb_client` 状态;如果创建失败则记录错误并清空 adb-lite client 状态,避免 serial 已切换但
client 仍指向旧对象的不一致状态。

## 验证

- `git diff --check --cached`
- `cmake --build /private/tmp/maa-build-8599-core --parallel 8`
- `cmake --install /private/tmp/maa-build-8599-core --config
RelWithDebInfo`
- 本机 `maa` CLI + Android 35 arm64 AVD:
  - `maa run connect-only -p adb-lite-test --no-summary -vvv`
  - 日志显示 `Loading MaaCore from: /private/tmp/maa-test-data-8599/lib`
  - 日志显示 `Setting adb lite enabled to true`
  - 日志到达 `Connected`
  - 日志到达 `FastestWayToScreencap Encode`
  - 未出现 `adb client not initialized`
  - 未出现 `failed to create adb-lite client`
  - 未出现 `fallback to NativeIO`
2026-05-29 00:46:30 +08:00
uye
5a4c3fe7b4 fix: 修复开启基建退出提醒时无法退出基建
fix #16913
2026-05-29 00:04:39 +08:00
github-actions[bot]
e8a6d8b063 chore: Auto Update Game Resources - 2026-05-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26584047595

[skip changelog]
2026-05-28 15:22:16 +00:00