fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 02:10:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,775 Commits 61 Branches 1,838 Tags
25e409f8d0d1e2a2a027dbc83f073bdfbc9b1a4c
Commit Graph

6023 Commits

Author SHA1 Message Date
uye
f94b1d2c11 fix: DoDragDrop 拖动操作已在进行中 (#10368) 
fix #10367
 2024-08-29 00:43:35 +08:00
Loong
11c1cdcae8 chore: bump maa-cli to 0.4.12 (#10390) 2024-08-28 21:55:52 +08:00
Weiyou Wang
cdd4c4c78e 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
b03e5a56e9 perf: 优化外部通知界面显示 (#10363) 
* perf: 优化外部通知界面显示

* chore: TextBlock warp
 2024-08-26 00:13:32 +08:00
uye
de26d22f79 refactor: 获取任务端口无效时不进行轮询 (#10321) 2024-08-26 00:10:56 +08:00
Horror Proton
fcf5bb696c 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
e227d71813 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
晓丶梦丶仁
2afb29191a 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
6fe87e4eca feat: add Qmsg notification (#10358) 
* feat: add Qmsg notification (#9078)

* fix: Qmsg 配置UI
 2024-08-24 21:46:11 +08:00
uye
736b0055d8 fix: 勾选启动MAA后直接最小化后点击隐藏托盘图标后无法显示MAA 2024-08-24 13:46:13 +08:00
Constrat
18257c70e7 chore: RoguelikeRoutingTaskPlugin.h missing VS22 filter 2024-08-23 22:54:16 +02:00
Constrat
f7d9856c85 fix: add delay after selecting clue 2024-08-23 22:34:21 +02:00
Constrat
3be685c560 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
c8c90c1604 chore: 公招识别拥有全干员时不显示未拥有干员数量 2024-08-23 11:58:46 +08:00
Constrat
89261430cb i18n: EN tweak 
[skip changelog]
 2024-08-23 00:18:47 +02:00
Constrat
971699bcbe fix: c# warning 
[skip changelog]
 2024-08-22 23:56:15 +02:00
ManicSteiner
019e483f91 i18n: JP ZH-TW GPU option & reclamation translation 2024-08-22 10:33:58 +01:00
uye
c3a5471ca2 refactor: 重构 OperBox 输出与显示 (#10320) 
* refactor: 重构 OperBox 输出与显示

* refactor: 空值处理
 2024-08-22 13:15:58 +08:00
uye
8e6ba0e21a refactor: 重构定时器和重启询问 (#10078) 2024-08-22 13:15:22 +08:00
SherkeyXD
b2b8137d16 fix: 修复调试版本判断条件 2024-08-22 10:41:53 +08:00
HX3N
13886380a6 i18n: KR GpuDeprecated translation 2024-08-21 20:49:46 +01:00
SherkeyXD
10d51c6c38 chore: fix WPF Warning 2024-08-21 19:12:02 +08:00
SherkeyXD
ffdf42a72f chore: 修改过时的Binding方法 2024-08-21 19:08:19 +08:00
uye
f07ff1bf27 feat: 允许手动指定WPFGUI中干员名称显示语言 (#10310) 2024-08-21 11:38:29 +08:00
uye
77808ffca2 style: 优化格式 2024-08-21 10:21:18 +08:00
uye
a737e978bd refactor: RecognizerViewModel 改用 GetLocalizedCharacterName 2024-08-21 10:20:37 +08:00
袜子魔
af5ff9b07b build(deps): Maa-HTTP-Java update lib (#10288) 2024-08-21 09:38:20 +08:00
Manicsteiner
5f9e4905ac perf: CopilotViewModel (#10099) 2024-08-21 09:33:44 +08:00
status102
78e82ced53 style: format 
[skip changelog]
 2024-08-20 23:30:54 +08:00
ManicSteiner
3509638773 fix: buff选项不符合规则时显示原始内容 2024-08-20 22:46:20 +08:00
ManicSteiner
637b302cc3 feat: 干员识别支持指定语言 2024-08-20 22:43:09 +08:00
ManicSteiner
c80a6fff05 feat: 允许手动指定WPFGUI中干员名称显示语言 2024-08-20 20:31:26 +08:00
status102
4a156f4c7f perf: Win10以上系统在退出时Wpf不再清除Toast (#10307) 
perf: Win10以上系统在退出时不再清除Toast
 2024-08-20 19:17:31 +08:00
zzyyyl
db4b80e967 feat: 公招错误时保存截图 
link to #10302
 2024-08-20 19:13:09 +08:00
status102
72a78402fb style: format 
[skip changelog]
 2024-08-20 16:49:26 +08:00
uye
af27e95fdc fix: 多配置下公告和更新日志显示异常 2024-08-20 15:59:25 +08:00
status102
bceea3bd93 perf: 保全开局水泥换牌兼容 2024-08-20 14:17:21 +08:00
status102
3625fb18c4 fix: 修复保全战斗在core干员重复时只会放1次bug 2024-08-20 14:16:35 +08:00
Weiyou Wang
078d8ee50d chore: 整理 tasks.json 中记录的肉鸽插件参数 (#10290) 
* refactor: 整理 tasks.json 中记录的肉鸽插件参数

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

This reverts commit d57e74a2e6.

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

This reverts commit 0af22cd776.
 2024-08-20 08:00:50 +08:00
晓丶梦丶仁
d57e74a2e6 feat: 保全作战保留core不过牌且放置core后回到待部署则重放工具人和core 2024-08-20 00:47:59 +08:00
晓丶梦丶仁
0af22cd776 feat: 保全作战相同location以json写的策略顺序执行 2024-08-20 00:47:59 +08:00
uye
7ec665dd91 fix: ProxyType 重启不生效 2024-08-19 23:44:23 +08:00
uye
fa0786d627 chore: 优化界面显示 2024-08-19 23:40:40 +08:00
uye
cb1b627e20 chore: MuMu12EmulatorPath Placeholder 添加示例提示 2024-08-19 22:00:34 +08:00
SherkeyXD
6188a2ba3f chore: smoking-test中肉鸽参数更新 2024-08-19 14:02:11 +08:00
SherkeyXD
facbff3ef2 chore: smoking-test添加领取奖励的测试 2024-08-19 14:02:11 +08:00
status102
f70f4500e1 Revert "chore: 保全作战相同location以json写的策略顺序执行、全局保留core干员不作为过牌干员" (#10285) 
Revert "chore: 保全作战相同location以json写的策略顺序执行、全局保留core干员不作为过牌干员 (#10284)"

This reverts commit 575a0fce81.

不该是chore吧，要发版了等发版完再进
 2024-08-19 07:49:25 +08:00
晓丶梦丶仁
575a0fce81 chore: 保全作战相同location以json写的策略顺序执行、全局保留core干员不作为过牌干员 (#10284) 
* feat: SSSstrategy之间同一位置需按json内写的顺序放置

* fix: 添加哈希函数

* fix: 修改错误参数

* refactor: 改用shared_ptr

* feat: 保全作业将不允许用核心干员作为工具人

* fix: 实现全局保core

* fix: 增加顺序tag减少bug

---------

Co-authored-by: Weiyou Wang <blspgzs@gmail.com>
 2024-08-19 07:36:22 +08:00
Constrat
56f1bf6b66 refactor: remove unneccesary Grid.Column fields 2024-08-18 22:51:37 +02:00