fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 18:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,696 Commits 61 Branches 1,839 Tags
ed449bb04fb8a16cc4061cfe039dd214d29d87b9
Commit Graph

6027 Commits

Author SHA1 Message Date
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
Constrat
be60efeafa fix: c# warning 
[skip changelog]
 2024-08-22 23:56:15 +02:00
ManicSteiner
c09953085c i18n: JP ZH-TW GPU option & reclamation translation 2024-08-22 10:33:58 +01:00
uye
e2de261de2 refactor: 重构 OperBox 输出与显示 (#10320) 
* refactor: 重构 OperBox 输出与显示

* refactor: 空值处理
 2024-08-22 13:15:58 +08:00
uye
3f1d293a8d refactor: 重构定时器和重启询问 (#10078) 2024-08-22 13:15:22 +08:00
SherkeyXD
b25f733e62 fix: 修复调试版本判断条件 2024-08-22 10:41:53 +08:00
HX3N
414f6676a0 i18n: KR GpuDeprecated translation 2024-08-21 20:49:46 +01:00
SherkeyXD
ca66c839aa chore: fix WPF Warning 2024-08-21 19:12:02 +08:00
SherkeyXD
aad744edc2 chore: 修改过时的Binding方法 2024-08-21 19:08:19 +08:00
uye
f1323d164e feat: 允许手动指定WPFGUI中干员名称显示语言 (#10310) 2024-08-21 11:38:29 +08:00
uye
d3db42f249 style: 优化格式 2024-08-21 10:21:18 +08:00
uye
a11dff77fe refactor: RecognizerViewModel 改用 GetLocalizedCharacterName 2024-08-21 10:20:37 +08:00
袜子魔
56143539b1 build(deps): Maa-HTTP-Java update lib (#10288) 2024-08-21 09:38:20 +08:00
Manicsteiner
cbdb25bc6c perf: CopilotViewModel (#10099) 2024-08-21 09:33:44 +08:00
status102
37e6347820 style: format 
[skip changelog]
 2024-08-20 23:30:54 +08:00
ManicSteiner
75089804de fix: buff选项不符合规则时显示原始内容 2024-08-20 22:46:20 +08:00
ManicSteiner
56b57d9ae2 feat: 干员识别支持指定语言 2024-08-20 22:43:09 +08:00
ManicSteiner
96c612fd9c feat: 允许手动指定WPFGUI中干员名称显示语言 2024-08-20 20:31:26 +08:00
status102
e4ebac6f49 perf: Win10以上系统在退出时Wpf不再清除Toast (#10307) 
perf: Win10以上系统在退出时不再清除Toast
 2024-08-20 19:17:31 +08:00
zzyyyl
bf600267ba feat: 公招错误时保存截图 
link to #10302
 2024-08-20 19:13:09 +08:00
status102
7967c62b77 style: format 
[skip changelog]
 2024-08-20 16:49:26 +08:00
uye
fdb3f78574 fix: 多配置下公告和更新日志显示异常 2024-08-20 15:59:25 +08:00
status102
05a1a9b383 perf: 保全开局水泥换牌兼容 2024-08-20 14:17:21 +08:00
status102
04bccb8c5f fix: 修复保全战斗在core干员重复时只会放1次bug 2024-08-20 14:16:35 +08:00
Weiyou Wang
3e8a2319a2 chore: 整理 tasks.json 中记录的肉鸽插件参数 (#10290) 
* refactor: 整理 tasks.json 中记录的肉鸽插件参数

* chore: delete unused roi fields
 2024-08-20 10:32:44 +10:00
status102
730b1733d0 Revert "feat: 保全作战保留core不过牌且放置core后回到待部署则重放工具人和core" (#10300) 
* Revert "feat: 保全作战保留core不过牌且放置core后回到待部署则重放工具人和core"

This reverts commit 970d2cfddc.

* Revert "feat: 保全作战相同location以json写的策略顺序执行"

This reverts commit 29db7fabd9.
 2024-08-20 08:00:50 +08:00
晓丶梦丶仁
970d2cfddc feat: 保全作战保留core不过牌且放置core后回到待部署则重放工具人和core 2024-08-20 00:47:59 +08:00
晓丶梦丶仁
29db7fabd9 feat: 保全作战相同location以json写的策略顺序执行 2024-08-20 00:47:59 +08:00
uye
95811c8e2a fix: ProxyType 重启不生效 2024-08-19 23:44:23 +08:00
uye
4a873757df chore: 优化界面显示 2024-08-19 23:40:40 +08:00