fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 18:47:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,157 Commits 60 Branches 1,840 Tags
0850043642d2f2af9cbd17fac60c11ddc748e771
Commit Graph

281 Commits

Author SHA1 Message Date
Yifan Liu
0850043642 feat: JP Rogue friend support update (template & code) and various ignorelist update 2023-03-01 21:50:52 -06:00
Yifan Liu
4b5dc1aa95 Merge branch 'dev' into feat/ocr_replace_all 2023-02-28 22:47:40 -06:00
Yifan Liu
cfa5f65509 fix: fix build error 2023-02-28 12:25:15 -06:00
Yifan Liu
11d1060cad fix: fix replace_full not acting correctly on chars_name 2023-02-28 12:05:44 -06:00
xjdx
f400656af7 fix: #3816 2023-02-28 04:52:39 +00:00
Yifan Liu
ca306666ae fix: ocr equivalence class will not replace dst string 2023-02-26 21:57:53 -06:00
Yifan Liu
28bb886766 Merge branch 'dev' into feat/ocr_replace_all 2023-02-25 21:46:54 -06:00
MistEO
f4118a62b6 Merge pull request #3812 from MaaAssistantArknights/feat/rogue_recruit 
feat: 加速肉鸽招募时滑动
 2023-02-25 15:53:25 +08:00
MistEO
a2e673fdff Merge pull request #3795 from MaaAssistantArknights/feat/ocr_eq_class 
feat: OCR字符等价类支持
 2023-02-25 15:53:07 +08:00
MistEO
78fbe3aab0 Update src/MaaCore/Vision/OcrImageAnalyzer.cpp 2023-02-25 15:52:59 +08:00
MistEO
d9dee76080 Update src/MaaCore/Vision/OcrImageAnalyzer.cpp 2023-02-25 15:52:19 +08:00
Yifan Liu
9f3c611e4a refactor: directly call get_instance instead of using static OcrData 2023-02-24 16:33:37 -06:00
Yifan Liu
c11f78bf81 feat: change replace_full so it's set in tasks 
previously in set_replace
 2023-02-24 15:34:59 -06:00
Yifan Liu
e6fb13a8bb feat: add task replace_full 2023-02-24 15:34:38 -06:00
zzyyyl
0f52f73a11 Merge pull request #3773 from MaaAssistantArknights/clickcorner 
fix: 修复一些关卡结算界面的问题

fix #3758
fix #3803
 2023-02-24 20:21:47 +08:00
zzyyyl
5340114a73 style: 换个好函数名；代码格式化 2023-02-24 20:13:33 +08:00
zzyyyl
ee4740e6ed fix: 对使用 adb 的情况特殊处理 2023-02-24 08:33:55 +08:00
zzyyyl
3b2abc65b6 fix: 修复一些小问题 2023-02-23 23:04:58 +08:00
zzyyyl
8576b524a3 feat: 加速肉鸽招募时滑动 2023-02-23 22:42:23 +08:00
zzyyyl
04d9699fb4 fix: 修复一些修改任务名引起的问题 2023-02-23 19:10:00 +08:00
uye
4012725c72 refactor: 优化代码 2023-02-23 17:04:48 +08:00
zzyyyl
3f0636ac61 style: format 
请各位开发者统一代码风格！
```
python tools\ClangFormatter\clang-formatter.py --clang-format=YOUR\PATH\TO\clang-format.exe --input=src\MaaCore
python tools\ClangFormatter\clang-formatter.py --clang-format=YOUR\PATH\TO\clang-format.exe --input=src\resource
```
参考 https://maa.plus/docs/2.2-%E5%BC%80%E5%8F%91%E7%9B%B8%E5%85%B3.html#%E5%9C%A8-visual-studio-%E4%B8%AD%E5%90%AF%E7%94%A8-clang-format
 2023-02-23 10:00:51 +08:00
MistEO
31facbf47f Merge pull request #3762 from horror-proton/perf/tile_pack_parse 
perf: read tile data concurrently
 2023-02-23 00:39:49 +08:00
