Commit Graph

18680 Commits

Author SHA1 Message Date
status102
7df2736fbc chore(wpf): 注释推错了 2026-04-21 10:09:14 +08:00
uye
92192d969b rft: 简化更新代码 alpha/v6.8.0-beta.1.d028.g92192d969b 2026-04-21 10:04:44 +08:00
status102
3645360869 fix(wpf): 描述误导 2026-04-21 09:44:19 +08:00
uye
f607149e4c rft: 涉及 dll 的更新使用外部更新 alpha/v6.8.0-beta.1.d026.gf607149e4c 2026-04-21 09:21:27 +08:00
github-actions[bot]
a3fd3055c0 chore: Auto Update Game Resources - 2026-04-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24696524499

[skip changelog]
2026-04-20 23:56:57 +00:00
github-actions[bot]
d9991239b7 chore: Auto Templates Optimization
Triggered by af783dd558

[skip changelog]
2026-04-20 23:37:10 +00:00
travellerse
af783dd558 feat: 线索交流时先移除所有放置的线索 (#16054)
* feat: 线索交流时先移除所有放置的线索

* feat: 线索过多时向下滑动线索列表

* feat: 优化重试机制以处理线索过多情况

* perf: 优化移除线索逻辑

* fix: 线索板为空时移除线索视为成功
2026-04-21 07:36:43 +08:00
uye
df92aa2716 chore: 调整手动更新方法描述 alpha/v6.8.0-beta.1.d022.gdf92aa2716 2026-04-21 07:30:58 +08:00
uye
0336b45de8 feat: 启动时判断版本是否一致 2026-04-21 07:09:13 +08:00
uye
7bd54ce7e9 fix: 基建开启设施无法保存 alpha/v6.8.0-beta.1.d020.g7bd54ce7e9 2026-04-21 06:13:19 +08:00
uye
b355c6cbc5 ci: 单引号 2026-04-21 05:43:03 +08:00
uye
42473f1ede rft: 重构更新逻辑,允许拖入指定名称的压缩包进行更新 (#16308)
* rft: 重构更新

* feat: 允许拖入指定名称的压缩包进行更新

* chore: 添加日志

* chore: 更改完整包更新逻辑

* chore: 简化代码,调整注释
2026-04-21 05:33:24 +08:00
github-actions[bot]
b3f9ecc259 chore: Auto Update Game Resources - 2026-04-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24688942932

[skip changelog]
2026-04-20 20:34:27 +00:00
status102
e0564099b2 fix: index越界 alpha/v6.8.0-beta.1.d016.ge0564099b2 2026-04-20 10:12:25 +08:00
github-actions[bot]
5b6dfc3d50 chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24639205418
[skip changelog]
alpha/v6.8.0-beta.1.d015.g5b6dfc3d50
2026-04-19 21:11:48 +00:00
Alex Gu
d8df4e753e fix: macOS PlayTools/SCK 几处小修正 (#16276)
fix: macOS 相关几处小修正

- PlayToolsController: screencap_rgba/screencap_bgr/toucher_commit 调用
  open() 时未检查返回值,连接失败时继续操作会写坏的 socket
- PlayToolsController: start_game() 日志写成了 InputText,应该是 StartGame
- OcrPack: macOS 分支日志里残留了多余的 "rec" 字样
- MacSCKHelper: 析构时 stopCapture 是异步的,没等回调完成就释放了
  stream/output/queue,可能踩到野指针;改用信号量等停完再释放
2026-04-19 23:18:27 +08:00
status102
8b287f36c7 fix: 干员库存识别返回错误id 2026-04-19 21:09:19 +08:00
HX3N
39960ed8ef i18n: KR UseExpireMedicineForActivity 2026-04-19 16:45:46 +09:00
soundofautumn
1e0d04fe48 feat: 新增吃指定天数过期的理智药 (#13849)
* chore: 格式化

i18n: 日志本地化

# Conflicts:
#	src/MaaWpfGui/Main/AsstProxy.cs
#	src/MaaWpfGui/Res/Localizations/en-us.xaml
#	src/MaaWpfGui/Res/Localizations/ko-kr.xaml
#	src/MaaWpfGui/Res/Localizations/zh-tw.xaml

feat: 删除48小时选项

# Conflicts:
#	src/MaaWpfGui/Constants/ConfigurationKeys.cs
#	src/MaaWpfGui/Res/Localizations/en-us.xaml
#	src/MaaWpfGui/Res/Localizations/ja-jp.xaml
#	src/MaaWpfGui/Res/Localizations/ko-kr.xaml
#	src/MaaWpfGui/Res/Localizations/zh-cn.xaml
#	src/MaaWpfGui/Res/Localizations/zh-tw.xaml
#	src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs
#	src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml

feat: wpf添加吃N天理智药的选项

# Conflicts:
#	src/MaaWpfGui/Constants/ConfigurationKeys.cs
#	src/MaaWpfGui/Res/Localizations/zh-cn.xaml
#	src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs
#	src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml

feat: api兼容

chore: 添加注释

feat: deprecated提示

feat: 每次执行任务时修改expiring_task

feat: 支持i18n

feat: 修改expiring_task

feat: 新增吃几天之内的过期药的接口

# Conflicts:
#	src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs

* fix: ocr require

* rft: 参数迁移

* rft: core结构完善

* feat: Wpf支持

* fix: 还原 StageManager中的天书, 刷理智中使用 n+标识鹰历天书

* perf: 下拉选小时

* i18n: 占位

* i18n: wpf

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2026-04-19 10:59:30 +08:00
lhhxxxxx
1a689cbf0b feat: 添加单元测试框架和验证角色分配算法的测试用例 (#16245) alpha/v6.8.0-beta.1.d010.g1a689cbf0b 2026-04-18 20:48:29 +08:00
github-actions[bot]
110db7ab85 chore: Auto Templates Optimization
Triggered by d88d4ad484

[skip changelog]
2026-04-18 08:39:50 +00:00
HY
d88d4ad484 chore: 繁中服宿舍截圖 & 部分 OCR 內容 (#16298)
close #16272

## Summary by Sourcery

更新 Roguelike 任务资源,为 JieGarden 和基础任务添加新的繁体中文内容和截图。

增强内容:
- 刷新 Roguelike JieGarden 任务配置,以纳入更新后的资源和文本。
- 调整通用的 Roguelike 基础任务定义,使其与新的繁体中文本地化数据保持一致。
- 更新整体 Roguelike 任务列表元数据,以引用新增和已更新的任务资源。

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

## Summary by Sourcery

Update Roguelike task resources for JieGarden and base tasks with new
Traditional Chinese content and screenshots.

Enhancements:
- Refresh Roguelike JieGarden task configuration to incorporate updated
assets and text.
- Adjust shared Roguelike base task definitions to align with new
Traditional Chinese localization data.
- Update overall Roguelike task list metadata to reference the new and
updated task resources.

</details>
2026-04-18 10:39:26 +02:00
Leo91314
8e4e4c16ee docs: add FAQ guidance for Windows Defender false positives (#16145) 2026-04-18 10:48:33 +08:00
github-actions[bot]
d9c793cfd3 chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24587013396
[skip changelog]
alpha/v6.8.0-beta.1.d006.gd9c793cfd3
2026-04-17 21:16:33 +00:00
Yi Zhang
733ce5bd81 fix: baseList 无法编译的问题 (#16293)
fix: baseList无法编译的问题
2026-04-17 22:51:42 +08:00
Frog Chen
50000b988a feat: AVD截图增强的售后(文档、CI变更等) (#16031)
Co-authored-by: Rbqwow <55343783+Rbqwow@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2026-04-17 22:38:56 +08:00
Halo
98dd6f7ba1 feat(Avalonia): V0.2 新构建跨平台前端界面MAAUnified,合并代码请求 (#16048)
* feat(MaaUnified): MaaUnified构建完成,作为submodule加入

* fix(MaaUnified): 修复自动构建时 submodule拉取错误问题

* feat(MaaUnified): MaaUnified submodule更换为组织仓库

* ci: do not fetch useless module

---------

Co-authored-by: MistEO <mistereo@hotmail.com>
2026-04-17 22:33:33 +08:00
Status102
9fd6602f11 feat(wpf): 配置存储支持条件优化 (#15850) 2026-04-17 13:48:54 +08:00
SherkeyXD
4e45915f37 feat: 界园肉鸽月度小队和深入调查 (#16271)
* feat: 界园肉鸽月度小队和深入调查

* feat: 月度小队和深入调查ui隐藏不需要的选项
2026-04-17 11:04:24 +08:00
Constrat
98f9fcfe4f Release v6.8.0-beta.1 (#16284) v6.8.0-beta.1 2026-04-16 22:07:46 +02:00
github-actions[bot]
857d5d5f37 docs: Auto Update Changelogs of v6.8.0-beta.1 (#16285)
* docs: Auto Generate Changelog of Release v6.8.0-beta.1

* i18n: quick and dirty EN (it's just a beta)

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2026-04-16 21:42:32 +02:00
Constrat
4d08a2cdbd chore: implement Quickly Place Clues for Global (#14966) 2026-04-16 14:03:44 +02:00
Constrat
52157f505c i18n: EN 2026-04-16 12:59:48 +02:00
Constrat
84b7ed59d9 chore: EN OS minigame (#16283)
* feat: minigame

* fix: typo

* fix: typo optimized
2026-04-16 12:51:55 +02:00
status102
9ce2794841 ci: 将.Net SDK限制置于CI内, 以便于本地开发 2026-04-16 09:42:08 +08:00
uye
a627c68485 ci: dotnet Security patch Update SDK version from 10.0.201 to 10.0.202 alpha/v6.7.2-alpha.1.d047.ga627c68485 2026-04-16 00:31:08 +08:00
status102
2a5cdf24e7 perf: 自动编队预编队后检查选中情况 2026-04-16 00:13:02 +08:00
status102
0772aa9168 chore: 加点注释
[skip changelog]
2026-04-16 00:12:45 +08:00
github-actions[bot]
3180374a19 feat: Update Submodules MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24425274742
[skip changelog]
alpha/v6.7.2-alpha.1.d044.g3180374a19
2026-04-14 22:06:53 +00:00
晓丶梦丶仁
a1b6f0e9bb fix: KR OSChapterToOS OCR 2026-04-14 22:34:17 +08:00
github-actions[bot]
a852ab31b0 chore: Auto Templates Optimization
Triggered by 757cfbf99a

[skip changelog]
2026-04-14 14:28:42 +00:00
uye
757cfbf99a fix: yj 怎么还暗改老主题
fix #16218
2026-04-14 22:28:12 +08:00
Manicsteiner
7ed7d8af92 chore: YostarJP OS stages and more ocr 2026-04-14 22:21:13 +08:00
github-actions[bot]
b8f279abfa chore: Auto Templates Optimization
Triggered by 4443367709

[skip changelog]
2026-04-14 14:10:54 +00:00
HX3N
4443367709 chore: YostarKR OS ocr and minigame (#16268)
* chore: KR OS stage

* chore: minigame placeholder

* chore: MiniGame OS

* chore: ocr edit

* i18n: MiniGame OS
2026-04-14 22:10:00 +08:00
Manicsteiner
32805735ed chore: YostarJP OS ocr and minigame (#16267) 2026-04-14 22:09:33 +08:00
github-actions[bot]
b8a052fc88 chore: Auto Update Game Resources - 2026-04-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24399489743

[skip changelog]
2026-04-14 12:42:59 +00:00
github-actions[bot]
db35bf16c8 chore: Auto Update Game Resources - 2026-04-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24389664505

[skip changelog]
2026-04-14 08:45:37 +00:00
github-actions[bot]
5cb72d7d64 chore: Auto Update Game Resources - 2026-04-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24381737109

[skip changelog]
2026-04-14 04:59:05 +00:00
Reverse0xCC
5b75f1caed chore: 肉鸽添加怒潮凛冬招募逻辑 (#16217)
* chore: 肉鸽添加怒潮凛冬招募逻辑

* chore: 肉鸽添加怒潮凛冬招募逻辑

* chore: 肉鸽添加怒潮凛冬招募逻辑

* chore: 肉鸽添加怒潮凛冬招募逻辑

* chore: 肉鸽添加怒潮凛冬招募逻辑
alpha/v6.7.2-alpha.1.d033.g5b75f1caed
2026-04-13 23:05:50 +08:00