Commit Graph

8734 Commits

Author SHA1 Message Date
github-actions[bot]
fc95c90f8f feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/25888740056
[skip changelog]
2026-05-14 22:14:58 +00:00
github-actions[bot]
72234dcc93 chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/25886570116
[skip changelog]
2026-05-14 21:26:59 +00:00
status102
3ee852928f fix: 理智药过期天数识别失败取消确认逻辑未生效
- link to #16548
2026-05-14 19:50:49 +08:00
status102
fc81cc3bbd fix: 临期理智药天数缺省值 2026-05-14 19:50:33 +08:00
github-actions[bot]
ae11a7ca6d feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/25829555451
[skip changelog]
2026-05-13 22:15:51 +00:00
github-actions[bot]
2ede1dd544 chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/25827562446
[skip changelog]
2026-05-13 21:32:01 +00:00
uye
4517ef984c fix: 便捷功能列表滚动 2026-05-14 01:51:23 +08:00
uye
d20493a1b0 feat: 便捷功能提示文本自适应大小 2026-05-14 01:13:14 +08:00
uye
f5801a4d69 fix: 便捷功能 GroupStyle 2026-05-14 00:42:15 +08:00
uye
2aa92b0c1d perf: 调整 小工具-便捷任务 布局,调整日志输出 2026-05-13 23:56:58 +08:00
status102
3432050ff4 fix: 刷理智-理智药过期参数迁移输出Warning中参数名错误 2026-05-13 20:53:20 +08:00
SherkeyXD
a105eccd05 rft: 小游戏界面重构,添加分类并优化选择逻辑,添加日志显示 (#16499)
* rft: 小游戏界面重构,添加分类并优化选择逻辑,添加日志显示

* chore: 修复格式化问题和误删注释

* chore: 重命名小游戏

* fix: 不再硬编码日志内容

* i18n: EN

* i18n: zh-tw

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: momomochi987 <45387477+momomochi987@users.noreply.github.com>
2026-05-13 19:18:32 +08:00
status102
5e78b23157 perf: 避免不必要的new 2026-05-13 16:46:00 +08:00
Status102
de9f715e50 rft(wpf): RunningState更新 (#16585)
* rft(wpf): RunningState更新

* fix: 遗漏
2026-05-13 15:56:05 +08:00
github-actions[bot]
2d794bc1c4 feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/25765378675
[skip changelog]
2026-05-12 22:15:16 +00:00
github-actions[bot]
1e0d66cf7d chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/25763261294
[skip changelog]
2026-05-12 21:29:51 +00:00
status102
f148494230 perf: OCRer DEBUG下绘制匹配结果 2026-05-13 04:50:02 +08:00
uye
2f22c0bde1 chore: 调整干员识别提示换行 2026-05-13 02:42:44 +08:00
H2O_MERO
7921672c07 feat: 仓库识别支持导出 Markdown/CSV,优化导出按钮布局与交互 (#16543)
* feat: 仓库识别支持导出 Markdown/CSV,优化导出按钮布局与交互

* feat: 优化仓库识别导出功能,支持下拉菜单选择并导出 Markdown/CSV

* rft: 提取独立的导出方法

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2026-05-13 02:37:00 +08:00
uye
28e3cbb59b chore: 调整图标阴影 2026-05-13 02:09:34 +08:00
uye
f4cc4610a3 chore: 采用 System.Windows 的剪贴板 2026-05-13 01:57:49 +08:00
Aliothmoon
c6f930a60d feat: support native android (#16179)
* feat: add android controller support

* feat: add android compile options and add core static options

* fix: add __ANDROID__ macro for Android platform

* fix: move switch break into macro conditional block

* ci: add Android CMake presets (arm64, x64)

* fix: add missing Android TouchMode handling

* fix: remove unnecessary pre-check in android

* fix: restore unnecessary modifications

* fix: unified use __ANDROID__

* refactor: use interpolate_swipe_with_pause in AndroidController

* feat: add Android crash logcat output and native backtrace

* feat: only copy once from external lib screencap

* feat: add Android JNI AttachThread/DetachThread to working_proc

* fix: break control in switch

* fix: update click interval & swipe interval

* ci: restore Android build job with MaaFramework download

* fix: remove thread attach

* ci: temporarily remove MaaAndroidNativeControlUnit.so

* feat(android-ctrl): SWIPE_WITH_PAUSE 由 InstanceOption DeploymentWithPause 控制

* feat: SWIPE_WITH_PAUSE 默认启用

* feat: add android compile options and add core static options

* feat: use maafw controll unit

* fix: minor adjustments

* refactor: adapt maafw android lib

* fix: remove screencap when connect

* chore: change maafw lib use

* feat: adapt maafw control unit click & click_key

* fix: address critical issues in Android native controller

- Restore InstanceOptionKey::ClientType case in set_instance_option,
  which was accidentally removed and broke client type setting on all platforms
- Enable libMaaAndroidNativeControlUnit.so copy step in CI (was commented out),
  so Android artifacts actually include the required control unit library
- Fail connect() early when screen_resolution is missing or invalid in config,
  preventing silent {0,0} resolution that would break swipe and screencap
- Check touch_down() return value in swipe() and abort on failure

* fix: correct bounds_check off-by-one and extract KEYCODE_ESCAPE constant

- bounds_check used <= which allowed coordinates equal to screen width/height
  (off-screen); use < to match the valid range [0, dimension-1]
- Extract magic number 111 into KEYCODE_ESCAPE constexpr in press_esc()

* fix: avoid heap allocation in noexcept terminate/signal handlers

format_signal_reason was returning std::string and using std::format in
its default branch. Called from noexcept custom_terminate_handler before
the outer try block, any allocation failure would throw std::bad_alloc,
triggering recursive std::terminate and aborting crash reporting.

- Change return type to const char* noexcept, returning string literals
- Replace std::format("Signal {}", sig) with "Unknown Signal" (only the
  four registered signals are ever passed, so this branch is unreachable)
- Change signal_info in custom_terminate_handler from std::string to
  const char*, eliminating all allocations on the pre-try path

* fix: suppress unused-variable warning for signal_reason on non-Android
2026-05-12 22:15:15 +08:00
uye
eb663f9fb8 chore: 调整描述 2026-05-12 19:26:11 +08:00
uye
2d5b2110f5 perf: 干员识别与仓库识别支持虚拟化,大幅提高首次加载速度 (#16486)
https://github.com/user-attachments/assets/3a0722fb-b4c0-4864-9141-7d0200c117b8

## Summary by Sourcery

优化仓库和运营商卡片列表的展示方式,支持基于行的虚拟化以及共享的卡片宽度约束,从而实现更快的初始加载和更一致的布局。

新功能:
- 为虚拟化卡片列表添加共享卡片宽度行为,根据可用空间和列数保持一致的卡片宽度。

增强内容:
- 将仓库和运营商集合重构为基于行的可观察集合,并计算列数,以更好地支持虚拟化网格布局。
- 连接集合变更处理程序,以在仓库和运营商数据更新时保持行展示和列数的同步。

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

## Summary by Sourcery

Optimize depot and operator card list presentation to support row-based
virtualization and shared card width constraints for faster initial
loading and more consistent layouts.

New Features:
- Add a shared card width behavior for virtualized card lists to
maintain consistent widths based on available space and column count.

Enhancements:
- Refactor depot and operator collections into row-based observable
collections with computed column counts to better support virtualized
grid layouts.
- Wire collection change handlers to keep row presentations and column
counts in sync when depot and operator data updates.

</details>
2026-05-12 18:28:20 +08:00
status102
b9274e1904 perf: Wpf 新配置修改日志记录等级提升至 Info 2026-05-12 11:38:57 +08:00
status102
9dcfeb28fd rft: 自动战斗拆出导航 2026-05-12 11:38:36 +08:00
github-actions[bot]
c99f05fbd9 feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/25690745565
[skip changelog]
2026-05-11 18:56:45 +00:00
uye
c9c8e9751d chore: Lucky 的概率改为 0.0799% 2026-05-12 02:36:34 +08:00
uye
6119232486 chore: 使用 PC 端时不传账号 2026-05-12 01:57:45 +08:00
Constrat
c59397b377 fix: Notification icon 2026-05-11 14:43:56 +02:00
status102
8780642041 fix: LogWarn 等宏在 Release 下依旧输出scope导致额外间隔 2026-05-11 10:16:44 +08:00
Constrat
ce14b73f23 feat: use v2 version of icons (#16556)
* feat: use v2 version of icons

* docs: Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
2026-05-11 00:01:51 +08:00
ce271403b9 fix: 外部通知设置界面调整 (#16552) 2026-05-10 16:47:16 +08:00
travellerse
2239a47229 fix: 界园肉鸽投资模式也启用通宝插件 (#16551)
fix: 界园肉鸽通宝拾取/交换不受 InvestWithMoreScore 限制
2026-05-10 16:41:05 +08:00
github-actions[bot]
28f588ec87 feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/25612950686
[skip changelog]
2026-05-09 22:04:42 +00:00
uye
5473b1ba94 fix: 修复窗体关闭过程中再次启动时报“关闭期间无法设置可见性或调用 Show/Close”的异常
fix #16542
2026-05-10 01:32:36 +08:00
uye
8815af5533 i18n: 修改手动输入关卡名的悬浮描述 2026-05-09 23:48:42 +08:00
uye
11e0836aa0 feat: 支持使用 -Normal/-Hard 切换 常规/险地 难度 2026-05-09 23:29:19 +08:00
uye
6c9b907ffe fix: 修复删除 debug 截图时因文件被占用导致应用闪退的问题 2026-05-09 22:01:04 +08:00
uye
1cd98d5c21 chore: 生成日志压缩包时的缓存目录改为本地 reports 目录 2026-05-09 21:50:25 +08:00
uye
0e4d577add chore: 提前最小截图间隔的检查,小于间隔时跳过识别 2026-05-08 22:32:40 +08:00
March7th-OvO
d0f57f11c8 fix(wpf): 远程控制启动任务未记录开始时间 (#16522)
## 摘要

修复远程控制运行时完成弹窗的时长显示不正确的问题。

正常的 GUI 启动路径在 `AsstStart()` 成功后,会刷新 `AsstProxy.StartTaskTime`,但远程控制的
`LinkStart()` 路径没有。因此,完成弹窗可能会复用已过时的时间戳,并显示出类似 `16h` 这样不正确的时长。

## 修改内容

在以下文件中,于 `AsstStart()` 成功执行的分支里,添加 `Instances.AsstProxy.StartTaskTime =
DateTimeOffset.Now;`:

`src/MaaWpfGui/Services/RemoteControl/RemoteControlService.cs`

## 相关 issue

关闭 #16518

## Summary by Sourcery

Bug Fixes:
- 通过在远程控制的任务开始运行时设置 `StartTaskTime`,纠正完成弹出窗口的持续时间。

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

## Summary by Sourcery

Bug Fixes:
- Correct completion popup duration by setting StartTaskTime when
remote-controlled tasks start running.

</details>
2026-05-08 12:03:34 +08: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
status102
5b8ae926c2 fix: Analyzer执行前未检查m_roi是否未空 2026-05-07 19:34:21 +08:00
uye
b117ace40e fix: 修复小游戏界面的开始按钮在连接模拟器失败时仍然发送开始信号 2026-05-07 18:53:03 +08: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
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