fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,030 Commits 61 Branches 1,836 Tags
aa02e5e23d24dfe900736311bdadeea485aa08cd
Commit Graph

1426 Commits

Author SHA1 Message Date
uye
ae77c07311 feat: capture fresh image (#10460) 
* feat: 使用 AsstAsyncScreencap 的实时截图

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>

* feat: 增加空阻塞任务以便调试

* chore: 增加帧率显示

---------

Co-authored-by: zzyyyl <aysyxx53@hotmail.com>
 2024-09-18 00:41:30 +08:00
uye
c4e320526c feat: LD 截图 (#10581) 
* feat: EmulatorExtras 子模块更新

* feat: 写了一坨

* feat: 大概是能用了

* feat: ui 支持 ld 截图增强

* chore: 修改 LdSpecialScreenshot 颜色，调整版本要求描述

* chore: 使用 steady_clock

* chore: 移除未使用变量
 2024-09-17 22:52:18 +08:00
uye
d2040d3328 fix: adb lite 无法连接 2024-09-16 16:35:28 +08:00
Autumn Sound
331bfa11ce feat: 移除在非windows上locale的实现 (#9680) 2024-09-15 14:17:32 +08:00
uye
34a2b083d8 perf: 使用 devices 判断是否需要连接 (#10606) 
* perf: 使用 devices 判断是否需要连接

* chore: 判断是否存在捕获组
 2024-09-14 14:29:01 +08:00
uye
02ff6e0c63 perf: 优化 connect 逻辑 (#10571) 
* chore: 优化 connect 对实体设备和已有错误路径下自动检测的支持

* perf: 优化 core 对 connect 成功的判断逻辑

may fix 类似 #10426 的异常情况
 2024-09-12 13:07:36 +08:00
晓丶梦丶仁
a12f3d8fc9 fix: 将肉鸽招募的等级限制改为精一55级 2024-09-10 01:10:16 +08:00
zzyyyl
b224518303 refactor: 重构 ProcessTask (#10001) 2024-09-09 11:23:44 +08:00
uye
32c64823ee perf: 拆分技能识别与使用 (#10536) 
* perf: 拆分技能识别与使用

* chore: 调整 use_all_ready_skill 技能使用过快判断
 2024-09-08 16:27:10 +08:00
uye
7e5aa9402c chore: 调整使用技能间隔日志输出等级，调整间隔时间 2024-09-07 14:21:18 +08:00
status102
1ec890214d style: format 
[skip changelog]
 2024-09-07 14:02:29 +08:00
status102
ccdd0c9e06 style: format 
[skip changelog]
 2024-09-07 14:02:29 +08:00
uye
8454075468 fix: 生息演算无法循环 2024-09-04 17:51:04 +08:00
uye
76c5708be7 chore: 截图延迟过大时可能会关闭可关闭技能 2024-09-03 17:19:34 +08:00
uye
62bc8bd007 fix: 识别不到基建入口时会在其他界面滑动导致误触 2024-09-03 03:09:37 +08:00
Weiyou Wang
4528b2213e fix: sln 2024-09-02 13:04:51 +10:00
Weiyou Wang
5c645e7564 fix: sln 2024-09-02 12:58:52 +10:00
Weiyou Wang
d8f321564c fix: need_exit 2024-09-02 12:51:28 +10:00
status102
f3fa4ff001 fix: sln 2024-09-02 10:12:48 +08:00
Weiyou Wang
f3ede6858a refactor: 统一 namespace 用法 2024-09-01 20:23:11 +10:00
Weiyou Wang
4d824d08af feat: 加入hold模式 2024-09-01 20:11:47 +10:00
Weiyou Wang
6569089abb feat: ReclamationCraftTaskPlugin 2024-08-31 23:38:48 +10:00
Weiyou Wang
950961a089 feat: AbstractReclamationTaskPlugin 2024-08-31 21:58:50 +10:00
Weiyou Wang
5a10df22d3 feat: 生息演算新参数: num_craft_batches 2024-08-31 21:58:50 +10:00
Weiyou Wang
8aa9b63306 refactor: 顺带补上缺失的 Roguelike\Sami filter 并修正注释 2024-08-31 19:30:53 +10:00
Weiyou Wang
872b400bec refactor: 把 Fire@Reclamation 的插件移入 Deprecated 文件夹 2024-08-31 19:30:52 +10:00
Weiyou Wang
fdb9f7e295 refactor: Within The Sand -> Within the Sand 2024-08-31 19:14:13 +10:00
zzyyyl
e13f4611d1 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
Weiyou Wang
d5ed0db686 fix: 肉鸽编队检测在未触底时返回 true (#10396) 2024-08-29 11:54:09 +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
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
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
zzyyyl
db4b80e967 feat: 公招错误时保存截图 
link to #10302
 2024-08-20 19:13:09 +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
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
6b89a87a02 Revert "fix: multithread double free in Logger" 
This reverts commit 7631e9a5d2.
 2024-08-18 22:29:18 +02:00
Horror Proton
7631e9a5d2 fix: multithread double free in Logger 2024-08-19 00:18:14 +08:00
uye
5f3f93473f chore: 减少保全截图间隔 2024-08-18 22:31:36 +08:00
status102
d04f2f64b4 Revert "fix: 截图速度过快时可能卡在公招放弃界面" 
This reverts commit 6c2ed8a0b7.
 2024-08-18 20:33:50 +08:00
uye
ed489bab8f fix: 获得导能元件时可能错误判断是否在战斗中 2024-08-18 20:33:27 +08:00
uye
6c2ed8a0b7 fix: 截图速度过快时可能卡在公招放弃界面 2024-08-18 17:59:21 +08:00
zzyyyl
21e19ccdcb perf: 使用 views::join 2024-08-17 16:18:14 +08:00
zzyyyl
84af1ee70e fix: 修复数色闭运算导致的 StageRefresh FP 2024-08-17 01:22:26 +08:00