Commit Graph

5050 Commits

Author SHA1 Message Date
MistEO
d9dcbb6289 chore: breaking rename 2022-12-02 00:22:47 +08:00
MistEO
8ff2c5e1d0 fix: 修复项目配置错误 2022-12-02 00:14:59 +08:00
MistEO
a17b75c50b fix: 尝试修复检查更新弹窗炸了的问题 2022-12-02 00:14:59 +08:00
MistEO
c040584e18 Merge pull request #2970 from MaaAssistantArknights/refactor/SwipeToStage
refactor: 优化活动关卡导航
2022-12-01 23:08:32 +08:00
MistEO
eb28782254 chore: 重命名vs工程 2022-12-01 23:00:31 +08:00
MistEO
a50d9c5356 fix: 修复掉落关卡识别错误 2022-12-01 22:26:01 +08:00
MistEO
256a84fdd2 fix: res error 2022-12-01 22:24:47 +08:00
MistEO
51c6d53be3 chore: blame ignore 2022-12-01 22:15:07 +08:00
MistEO
46f2cf9798 chore: 重命名cs文件目录结构 2022-12-01 22:14:16 +08:00
MistEO
3ca7706ff2 fix: 再次尝试修复肉鸽不期而遇放弃的问题 2022-12-01 22:13:59 +08:00
MistEO
28998239a6 fix: Win CI error 2022-12-01 21:19:23 +08:00
uye
c0ec13cba7 refactor: 优化活动关卡导航 2022-12-01 20:49:26 +08:00
MistEO
ef44e718cd chore: 重命名vs工程 2022-12-01 20:46:21 +08:00
MistEO
94d1b7ae6a chore: 调整项目结构,更新文档 2022-12-01 20:34:18 +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