fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 09:50:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,044 Commits 61 Branches 1,837 Tags
c3683724f6afb36d61ba75cb72ec64a19c67e78e
Commit Graph

5044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ChildeRolando
c3683724f6 Update 3.1-集成文档.md 
修改了错别字
 2022-12-05 02:27:50 +01:00
MistEO
abbf2ac020 Merge pull request #2974 from MaaAssistantArknights/release/v4.8.0-beta.2 
Release v4.8.0-beta.2
 2022-12-02 01:12:57 +08:00
MistEO
83899ae590 docs: update changelog 2022-12-02 01:12:47 +08:00
MistEO
95f64821f2 fix: 修复连接断开重连后不使用minitouch的问题 2022-12-02 01:09:37 +08:00
MistEO
7ed29d86f2 fix: 尝试修复检查更新弹窗炸了的问题 2022-12-02 01:09:15 +08:00
MistEO
35b815da72 fix: 修复掉落关卡识别错误 2022-12-02 01:09:03 +08:00
MistEO
be4e441ad0 fix: 再次尝试修复肉鸽不期而遇放弃的问题 2022-12-02 01:08:54 +08:00
uye
d0a82eae50 refactor: 优化活动关卡导航 2022-12-02 01:08:44 +08:00
MistEO
d994e10998 Merge pull request #2968 from MaaAssistantArknights/dev 
Release v4.8.0-beta.1
 2022-12-01 20:04:29 +08:00
MistEO
23693bae57 docs: update changelog 2022-12-01 20:04:18 +08:00
MistEO
24f3b8c5e1 fix: 修复一些干员名识别错误 2022-12-01 19:53:23 +08:00
MistEO
20f2ae17c8 fix: 修复借助战卡住的问题，修复一个编译错误 2022-12-01 19:49:05 +08:00
uye
271e3afd9f fix: 风雪过境活动导航错误 2022-12-01 19:39:53 +08:00
MistEO
c586f425eb perf: 删除过时的打包信息 2022-12-01 19:11:46 +08:00
MistEO
5348d41af2 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-12-01 17:24:06 +08:00
MistEO
85caec465f fix: 修复部分unique_ptr没初始化的问题 2022-12-01 17:23:44 +08:00
MistEO
f87eb0a0d7 Merge pull request #2964 from WWPXX233/master 
修改艾莉妮为一技能
 2022-12-01 17:19:49 +08:00
MistEO
166204f116 feat: 新增支持设置ocr后端类型 2022-12-01 17:18:53 +08:00
WWPXX
d50b0ddb10 修改艾莉妮为一技能 
二技能在范围内没有怪无法释放会重复点击
 2022-12-01 16:29:51 +08:00
uye
a1a03720a3 fix: 修复一个主线导航错误 2022-12-01 01:54:49 +08:00
MistEO
1314b4825a Merge pull request #2957 from 178619/dev 
fix: fix visiting and add more ocrReplaces for KR
 2022-11-30 21:09:10 +08:00
MistEO
4fb15bfc20 Merge pull request #2950 from Hydrogina/dev 
fix: 修复借助战刷信用无法进图 #2947
 2022-11-30 21:09:00 +08:00
Clock
0e62fb2dda more ocrReplaces 2022-11-30 21:19:52 +09:00
Clock
d8596e33f8 fix: fixed visiting and added more ocrReplaces to KR 2022-11-30 16:36:47 +09:00
Hydrogina
e39c79f5e8 fix: 修复借助战刷信用无法进图 #2947 
fix: 修复OF-1未开启情况下信用任务卡住&功能说明不明确 #2949
 2022-11-30 13:06:44 +08:00
Hydrogina
9a066d16b2 fix: 修复借助战刷信用无法进图 #2947 
fix: 修复OF-1未开启情况下信用任务卡住&功能说明不明确 #2949
 2022-11-30 13:03:00 +08:00
MistEO
1d75b7d9e2 Merge pull request #2941 from MaaAssistantArknights/dev 
Release v4.8.0-alpha.1
 2022-11-29 21:51:02 +08:00
MistEO
3804359344 docs: fix docs 2022-11-29 21:49:50 +08:00
MistEO
a4b5b25401 docs: update changelog 2022-11-29 21:43:10 +08:00
MistEO
c168ecc39d Merge pull request #2935 from Hydrogina/dev 
fix: 修复借助战作战失败后卡住的问题
 2022-11-29 21:18:05 +08:00
MistEO
64478585f1 Merge pull request #2940 from 178619/dev 
Yostar KR Support
 2022-11-29 21:14:20 +08:00
Clock
006f0be12c Yostar KR Support 2022-11-29 20:11:14 +09:00
uye
2b63693c55 docs: Update 3.4-任务流程协议.md 2022-11-29 17:45:22 +08:00
uye
44ea3ce446 fix: 修复主线关卡导航 2022-11-29 17:27:14 +08:00
Horror Proton
5ee36d5eab fix: set OPENCV_DIRECTORY for patched FastDeploy.cmake 2022-11-29 16:15:35 +08:00
Hydrogina
ba4b058363 fix: 修复借助战作战失败后卡住的问题 使用baseTask 2022-11-29 15:40:16 +08:00
Hydrogina
bf46e2429b fix: 修复借助战作战失败后卡住的问题 2022-11-29 10:47:38 +08:00
MistEO
877e82ab61 Merge branch 'master' into dev 2022-11-29 01:32:57 +08:00
MistEO
5144acd119 fix: drops rec error 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2894
 2022-11-29 00:41:49 +08:00
MistEO
c15a145627 fix: 修复水月肉鸽不期而遇放弃的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2895
 2022-11-29 00:18:42 +08:00
MistEO
00037aa8f5 Merge pull request #2931 from MaaAssistantArknights/release/v4.7.3 
Release v4.7.3
 2022-11-29 00:03:01 +08:00
MistEO
d59cbe7c7e docs: update changelog 2022-11-29 00:02:22 +08:00
MistEO
bb01defc1c fix: merge error 2022-11-28 23:57:20 +08:00
MistEO
d10034da02 refactor: 重构minitouch的选择逻辑 2022-11-28 23:54:18 +08:00
MistEO
fd97f7e201 feat: 新增maatouch配置项，修复资源路径错误问题 2022-11-28 23:53:46 +08:00
MistEO
329587f81d perf: 优化一点自动作战逻辑，优化adb滑动延迟 2022-11-28 23:51:00 +08:00
MistEO
cccbee20be fix: 修复自动战斗自动编队偶尔失败的问题 2022-11-28 20:58:57 +08:00
MistEO
4314156182 Merge pull request #2918 from horror-proton/test/onnx_linux 
feat: 更新 `CMakeLists.txt`
 2022-11-28 19:40:43 +08:00
uye
a1527f31f9 Merge pull request #2925 from 178619/dev 
core docs localization for KR
 2022-11-28 15:43:56 +08:00
Clock
2f223d4472 core docs localization for KR 2022-11-28 16:33:26 +09:00