fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 02:23:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,733 Commits 62 Branches 1,839 Tags
f7d9856c852f3cdca50c83441be05d71c949b761
Commit Graph

1394 Commits

Author SHA1 Message Date
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
zzyyyl
92f24ec988 feat!: 拆分 maskRange 与 colorScales；增加 colorWithClose 开关数色时闭运算 2024-08-17 01:22:17 +08:00
Constrat
5ef663af0d chore: subtask iteration output tweak 2024-08-13 16:25:28 +02:00
Weiyou Wang
bf10bcdaa6 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
de8ba8af63 fix: 修复部分设备萨卡兹肉鸽商店 StageTraderEnter 得分过低 
fix #10160
 2024-08-12 12:56:16 +08:00
zzyyyl
d719a81d1c feat: 数色前先通过闭运算填充小空洞，避免数色的得分过低 2024-08-12 12:54:56 +08:00
uye
736f836232 chore: 减少debug下截图数量最大值 2024-08-11 23:51:38 +08:00
status102
f47020ce7f chore: task name 
[skip changelog]
 2024-08-11 09:17:23 +08:00
Rbqwow
d120a04206 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
3994e845ad 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
c82aeb0256 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
87b01d90f8 chore: 为肉鸽编队滑页触底判定的代码添加注释 (#10156) 2024-08-09 11:08:47 +08:00
Weiyou Wang
f50ab269d7 fix: 修改肉鸽编队滑页触底判断 (#9243, #9328) (#10116) 
fix: 修改肉鸽编队滑页触底判断
 2024-08-08 02:22:21 +08:00
status102
a3173eb04c perf: 合并肉鸽插件中止控制 2024-08-07 12:06:43 +08:00
status102
0e6ed98b68 chore: 简化肉鸽刷塌缩范式的日志输出 2024-08-07 00:07:18 +08:00
uye
f89b59e680 fix: 开启 MuMu 截图增强后重启模拟器未重启 MAA 后出现截图失败 
fix #10110
 2024-08-06 18:34:41 +08:00
zzyyyl
8eec24a15c feat: 删除 action ClickRand (#10003) 2024-08-03 09:35:43 +08:00
zzyyyl
58f44d8fb8 perf: log prints non-empty ocr_replace results 
related to dedc3c7d4a
 2024-08-02 21:10:25 +08:00
uye
bc1c01a1bc fix: fix smoking-test 2024-08-02 14:37:39 +08:00
Horror Proton
837c5bc04a feat: fallback to General config 2024-08-02 13:32:51 +08:00
Lancarus
fe7cc5f7b0 feat: 增加一些肉鸽参数 (#9875) 
* feat: 增加一些肉鸽参数

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

* fix: 重复定义、注释空函数
 2024-07-31 18:43:59 +08:00
zzyyyl
cf87918d79 perf: 增加日志输出 PackageTask 的当前 subtask 2024-07-31 17:17:01 +08:00
zzyyyl
dedc3c7d4a perf: 减少部分日志输出 2024-07-31 16:58:01 +08:00
Sherkey
724ce1f541 feat: HTTP2 (#9967) 2024-07-30 18:35:18 +08:00
status102
68f463760a Revert "feat: 战斗流程协议命令块增强 (#9952)" 
This reverts commit 10eac1ffc6, reversing
changes made to 7476bb67a1.
 2024-07-30 17:38:28 +08:00
萨拉托加
10eac1ffc6 feat: 战斗流程协议命令块增强 (#9952) 
[#9951](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9951)
 2024-07-30 15:54:10 +08:00
Weiyou Wang
7476bb67a1 fix: 修复debug模式在intel mac系统下无法通过编译的问题 (#9940) 
疑似bug原因为无法自动将 std::chrono::milliseconds 转换为 std::string
 2024-07-30 15:11:25 +10:00
SherkeyXD
87bc5cf235 feat: core上报任务使用HTTP2 2024-07-29 20:41:48 +08:00
ValenciaFly
1efd262315 fix: 修复某个环节使用range操作后，数据属性由int->int64_t导致的编译警告 2024-07-29 17:46:37 +08:00
ValenciaFly
89ac713d92 fix: 消除linux下门禁的编译提示 2024-07-29 16:49:29 +08:00
zzyyyl
4f88127091 style: 删除过期注释 
[skip changelog] [skip ci]
 2024-07-29 15:24:57 +08:00
ValenciaFly
c8f2696d4c fix: 修复Linux/MacOS下关于PointInfo的编译问题 2024-07-29 15:16:27 +08:00
ValenciaFly
557329075f fix: 更新一些操作的中文命名，当锚点不匹配时新增退出条件作为保护 2024-07-29 14:41:26 +08:00