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

8620 Commits

Author SHA1 Message Date
github-actions[bot]
ce9fc40ef5 chore: Auto update by pre-commit hooks 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24940764290
[skip changelog]
 2026-04-25 21:12:38 +00:00
晓丶梦丶仁
fa5929a5f5 feat: 争锋频道 绿藤城 (#16345) 
* feat: 争锋频道 绿藤城

* i18n: jp kr

* fix: key
 2026-04-25 23:53:09 +08:00
status102
adcf581ab3 fix: 干员仓储识别未跳过数据查找失败的干员 2026-04-25 23:17:06 +08:00
status102
b0f46de1e6 perf: 理智上限增加到210 2026-04-25 20:47:49 +08:00
SherkeyXD
a1064f7c21 fix: 月度小队不再隐藏分队选择 2026-04-25 18:10:04 +08:00
uye
ac3b986d7a feat: updater 支持暗色模式 2026-04-25 05:51:09 +08:00
uye
f08793369e feat: updater 支持显示进度条或控制台输出 2026-04-25 05:51:09 +08:00
uye
0c4bcf6aae fix: 使用本地注册的更新包会导致从 API 获取的更新信息被置空 2026-04-24 23:19:16 +08:00
uye
c45b476a30 chore: 简化公告日志记录 2026-04-23 00:43:39 +08:00
uye
a1fb539856 fix: 内测版与其他类型版本对比时 removelist 会错误添加所有目录 2026-04-22 22:04:25 +08:00
uye
31fdcf191f chore: updater 额外保留 cache 文件夹 2026-04-22 20:32:03 +08:00
uye
f888adb99a feat: updater 增加移除和移动文件列表打印 2026-04-22 20:30:21 +08:00
uye
2976930308 feat: updater 日志增加大小上限 2026-04-22 20:18:54 +08:00
status102
beedbd37cc fix: 临时修复rect完全超限时的超限返回值 2026-04-22 16:23:21 +08:00
uye
478de0cccb fix: updater utf8 解析 2026-04-22 05:06:48 +08:00
uye
4ce5e9bf97 rft: 外部更新使用分离的 updater (#16326) 
* rft: 外部更新使用分离的 updater

* fix: review

* chore: 调整注释

* chore: 调整提示文本
 2026-04-22 02:50:13 +08:00
uye
e68a07feff fix: warnings 2026-04-21 10:36:53 +08:00
uye
9b7624da39 rft: 外部更新不再读配置 2026-04-21 10:20:12 +08:00
status102
7df2736fbc chore(wpf): 注释推错了 2026-04-21 10:09:14 +08:00
uye
92192d969b rft: 简化更新代码 2026-04-21 10:04:44 +08:00
status102
3645360869 fix(wpf): 描述误导 2026-04-21 09:44:19 +08:00
uye
f607149e4c rft: 涉及 dll 的更新使用外部更新 2026-04-21 09:21:27 +08:00
travellerse
af783dd558 feat: 线索交流时先移除所有放置的线索 (#16054) 
* feat: 线索交流时先移除所有放置的线索

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

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

* perf: 优化移除线索逻辑

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

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

* chore: 添加日志

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

* chore: 简化代码，调整注释
 2026-04-21 05:33:24 +08:00
status102
e0564099b2 fix: index越界 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]
 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
Yi Zhang
733ce5bd81 fix: baseList 无法编译的问题 (#16293) 
fix: baseList无法编译的问题
 2026-04-17 22:51:42 +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
52157f505c i18n: EN 2026-04-16 12:59:48 +02: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]
 2026-04-14 22:06:53 +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
uye
e8d5982b60 perf: 优化提示元素展示效果 2026-04-12 19:27:29 +08:00
status102
0266db8144 chore: 存在DEBUG.txt时MaaCore额外在Log开始时额外输出提示 
[skip changelog]
 2026-04-12 13:51:24 +08:00
status102
d44cd057a4 fix(wpf): 自动战斗鼠标长按分页时, 可能会反复触发切换 2026-04-12 13:51:24 +08:00
status102
c825f823de Revert "fix: prts.plus改为zoot.plus" 
This reverts commit d9b6eb7020.
 2026-04-12 13:51:23 +08:00
status102
25481d16ca perf: 作业版本号需求允许省略patch 2026-04-11 16:34:37 +08:00
github-actions[bot]
4173760050 chore: Auto update by pre-commit hooks 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24264327755
[skip changelog]
 2026-04-10 21:11:51 +00:00
status102
a98df31323 perf: 使用SemaphoreSlim替换Lock 2026-04-11 00:07:41 +08:00