Horror Proton
19a3b57623 perf: read tile data concurrently 2023-02-22 10:54:04 +00:00
Yifan Liu
0ce25cac57 feat: OCR equivalence class 2023-02-22 00:48:11 -06:00
Horror Proton
c06edb25de feat: 实验性增加 OCR 字符等价类支持 2023-02-22 00:04:49 -06:00
zzyyyl
9cb07172b9 feat: 增加一些空白符 2023-02-22 13:10:18 +08:00
zzyyyl
cdd32b4dee feat: 对 # 运算的逻辑稍作调整 
允许 A#(next+sub), 表示 (A#next + A#sub)
 2023-02-22 12:01:14 +08:00
zzyyyl
472a8b2b5f feat: 对 @ 运算的逻辑稍作调整 
调整前: (...)@#none=#none, #none@(...)=#none
调整后: (...)@#none=(...), #none@(...)=(...)
 2023-02-22 11:57:04 +08:00
zzyyyl
e6dbaa955c perf: 结构优化 2023-02-22 11:01:53 +08:00
zzyyyl
2478aef083 feat: 增加一个虚任务 #none 
例：
```
"A": { "next": [ "#none+B" ] }
```
这个任务在增加前缀（如 `"D@A"`）时 next 不变。
 2023-02-22 11:01:53 +08:00
zzyyyl
d681bafeee feat: 简易的任务表达式运算 2023-02-22 11:01:53 +08:00
Yifan Liu
ea605c0bf7 feat: 涉及干员名称的ocrReplace更改为替换整个str 
比如["name", "名字"]，"name~"原来会被替换成"名字~"，现在则是"名字"
 2023-02-20 23:09:09 -06:00
xjdx
7198bc8311 fix: 修复"复核干员选择"的一些bug 2023-02-18 04:26:44 +08:00
MistEO
c42c8e40d9 fix: 调整一下日志等级 2023-02-17 17:37:20 +08:00
MistEO
030b479b7a fix: 为战斗干员头像识别，召唤物使用单独的阈值 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3735
 2023-02-17 17:37:10 +08:00
MistEO
ab7aa2d597 fix: 修复自定义基建不使用无人机的问题 2023-02-16 12:37:15 +08:00
MistEO
3212286c4b fix: 修复自动换班排序错误导致的干员冲突问题 
fix #3721
 2023-02-16 00:59:34 +08:00
MistEO
c17137c86c Merge branch 'dev' into xjdx 2023-02-15 21:42:55 +08:00
uye
c5cdc79545 Merge pull request #3684 from bigqiao/dev 
支持设置无限使用48小时内理智药
 2023-02-15 16:37:15 +08:00
LambdaLe
37dcb6fb12 feat: 生息演算 MAACore添加刷粗制赤金参数 
生息演算集成文档

修复mainModel变量名更改导致的编译错误
 2023-02-12 20:36:49 +08:00
LambdaLe
bd07609888 refactor: 重构生息演算，增强拓展性 
生息演算 修复若干bug
 2023-02-12 20:20:57 +08:00
wangli
7e1daae9d5 生息演算 添加黑市npc对话支持 2023-02-12 20:20:12 +08:00
wangli
24d866e355 improvement: BattleSkillReadyImageAnalyzer改为多目标检测并提供get_result api 2023-02-12 20:20:12 +08:00
bigqiao
7bbc1162a1 合并改动 2023-02-12 09:14:50 +08:00
bigqiao
ffd2123f05 MaaCore支持使用48小时内理智药 2023-02-11 14:28:45 +08:00
MistEO
5770d9fc0f Merge pull request #3652 from HerrCai0907/fix/Analyzer-set-roi-without-image 
fix: `Analyzer` should constructor with image and then set task info
 2023-02-11 04:55:24 +08:00
Congcong Cai
7eaa18b812 use Point instead PointRef 2023-02-11 04:33:55 +08:00
Congcong Cai
913bf4892c fix: all_melee_retreat 在使用迭代器遍历的同时删除元素导致SEGV 2023-02-11 00:26:04 +08:00
uye
c3703f6851 chore: 优化sleep检查退出的间隔时间 2023-02-10 23:28:22 +08:00