fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 10:32:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,813 Commits 61 Branches 1,840 Tags
c71a2fca1f519a1e12e1294de133c33a4f4ffebc
Commit Graph

1912 Commits

Author SHA1 Message Date
Yifan Liu
030b0db936 Merge branch 'dev' into feat/activity_ota 2023-03-04 11:48:56 -06:00
zzyyyl
5752ea5e66 feat: 修复战斗过程卡住的问题 
PrtsErrorConfirm 出不去的时候用 WaitAfterPRTS 兜住

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3841
 2023-03-04 21:35:56 +08:00
Yifan Liu
218f6ccc5d chore: remove DH resources (which will be ota) 2023-03-04 00:45:41 -06:00
MistEO
d01fe0b033 Merge pull request #3862 from DaysGone233/patch-1 
feat: 自动公招时增加掉线识别
 2023-03-04 03:35:53 +08:00
LambdaLe
a13a1c8bb0 fix: 修复 肉鸽助战 刷新按钮ocr不能部分匹配及刷新时间识别错误问题 2023-03-03 13:39:10 +08:00
DaysGone233
1084287fb5 Merge branch 'dev' into patch-1 2023-03-03 01:14:24 +08:00
Yifan Liu
2ea28f37e6 fix: JP IS(rogue) friend support oper 
refresh support list is yet to be fixed
 2023-03-01 22:43:34 -06:00
Yifan Liu
1feff43e37 feat: JP Rogue friend support update (template & code) and various ignorelist update 2023-03-01 21:50:52 -06:00
Yifan Liu
250a94f8f6 feat: JP DH-9 Navigation多索雷斯导航 2023-03-01 21:23:20 -06:00
DaysGone233
29b863765a Add offline confirm in recruting 2023-03-02 10:16:03 +08:00
Yifan Liu
820c34a69d fix: infrast oper name ocr issue on JP 
enlarge the roi so it exactly covers the area of the name
 2023-03-01 19:33:26 -06:00
Yifan Liu
c0a062cb95 fix: JP IS specific stage stuck 
enlarge roi of dps enter

should fix #3842 #3714
 2023-02-28 23:43:45 -06:00
Yifan Liu
c921534eb9 Merge branch 'dev' into feat/ocr_replace_all 2023-02-28 22:47:40 -06:00
Yifan Liu
61841dcfff fix: minor update of JP json 2023-02-28 20:45:05 -06:00
cenfusheng
2b0e574121 修复重岳的识别错误 
修复重岳识别为重岳-的错误，按照令的经验，应还有可能识别为重岳——，一并修复。
皮肤怎么那么多疑似白色横线的地方啊【指指点点】
 2023-02-28 14:29:59 +08:00
Yifan Liu
bc8d7d0acc feat: update JP ocr equivalence class and operator ocrreplace json 2023-02-27 15:49:16 -06:00
MistEO
7c784241ef Merge pull request #3809 from yd278/dev 
feat: 更新至公孙长乐最新基建排班
 2023-02-27 17:28:21 +08:00
Yifan Liu
5105398eae feat: set JP ocr_replace to full_replace 2023-02-26 17:25:02 -06:00
MistEO
46f21cebd8 docs: 修改关于外服功能支持的描述 2023-02-26 23:48:28 +08:00
Yifan Liu
c5e28aee76 Merge branch 'dev' into feat/ocr_replace_all 2023-02-25 21:46:54 -06:00
Yifan Liu
0b00d754bd feat: support of auto using 48h- potion for EN server & reorder json 2023-02-25 18:04:36 -06:00
Yifan Liu
a8701f65b9 feat: support of auto using 48h- potion for JP server 2023-02-25 18:04:17 -06:00
Y. Ding
a3c054df47 新增一图流生成243极限效率基建作业 2023-02-25 00:17:27 -08:00
Y. Ding
71e6c47184 Revert "将内置243作业更新为一图流生成器版" 
This reverts commit d8f1f73814.
 2023-02-25 00:13:19 -08:00
MistEO
b1e65bac67 Merge pull request #3812 from MaaAssistantArknights/feat/rogue_recruit 
feat: 加速肉鸽招募时滑动
 2023-02-25 15:53:25 +08:00
