fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,184 Commits 60 Branches 1,840 Tags
1bafad61dd45475cdf22b352ea5a9c16b2eef0bb
Commit Graph

19184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luhan Xiao
1bafad61dd feat(changelog): 记录 MaaMacGui 子仓库更新 (#16870) 
* feat(changelog): 记录 MaaMacGui 子仓库更新

* fix(changelog): 修复 MaaMacGui 更新记录解析
 2026-05-28 12:09:25 +08:00
H2O_MERO
a752f4b193 feat:为设置添加了搜索支持 (#16833) 
* fix:修复了问题 只能在#nullable 注释上下文内的代码中使用可为 null 的引用类型的注释

* chore: Apply suggestion from @sourcery-ai[bot]

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

* chore: 搜索框放到导航栏上方

* chore: UpdateSourceTrigger

* rft: 通过附加属性实现

* rft: 实时遍历可视树，结束搜索时还原展开状态

* perf: 雷霆边框

* chore: 等待界面更新后再搜索

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
 2026-05-28 12:08:07 +08:00
uye
c7f83cc154 chore: 删除多余标题 2026-05-28 08:11:18 +08:00
uye
f311cd9bcc ai: 调整 changelog skill 2026-05-28 08:06:35 +08:00
uye
98445b29e9 chore: 公告也改用 MarkdownDataHelper 2026-05-28 08:03:29 +08:00
uye
a9520e2298 feat: 新增 MarkdownDataHelper 2026-05-28 07:56:40 +08:00
github-actions[bot]
fe961feb75 docs: Auto Update Changelogs of v6.11.0-beta.1 (#16898) 
* docs: Auto Generate Changelog of Release v6.11.0-beta.1

* docs: 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-28 07:22:03 +08:00
uye
8f8d9bd6b2 i18n: 添加任务复制失败的本地化翻译 2026-05-28 06:56:52 +08:00
uye
1a4512976b docs: 补全 指定天数内的理智药 相关文档 2026-05-28 06:50:20 +08:00
uye
14157a9085 perf: 优化 FightTaskStageResetModeConverter 与 RecruitTaskHoldTagsConverter 嵌套逻辑 2026-05-28 06:41:06 +08:00
uye
1c0f5a985f chore: 调整静态视频路径的绑定 2026-05-28 06:36:07 +08:00
uye
b9cbfaa338 docs: skip_tags -> preserve_tags alpha/v6.10.8-alpha.1.d044.gb9cbfaa338 2026-05-28 06:30:53 +08:00
uye
3f07db484f chore: 在 OnCustomToolTipChanged 中增加对 PART_Border 为空的防护，以避免在模板应用前出现空引用异常 2026-05-28 06:27:05 +08:00
uye
bf6654eb31 chore: 调整特定平台下的 IsNotificationAvailable 返回 2026-05-28 06:25:44 +08:00
github-actions[bot]
a9025a8c4b feat: Update Submodules MAAUnified, MaaMacGui, maa-cli 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26541802412
[skip changelog]
 2026-05-27 22:12:39 +00:00
github-actions[bot]
3039e41c3f chore: Auto update by pre-commit hooks 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26540052175
[skip changelog]
 2026-05-27 21:35:27 +00:00
github-actions[bot]
49e660f3ea chore: Auto Update Game Resources - 2026-05-27 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26536825404

[skip changelog]
 2026-05-27 20:29:04 +00:00
uye
a5a237f53f chore: 改漏了—— 
[skip changelog]
 2026-05-28 03:41:42 +08:00
uye
fa11d62642 chore: 增加基建小房子切换兜底 2026-05-28 03:39:36 +08:00
uye
f64a353c14 fix: 使用小房子转跳后无法切换基建设施 2026-05-28 03:18:00 +08:00
uye
d763c9b152 chore: 添加主任务右键效果切换提示 2026-05-28 02:56:09 +08:00
uye
676c3bda4a chore: 加回右键菜单和单次运行 
fix #16889
 2026-05-28 02:44:16 +08:00
HY
92d939b36c chore: 繁中服「天想」主題 (#16893) 
chore: 繁中服「孤星」主題
 2026-05-28 01:54:33 +08:00
github-actions[bot]
b30112b5b7 chore: Auto Templates Optimization 
Triggered by 70cd6d5324

[skip changelog]
 2026-05-27 10:45:46 +00:00
HY
70cd6d5324 fix: 嘗試修復繁中服界園肉鴿無法放棄探索 (#16887) 2026-05-27 18:45:24 +08:00
Status102
2f14464a91 perf: NotificationImplWpf当Toast不可用时提示原因 (#16877) 
* perf: NotificationImplWpf当Toast不可用时提示原因

* i18n: by uye

Co-authored-by: Status102 <102887808+status102@users.noreply.github.com>

* i18n: JP

* i18n: zh-tw

* i18n: KR

* i18n: machine translate

---------

Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
Co-authored-by: momomochi987 <45387477+momomochi987@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
 2026-05-27 18:44:38 +08:00
status102
93af38fbe4 fix: Roi.height 越界 2026-05-27 16:03:56 +08:00
status102
9c91b666cb fix: 避免多次correct_rect后返回全图rect 2026-05-27 12:58:08 +08:00
status102
7a33b92d58 fix: 避免多次correct_rect后返回全图rect 2026-05-27 12:46:58 +08:00
status102
b48c640119 fix: LogWarn 等宏在 Release 下依旧输出scope导致额外间隔 2026-05-27 12:46:57 +08:00
Saratoga-Official
f50f67177f fix: 界园见钱问柳事件选择逻辑 
fix #16879
 2026-05-27 09:32:47 +08:00
github-actions[bot]
0c572e9f6c feat: Update Submodules MAAUnified, MaaMacGui, maa-cli 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26478296389
[skip changelog]
alpha/v6.10.8-alpha.1.d024.g0c572e9f6c 		2026-05-26 22:16:59 +00:00
github-actions[bot]
191e7035b6 chore: Auto update by pre-commit hooks 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26476376564
[skip changelog]
 2026-05-26 21:33:41 +00:00
github-actions[bot]
fda1cc3ff3 chore: Auto Update Game Resources - 2026-05-26 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26473080349

[skip changelog]
 2026-05-26 20:25:29 +00:00
H2O_MERO
39e01179ce feat: 对一键长草列表进行了交互优化，并添加了复制按钮 (#16733) 
* feat: 对一键长草列表进行了交互优化

* feat: 增加了删除和编辑两种矢量图标并使用

* fix:修复了按钮颜色没有及时恢复的问题

* feat:加入了复制按钮

* fix:修复了复制任务后部分任务丢失数据和出现渲染异常的问题

* refactor: 跟进和优化了引导界面的任务设置部分样式

* perf: 任务index设置

* perf:

* revert

* fix: NameDisplay -> NameOrTaskType

* fix: 额外的图标

* fix: GroupName

* rft: 提取通用属性，修复 RadioButton 绑定错误，非 Idle 时不显示对应操作按钮

* chore: 删除左键提示

* fix: 高亮背景色

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2026-05-27 02:38:59 +08:00
github-actions[bot]
d5a2e8efb9 chore: Auto Update Game Resources - 2026-05-26 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26464510177

[skip changelog]
 2026-05-26 17:34:30 +00:00
uye
0289fa0381 feat: 公招保留指定词条 (#16586) 
* feat: 保留指定词条

* chore: wpf 不再传递 skip_robot

* rft: 提取共用方法

* perf: 传参

* rft: 统一使用 PreserveTags

* fix: NameOrTaskType

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2026-05-27 00:46:02 +08:00
uye
5efdfa1b5c feat: 理智作战支持设定目标材料最大库存 (#16487) 
* feat: 理智作战支持设定目标材料最大库存

* chore: 调整翻译绑定，修改运行时 IsEnable，移除无用属性

* chore: 调整描述

* chore: 调整缩进

* perf: 移除不必要的变更判断

* feat: 任务开始时刷新库存

* rft: rename

* chore: 运行时不刷新仓库数据，仅在进入任务时刷新一次

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2026-05-27 00:28:56 +08:00
uye
753547b5dd feat: 支持部分任务间通过导航栏切换 (#16869) 2026-05-27 00:28:22 +08:00
github-actions[bot]
2592b76569 chore: Auto Update Game Resources - 2026-05-26 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26460728688

[skip changelog]
 2026-05-26 16:20:47 +00:00
Alex Gu
45aefd30d7 fix: filenum_ctrl SIGABRT (#16233) + PosixIO fork _exit + CI action SHA pin (#16502) 
* fix: PosixIO::call_command 中 fork 后 child 缺少 _exit 导致 unwind 进 parent 代码

当 execlp 失败时，child 分支走 `return std::nullopt`，该子进程会从
PosixIO::call_command 一路 unwind 回 AdbController::call_command 及其
caller，跟 parent 同时跑：

- 在 child 地址空间副本中释放 m_callcmd_mutex（caller 处持有的 unique_lock）
- 后续命中 `kill(m_child, SIGTERM)` 时 child 视角 m_child==0
  → POSIX `kill(0, SIG)` 给整个进程组发信号 → 把 parent 一并杀掉
- 析构时双 close 同一 fd 号（kernel 已重用给别处）→ 关掉 parent 的
  socket / log fd → 后续 read/write 错乱

查看 git 历史发现回归引入于 #7748（perf: update PosixIO::call_command, 2023-12）。
当时 perf 重构把 child 分支结尾的 `::exit(exit_ret)` 替换成
`Log.error(...) + return std::nullopt`。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* ci: 将第三方 action 钉到 commit SHA，符合 GitHub 安全建议

https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-third-party-actions

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix: filenum_ctrl 中 std::filesystem 调用缺 error_code 导致 SIGABRT

Windows 上 debug 截图被另一进程占用时，std::filesystem 多个调用会抛 filesystem_error。
异常未被 filenum_ctrl / save_debug_image / AbstractTask::run 任一层
捕获，沿任务栈一路冒到 MaaCore 顶层（issue #16233）。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* chore: 清理 PosixIO 子分支 execlp 死赋值

按 Sourcery review 清掉死代码。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* chore: restore release package workflow

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-26 22:20:33 +08:00
Jin Zhaonian
a5e3176e49 fix: 更新检查失败时优先尝试 api2 再使用缓存 (#16873) 2026-05-26 21:58:20 +08:00
uye
fd9f396f74 chore: MT 入口 2026-05-26 21:57:03 +08:00
uye
a4cb1e716d rft: 统一使用重载的 GetValue 替换 Convert.To (#16866) 2026-05-26 10:21:04 +08:00
uye
fb64c1164e feat: TouchMode ToolTip 添加视频演示 (#16812) 
* feat: TouchMode ToolTip 添加视频演示

* style: 空行

* rft: 拓展 TooltipBlock 支持自定义 ToolTip
 2026-05-26 10:15:44 +08:00
github-actions[bot]
6b5a021b2e feat: Update Submodules MAAUnified, MaaMacGui, maa-cli 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26421831573
[skip changelog]
alpha/v6.10.8-alpha.1.d010.g6b5a021b2e 		2026-05-25 22:14:07 +00:00
Luhan Xiao
0a7f6e272c fix(macOS): 降低 RA4 和 RA15 二倍速识别阈值 (#16860) 
## 变更内容

- 在 macOS平台差异配置中，为 RA4 和 RA15 的二倍速识别节点补充 `templThreshold: 0.7`
- 与此前 macOS的 iOS 差异配置保持一致

## 修改位置

- `resource/platform_diff/iOS/resource/tasks.json`

## 原因

RA4 和 RA15 在 iOS/macOS 触控环境下识别二倍速按钮时也有用户反馈出现模板匹配分数偏低的问题，和此前 RA1 的情况类似。  
因此仅在 iOS 平台差异文件中降低对应节点阈值，避免影响通用任务配置和其他平台。

## 说明

本次未修改通用任务文件 `resource/tasks/RA/Reclamation3.json`。

## Summary by Sourcery

错误修复：
- 在 macOS/iOS 的 platform-diff 任务配置中，降低 RA4 和 RA15 的双倍速度模板匹配阈值，以减少漏检情况。

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

## Summary by Sourcery

Bug Fixes:
- Lower the double-speed template matching threshold for RA4 and RA15 in
the macOS/iOS platform-diff task configuration to reduce missed
detections.

</details>
 2026-05-26 02:24:24 +08:00
status102
81b71409a8 Revert "fix: 任务匹配进入onErrorNext时, cur_task_ptr错误置空" 
This reverts commit c27cefa307.
 2026-05-25 18:33:37 +08:00
status102
34d6e682be rft: 界园肉鸽弹窗Next关闭 
招募卷关闭
 2026-05-25 18:21:17 +08:00
status102
c27cefa307 fix: 任务匹配进入onErrorNext时, cur_task_ptr错误置空 2026-05-25 18:21:17 +08:00