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,306 Commits 60 Branches 1,840 Tags
b4feba3ff424643efcc48d17ecf10bdefbfd5909
Commit Graph

1789 Commits

Author SHA1 Message Date
MistEO
d322525b1a fix: 修复泰拉大陆调查团 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3927
 2023-03-10 11:10:24 +08:00
MistEO
d949ed92fb perf: 更新技能ready识别模型 2023-03-10 00:58:35 +08:00
yuanyan3060
d92e77fcce chore: Update act24side_09-activities-act24side-level_act24side_09.json (#3919) 
Co-authored-by: MistEO <mistereo@hotmail.com>
 2023-03-09 01:08:39 +08:00
MistEO
2b47726435 fix: 修复 CF-9 地图格子错误 2023-03-09 00:36:52 +08:00
MistEO
286a7cedf3 perf: 优化战斗中技能识别，改用深度学习模型 (#3918) 
* feat: 战斗中技能使用ort识别

* fix: 修正技能识别的错误

* feat: 当技能识别置信度过低时，保存debug图片

* fix: build error for onnx runtime

* fix: build error on linux

* perf: onnx path

* fix: build error

* fix: onnx build error
 2023-03-08 21:55:57 +08:00
uye
c0f25f28cc feat: 添加活动导航 2023-03-07 21:16:41 +08:00
MistEO
8c790e4925 chore: 更新资源 2023/3/7 2023-03-07 10:52:01 +08:00
LambdaLe
d4dcc466bc fix: 修复 肉鸽助战 招募后卡在干员立绘界面的问题 2023-03-06 18:15:32 +08:00
Yifan Liu
9938c0d542 Merge branch 'dev' into feat/activity_ota 2023-03-05 21:52:02 -06:00
MistEO
041e2e1ddf chore: 更新剿灭资源；更新ResourceUpdater依赖 2023-03-05 20:13:46 +08:00
Yifan Liu
76b8d52457 fix: JP 48h medicine recognition issue 2023-03-04 16:51:44 -06:00
Yifan Liu
65c0aad77c Merge branch 'dev' into feat/activity_ota 2023-03-04 11:48:56 -06:00
zzyyyl
444998b64e feat: 修复战斗过程卡住的问题 
PrtsErrorConfirm 出不去的时候用 WaitAfterPRTS 兜住

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3841
 2023-03-04 21:35:56 +08:00
Yifan Liu
9e54a958f3 chore: remove DH resources (which will be ota) 2023-03-04 00:45:41 -06:00
MistEO
c2938bebdd Merge pull request #3862 from DaysGone233/patch-1 
feat: 自动公招时增加掉线识别
 2023-03-04 03:35:53 +08:00
LambdaLe
6f4fc8fa91 fix: 修复 肉鸽助战 刷新按钮ocr不能部分匹配及刷新时间识别错误问题 2023-03-03 13:39:10 +08:00
DaysGone233
f705069ddb Merge branch 'dev' into patch-1 2023-03-03 01:14:24 +08:00
Yifan Liu
22b4581287 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
0850043642 feat: JP Rogue friend support update (template & code) and various ignorelist update 2023-03-01 21:50:52 -06:00
Yifan Liu
6246287c0d feat: JP DH-9 Navigation多索雷斯导航 2023-03-01 21:23:20 -06:00
DaysGone233
dbe2f88c1a Add offline confirm in recruting 2023-03-02 10:16:03 +08:00
Yifan Liu
a673fd9cfb 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
618bebe7f7 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
4b5dc1aa95 Merge branch 'dev' into feat/ocr_replace_all 2023-02-28 22:47:40 -06:00
Yifan Liu
e0548229a0 fix: minor update of JP json 2023-02-28 20:45:05 -06:00
cenfusheng
807a5c9922 修复重岳的识别错误 
修复重岳识别为重岳-的错误，按照令的经验，应还有可能识别为重岳——，一并修复。
皮肤怎么那么多疑似白色横线的地方啊【指指点点】
 2023-02-28 14:29:59 +08:00
Yifan Liu
353ad8fadf feat: update JP ocr equivalence class and operator ocrreplace json 2023-02-27 15:49:16 -06:00
MistEO
df77f22606 Merge pull request #3809 from yd278/dev 
feat: 更新至公孙长乐最新基建排班
 2023-02-27 17:28:21 +08:00
Yifan Liu
2d51be4a48 feat: set JP ocr_replace to full_replace 2023-02-26 17:25:02 -06:00
MistEO
bbcd454938 docs: 修改关于外服功能支持的描述 2023-02-26 23:48:28 +08:00
Yifan Liu
28bb886766 Merge branch 'dev' into feat/ocr_replace_all 2023-02-25 21:46:54 -06:00
Yifan Liu
8160deb790 feat: support of auto using 48h- potion for EN server & reorder json 2023-02-25 18:04:36 -06:00
Yifan Liu
eec6611d7e feat: support of auto using 48h- potion for JP server 2023-02-25 18:04:17 -06:00
Y. Ding
618a79c15b 新增一图流生成243极限效率基建作业 2023-02-25 00:17:27 -08:00
Y. Ding
45e64e9ce8 Revert "将内置243作业更新为一图流生成器版" 
This reverts commit 5e7b9047d9.
 2023-02-25 00:13:19 -08: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
Y. Ding
5e7b9047d9 将内置243作业更新为一图流生成器版 2023-02-24 21:05:06 -08:00
Y. Ding
8138dcac5f fix indents 2023-02-24 20:40:54 -08:00
zzyyyl
0f52f73a11 Merge pull request #3773 from MaaAssistantArknights/clickcorner 
fix: 修复一些关卡结算界面的问题

fix #3758
fix #3803
 2023-02-24 20:21:47 +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
3d15a5fddf fix: 修复肉鸽招募有时漏干员的问题 
可能引入一个新的问题：靠后的干员在之前能招募到，改完招募不到了。这个问题可以通过修改滑动上限解决，不过感觉影响不大，先不做改动

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3811
 2023-02-23 21:28:18 +08:00
uye
56d860182b refactor: 简化关卡导航写法 2023-02-23 21:02:05 +08:00
zzyyyl
04d9699fb4 fix: 修复一些修改任务名引起的问题 2023-02-23 19:10:00 +08:00
Y. Ding
e2d40e0ec3 更新至公孙长乐最新排班 
公孙长乐于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
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
zzyyyl
4e925a7b25 perf: 简化 PRTS 相关任务 2023-02-23 09:17:36 +08:00
zzyyyl
6ba171f529 perf: 使用任务表达式的语法优化 ClickCorner 相关任务 2023-02-23 09:17:27 +08:00
zzyyyl
5b3b470954 fix: 调整 ClickCorner 相关任务，将重试次数从原来的 2 次提高到 5 次 2023-02-23 09:17:07 +08:00