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

1399 Commits

Author SHA1 Message Date
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
Weiyou Wang
b4e7f41e84 fix: 肉鸽编队检测在未触底时返回 true (#10396) 2024-08-29 11:54:09 +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
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
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
zzyyyl
bf600267ba feat: 公招错误时保存截图 
link to #10302
 2024-08-20 19:13:09 +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
status102
0b5704c02f Revert "chore: 保全作战相同location以json写的策略顺序执行、全局保留core干员不作为过牌干员" (#10285) 
Revert "chore: 保全作战相同location以json写的策略顺序执行、全局保留core干员不作为过牌干员 (#10284)"

This reverts commit 22817d4717.

不该是chore吧，要发版了等发版完再进
 2024-08-19 07:49:25 +08:00
晓丶梦丶仁
22817d4717 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
d0d4f6ae1d Revert "fix: multithread double free in Logger" 
This reverts commit 710fa1971c.
 2024-08-18 22:29:18 +02:00
Horror Proton
710fa1971c fix: multithread double free in Logger 2024-08-19 00:18:14 +08:00
uye
e6edbefe6a chore: 减少保全截图间隔 2024-08-18 22:31:36 +08:00
status102
320be4e83d Revert "fix: 截图速度过快时可能卡在公招放弃界面" 
This reverts commit 3c9f0930a0.
 2024-08-18 20:33:50 +08:00
uye
63453023b4 fix: 获得导能元件时可能错误判断是否在战斗中 2024-08-18 20:33:27 +08:00
uye
3c9f0930a0 fix: 截图速度过快时可能卡在公招放弃界面 2024-08-18 17:59:21 +08:00
zzyyyl
ae82ec0dfe perf: 使用 views::join 2024-08-17 16:18:14 +08:00
zzyyyl
a4f01fe112 fix: 修复数色闭运算导致的 StageRefresh FP 2024-08-17 01:22:26 +08:00
zzyyyl
856cc6494d feat!: 拆分 maskRange 与 colorScales；增加 colorWithClose 开关数色时闭运算 2024-08-17 01:22:17 +08:00
Constrat
954bc89460 chore: subtask iteration output tweak 2024-08-13 16:25:28 +02:00
Weiyou Wang
1bf373ac4b refactor: polish code for collapsal paradigm plugin (#10198) 
* refactor: 复用 LoadingText

* refactor: 删除国际服 tasks.json 中冗余内容

* refactor: 改用 task 实现点击与滑动操作，并为精简后的相关 config task 添加注释
 2024-08-12 21:03:45 +10:00
zzyyyl
48178e9eee fix: 修复部分设备萨卡兹肉鸽商店 StageTraderEnter 得分过低 
fix #10160
 2024-08-12 12:56:16 +08:00
zzyyyl
4a30f0009c feat: 数色前先通过闭运算填充小空洞，避免数色的得分过低 2024-08-12 12:54:56 +08:00
uye
6184ed9cc3 chore: 减少debug下截图数量最大值 2024-08-11 23:51:38 +08:00
status102
969459ef3d chore: task name 
[skip changelog]
 2024-08-11 09:17:23 +08:00
Rbqwow
67c10f1982 refactor: StopGame (#9658) 
* perf: StopGame

* style: rename Intent to packageName

* chore: 不准不选择区服

* fix: 移除其他配置中的抽象 stop 匹配

* style: 统一驼峰

* style: 按照执行顺序重新排序

* feat: 添加回调和文档

* fix: 修复参数传入

* docs: 更新文档

* fix: merge

* chore: 把WSA的配置也改了

* chore: update submodule

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Loong <wangl.cc@outlook.com>
 2024-08-11 01:50:30 +08:00
Loong
f7c591239d fix: validate filename before using it to avoid crash (#10138) 
When custom mode is enabled and filename is not set, the program will crash.
This patch adds a check to validate the filename before using it to avoid the crash.
 2024-08-09 23:50:17 +08:00
Weiyou Wang
74da94d446 feat: 加入肉鸽节点地图识别功能，并应用于萨卡兹肉鸽蓝图快速过图 (#9812) 
* feat: 添加 RoguelikeMode::FastPass，负责用蓝图分队快速过图

* chore: update templates for RoguelikeMap and RoguelikeRouting

* feat: RoguelikeMap

* feat: RoguelikeMapConfig

* feat: BrightPointAnalyzer

* feat: RoguelikeRouting

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

* fix: 修复会卡在商店门口的bug

* fix: adapt new plugin-registration signature

* chore: try fix submodule

* perf: 复用task

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

* fix: 为函数申明补上定义

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-08-09 22:54:19 +10:00
Weiyou Wang
156f23d326 chore: 为肉鸽编队滑页触底判定的代码添加注释 (#10156) 2024-08-09 11:08:47 +08:00
Weiyou Wang
6b1154fa75 fix: 修改肉鸽编队滑页触底判断 (#9243, #9328) (#10116) 
fix: 修改肉鸽编队滑页触底判断
 2024-08-08 02:22:21 +08:00
status102
94ad2e4718 perf: 合并肉鸽插件中止控制 2024-08-07 12:06:43 +08:00
status102
a97c6bd2ed chore: 简化肉鸽刷塌缩范式的日志输出 2024-08-07 00:07:18 +08:00
uye
2cda6f747b fix: 开启 MuMu 截图增强后重启模拟器未重启 MAA 后出现截图失败 
fix #10110
 2024-08-06 18:34:41 +08:00
zzyyyl
0aa3d31d95 feat: 删除 action ClickRand (#10003) 2024-08-03 09:35:43 +08:00
zzyyyl
8a2a1263b5 perf: log prints non-empty ocr_replace results 
related to 13b9afeb2c
 2024-08-02 21:10:25 +08:00
uye
545ce542a0 fix: fix smoking-test 2024-08-02 14:37:39 +08:00
Horror Proton
2762ef73a7 feat: fallback to General config 2024-08-02 13:32:51 +08:00
Lancarus
8c48f57af5 feat: 增加一些肉鸽参数 (#9875) 
* feat: 增加一些肉鸽参数

* feat: 根据获得的藏品改变招募优先级

* fix: 重复定义、注释空函数
 2024-07-31 18:43:59 +08:00
zzyyyl
089c22c5b3 perf: 增加日志输出 PackageTask 的当前 subtask 2024-07-31 17:17:01 +08:00
zzyyyl
13b9afeb2c perf: 减少部分日志输出 2024-07-31 16:58:01 +08:00
Sherkey
e3c29d3e64 feat: HTTP2 (#9967) 2024-07-30 18:35:18 +08:00
status102
574546cba5 Revert "feat: 战斗流程协议命令块增强 (#9952)" 
This reverts commit 9e6e4fa5c0, reversing
changes made to 78aa0dd40a.
 2024-07-30 17:38:28 +08:00
萨拉托加
9e6e4fa5c0 feat: 战斗流程协议命令块增强 (#9952) 
[#9951](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9951)
 2024-07-30 15:54:10 +08:00
Weiyou Wang
78aa0dd40a fix: 修复debug模式在intel mac系统下无法通过编译的问题 (#9940) 
疑似bug原因为无法自动将 std::chrono::milliseconds 转换为 std::string
 2024-07-30 15:11:25 +10:00
SherkeyXD
8ba1d50cb7 feat: core上报任务使用HTTP2 2024-07-29 20:41:48 +08:00