MistEO
a63f3e891d Merge pull request #3795 from MaaAssistantArknights/feat/ocr_eq_class 
feat: OCR字符等价类支持
 2023-02-25 15:53:07 +08:00
Y. Ding
d8f1f73814 将内置243作业更新为一图流生成器版 2023-02-24 21:05:06 -08:00
Y. Ding
957a855068 fix indents 2023-02-24 20:40:54 -08:00
zzyyyl
546ce041f7 Merge pull request #3773 from MaaAssistantArknights/clickcorner 
fix: 修复一些关卡结算界面的问题

fix #3758
fix #3803
 2023-02-24 20:21:47 +08:00
zzyyyl
3e585d1563 fix: 修复一些小问题 2023-02-23 23:04:58 +08:00
zzyyyl
0e0b6847df feat: 加速肉鸽招募时滑动 2023-02-23 22:42:23 +08:00
zzyyyl
cbf1ae39f9 fix: 修复肉鸽招募有时漏干员的问题 
可能引入一个新的问题：靠后的干员在之前能招募到，改完招募不到了。这个问题可以通过修改滑动上限解决，不过感觉影响不大，先不做改动

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3811
 2023-02-23 21:28:18 +08:00
uye
e0d4e6dca2 refactor: 简化关卡导航写法 2023-02-23 21:02:05 +08:00
zzyyyl
c60028d84d fix: 修复一些修改任务名引起的问题 2023-02-23 19:10:00 +08:00
Y. Ding
716dc5bc2d 更新至公孙长乐最新排班 
公孙长乐于1月20日动态（https://www.bilibili.com/opus/752809936429252680）中对原排班稍有修改，2月21日视频（https://www.bilibili.com/video/BV1EM411c7Ng）再次提到新排班
 2023-02-23 01:46:29 -08:00
zzyyyl
4d61950d7e 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
zzyyyl
122893ff88 perf: 简化 PRTS 相关任务 2023-02-23 09:17:36 +08:00
zzyyyl
1c78a3ccc4 perf: 使用任务表达式的语法优化 ClickCorner 相关任务 2023-02-23 09:17:27 +08:00
zzyyyl
33e3c31862 fix: 调整 ClickCorner 相关任务，将重试次数从原来的 2 次提高到 5 次 2023-02-23 09:17:07 +08:00
Yifan Liu
25f90e71d8 fix: move json to JP folder 2023-02-22 18:30:15 -06:00
zzyyyl
8f51145d81 feat: 重命名 Loading、 Loading2 相关任务 
将 Loading 任务重命名为 LoadingText，Loading2 任务重命名为 LoadingIcon 方便区分
 2023-02-23 08:18:16 +08:00
zzyyyl
670a71ed84 fix: 删除一段可能导致问题的代码 
ClickCorner 这个任务只会在 EndOfAction 等 掉落识别 的任务结束后调用。
这里若出现差错导致没有进入前面的任务而是再次进入 EndOfAction 任务（例如 ClickCorner 的点击失效导致停留在结算界面），可能会导致重复识别
 2023-02-23 08:18:07 +08:00
zzyyyl
6ee8567c27 feat: 删除一段冗余代码 2023-02-23 08:14:13 +08:00
Yifan Liu
b71edb9477 feat: OCR equivalence class 2023-02-22 00:48:11 -06:00
MistEO
134a778136 fix: 修复基建宿舍选择状态识别错误 2023-02-21 21:15:10 +08:00
MistEO
dcb7d9b765 chore: 更新地图数据 2023/02/21 2023-02-21 19:12:39 +08:00
uye
71d5b9b3fa feat: 支持吾导先路活动导航 2023-02-21 17:03:31 +08:00
Yifan Liu
1e8690faa6 chore: 外服json部分修正 2023-02-20 23:12:57 -06:00
MistEO
eeb7c303fc fix: 优化自动战斗开始按钮的识别 2023-02-19 18:54:44 +08:00
MistEO
288fd16a9f fix: 修复基建宿舍红脸干员不被选择问题 2023-02-18 17:42:11 +08:00