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
12,750 Commits 60 Branches 1,840 Tags
80423a2f75c38c7ea75e16ae5c2726a44d38e9fa
Commit Graph

6056 Commits

Author SHA1 Message Date
Hao Guan
cfa5b05b1d feat: Mac GUI 适配重构后的生息演算任务(#10425) 2024-09-02 23:07:03 +08:00
uye
f1c96db7f4 feat: 生息演算模式 1 道具组装任务链插件化 (#10411) 2024-09-02 12:50:36 +08:00
uye
991857ba0d feat: UI 支持 生息演算 num_craft_batches 参数 2024-09-02 11:27:42 +08:00
Weiyou Wang
047571c5fc fix: sln 2024-09-02 13:04:51 +10:00
Weiyou Wang
cce9f70b6d fix: sln 2024-09-02 12:58:52 +10:00
Weiyou Wang
3ea87003b9 fix: need_exit 2024-09-02 12:51:28 +10:00
uye
2771fde784 chore: 调整资源版本显示 2024-09-02 10:41:58 +08:00
status102
67f9d999e8 fix: sln 2024-09-02 10:12:48 +08:00
uye
fc5c61c9f7 chore: UI 支持选择增加支援道具的方式 2024-09-02 10:01:20 +08:00
uye
f81952b3f2 chore: 编队时不在干员数据内的显示输入的名称 2024-09-02 09:33:44 +08:00
uye
33ec5a5d19 chore: 化动编队日志输出 2024-09-02 09:25:29 +08:00
Weiyou Wang
939b0b8a70 refactor: 统一 namespace 用法 2024-09-01 20:23:11 +10:00
Weiyou Wang
acf030aefd feat: 加入hold模式 2024-09-01 20:11:47 +10:00
uye
024aac639f feat: 外部通知支持多选 (#10395) 
* feat: 外部通知支持多选

* chore: 不必要的 using
 2024-09-01 16:43:25 +08:00
uye
41f086a5d8 refactor: 重构 FightSettingsUserControl (#10407) 
* feat: 添加允许吃源石保存状态翻译

* refactor: 重构 FightSettingsUserControl

* fix: 绑定错误

* chore: 吃源石后的*根据AllowUseStoneSave改变
 2024-09-01 16:43:06 +08:00
uye
19b23f696c style: 调整 ResourceDictionary 格式化规则 2024-09-01 16:35:28 +08:00
Manicsteiner
1c0b4b06e0 fix: Reclamation for YostarJP (#10414) 2024-09-01 14:45:12 +08:00
uye
e52f4f5f15 chore: 调用PowerManagement.Shutdown();后再次调用Bootstrapper.Shutdown(); 2024-09-01 13:22:59 +08:00
uye
9ad63ec5fa chore: 关机前尝试保存配置 
fix #10405
 2024-09-01 13:08:49 +08:00
uye
48f87a72cb chore: 调整令牌关闭强度 2024-09-01 12:59:21 +08:00
Weiyou Wang
070d1d1399 feat: ReclamationCraftTaskPlugin 2024-08-31 23:38:48 +10:00
Weiyou Wang
c530ce9ee6 feat: AbstractReclamationTaskPlugin 2024-08-31 21:58:50 +10:00
Weiyou Wang
2f2a4c0652 feat: 生息演算新参数: num_craft_batches 2024-08-31 21:58:50 +10:00
Weiyou Wang
bbf8c94e62 refactor: 顺带补上缺失的 Roguelike\Sami filter 并修正注释 2024-08-31 19:30:53 +10:00
Weiyou Wang
636dc8072f refactor: 把 Fire@Reclamation 的插件移入 Deprecated 文件夹 2024-08-31 19:30:52 +10:00
Weiyou Wang
df43b93b27 refactor: 合成 -> 组装 2024-08-31 19:14:13 +10:00
Weiyou Wang
a71997f6ef refactor: Within The Sand -> Within the Sand 2024-08-31 19:14:13 +10:00
uye
715d137a4b chore: 生息演算添加沙中之火选择项 2024-08-31 10:07:21 +08:00
uye
9b257e3aed fix: 生息演算主题读取配置错误 2024-08-31 09:45:18 +08:00
status102
ed449bb04f perf: Mumu截图增强路径清空时不再检查路径是否存在 2024-08-29 20:20:36 +08:00
zzyyyl
ec42d503e0 feat!: 更新保全 strategies 逻辑 (#10314) 
* feat: 保全策略更新

* docs: 修改保全文档对 strategies 的描述

* style: format

[skip changelog]

* feat: 无可用工具人且无 core 时允许检查同一格的后续策略

* style: format

[skip changelog]

* feat: 不再检查干员是否暴毙

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

* fix: 修复m_all_cores可能插入空core名字导致保全战斗主要部署逻辑结束后仍然识别待部署区

* fix: var reset

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-08-29 19:53:52 +08:00
status102
ad6961c062 refactor: 迁移公告相关配置 (#10399) 
* refactor: 迁移公告相关配置

* style: format

* fix: config save

* chore: remove using
 2024-08-29 19:53:32 +08:00
uye
018f353bbe chore: 第一次启动时默认不勾选肉鸽和生息演算 2024-08-29 14:17:04 +08:00
uye
413a23ebec style: 格式化 
[skip changelog]
 2024-08-29 14:15:47 +08:00
Weiyou Wang
b4e7f41e84 fix: 肉鸽编队检测在未触底时返回 true (#10396) 2024-08-29 11:54:09 +08:00
uye
7457bd7f59 fix: DoDragDrop 拖动操作已在进行中 (#10368) 
fix #10367
 2024-08-29 00:43:35 +08:00
Loong
5b59c9c2b3 chore: bump maa-cli to 0.4.12 (#10390) 2024-08-28 21:55:52 +08:00
Weiyou Wang
72f06f469a refactor: 重构生息演算 (#10356) 
* refactor: 调整 tasks.json 中部分 doc field 格式

* feat: ReclamationConfig

* refactor: ReclamationTask

* refactor: template <Tales@Reclamation@ProsperityNoSave>

* refactor: tasks.json <Tales@Reclamation@ProsperityNoSave>

* refactor: template <Tales@Reclamation@ProsperityInSave>

* refactor: tasks.json <Tales@Reclamation@ProsperityInSave>

* refactor: 生息点数达到上限后停止任务

* refactor: global adaption

* chore: Auto update by pre-commit hooks [skip changelog]

* chore: YostarKR CancelEnterBuildMode

* fix: typo in MaaCore.vcxproj

* refactor: Wpf Gui Support (still under progress)

* refactor: practice of template tasks

* refactor: strategy -> mode; mode -> difficulty

* refactor: WpfGui strategy -> mode; mode -> difficulty

* refactor: Tales@Reclamation -> Tales@RA

* chore: Auto update by pre-commit hooks [skip changelog]

* refactor: simplify task names

* chore: Auto update by pre-commit hooks [skip changelog]

* feat: 如果当前编队规模大于等于7人则清空当前编队

* refactor: 简化部分任务流

* chore: Auto update by pre-commit hooks [skip changelog]

* feat: 跳过可能的对话事件

* fix: 修复部分任务流

* fix: add ocrReplace for JP "Tales@RA@ClickShrubberyGalore"

* fix: 加个 delay 防卡顿

* fix: enlarge roi

* feat: 加入日文适配

* fix: 部分任务 guard 通过后操作不一定马上起效，delay 未知，加入特殊处理

* refactor: 任务链描述

* fix: fix wrong task name

* fix: Yostar Confirmation window

* i18n: tweak YostarKR

* fix: enlarge roi for robustness

---------

Co-authored-by: 晓丶梦丶仁 <1020623818@qq.com>
Co-authored-by: HX3N <128385247+HX3N@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-08-28 09:25:54 +10:00
uye
b3555440ee perf: 优化外部通知界面显示 (#10363) 
* perf: 优化外部通知界面显示

* chore: TextBlock warp
 2024-08-26 00:13:32 +08:00
uye
c694413b4a refactor: 获取任务端口无效时不进行轮询 (#10321) 2024-08-26 00:10:56 +08:00
Horror Proton
ba4a36086c feat: 使用变换后的图像进行技能按钮识别 (#10293) 
* feat: use `cv::warpPerspective` in `use_skill`

* chore: remove unused reclamation task info

* chore: Auto update by pre-commit hooks 

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-08-25 21:31:34 +08:00
dantmnf
e7a2e4a8d6 chore: use CsWin32 source generator instead of random pinvoke library (#10361) 
* chore: use CsWin32 source generator instead of random pinvoke library

* fix: use local D3D12CreateDevice definition
 2024-08-25 19:46:32 +08:00
晓丶梦丶仁
ca8637623e feat: 生息演算2刷开局清空编队干员 (#10359) 
* feat: 生息演算2清空编队干员


* perf: 缩小模板图片以避免可能的外服适配

* fix: 把兜底糊完整

* docs: 修改描述

* docs: 修改描述


* feat: 适配日服

* feat: 适配韩服

* feat: 适配EN服

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-08-24 23:58:52 +08:00
octopus yan
675160285a feat: add Qmsg notification (#10358) 
* feat: add Qmsg notification (#9078)

* fix: Qmsg 配置UI
 2024-08-24 21:46:11 +08:00
uye
52c891f256 fix: 勾选启动MAA后直接最小化后点击隐藏托盘图标后无法显示MAA 2024-08-24 13:46:13 +08:00
Constrat
90200257a8 chore: RoguelikeRoutingTaskPlugin.h missing VS22 filter 2024-08-23 22:54:16 +02:00
Constrat
13972cd41c fix: add delay after selecting clue 2024-08-23 22:34:21 +02:00
Constrat
b13036b2ff feat: GetLocalizedNames for Infrast and Copilot output (#10335) 
* feat: GetLocalizedNames for Infrast output

* feat: Localization for Copilot steps

* i18n: EN tweak
 2024-08-23 12:13:23 +02:00
uye
85397f78c4 chore: 公招识别拥有全干员时不显示未拥有干员数量 2024-08-23 11:58:46 +08:00
Constrat
0d15622e83 i18n: EN tweak 
[skip changelog]
 2024-08-23 00:18:47 +02:00