Commit Graph

5086 Commits

Author SHA1 Message Date
MistEO
3d83b80dd6 chore: breaking rename 2022-12-02 00:22:47 +08:00
MistEO
5abf4f0c1c fix: 修复项目配置错误 2022-12-02 00:14:59 +08:00
MistEO
9d8d5f705f fix: 尝试修复检查更新弹窗炸了的问题 2022-12-02 00:14:59 +08:00
MistEO
f7f3d10677 Merge pull request #2970 from MaaAssistantArknights/refactor/SwipeToStage
refactor: 优化活动关卡导航
2022-12-01 23:08:32 +08:00
MistEO
ec87edc15e chore: 重命名vs工程 2022-12-01 23:00:31 +08:00
MistEO
c0f2c74d94 fix: 修复掉落关卡识别错误 2022-12-01 22:26:01 +08:00
MistEO
8ec26208e0 fix: res error 2022-12-01 22:24:47 +08:00
MistEO
4e5bd87fb1 chore: blame ignore 2022-12-01 22:15:07 +08:00
MistEO
bae271c09b chore: 重命名cs文件目录结构 2022-12-01 22:14:16 +08:00
MistEO
0af4042eee fix: 再次尝试修复肉鸽不期而遇放弃的问题 2022-12-01 22:13:59 +08:00
MistEO
053a8843a9 fix: Win CI error 2022-12-01 21:19:23 +08:00
uye
5d0634e691 refactor: 优化活动关卡导航 2022-12-01 20:49:26 +08:00
MistEO
f5ffe1bd8d chore: 重命名vs工程 2022-12-01 20:46:21 +08:00
MistEO
bedb25eb7e chore: 调整项目结构,更新文档 2022-12-01 20:34:18 +08:00
MistEO
8dd6ddb514 Merge pull request #2968 from MaaAssistantArknights/dev
Release v4.8.0-beta.1
v4.8.0-beta.1
2022-12-01 20:04:29 +08:00
MistEO
a319c3c35e docs: update changelog 2022-12-01 20:04:18 +08:00
MistEO
cf1d3132ac fix: 修复一些干员名识别错误 2022-12-01 19:53:23 +08:00
MistEO
27752e6214 fix: 修复借助战卡住的问题,修复一个编译错误 2022-12-01 19:49:05 +08:00
MistEO
c6b98d2f41 chore: 更新地图和关卡数据 2022-12-01 19:49:05 +08:00
uye
7874fd0e65 fix: 风雪过境活动导航错误 2022-12-01 19:39:53 +08:00
MistEO
8256205a47 perf: 删除过时的打包信息 2022-12-01 19:11:46 +08:00
MistEO
92356c097b Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-12-01 17:24:06 +08:00
MistEO
e62d0804db fix: 修复部分unique_ptr没初始化的问题 2022-12-01 17:23:44 +08:00
MistEO
84c49f193e Merge pull request #2964 from WWPXX233/master
修改艾莉妮为一技能
2022-12-01 17:19:49 +08:00
MistEO
d210e8b409 feat: 新增支持设置ocr后端类型 2022-12-01 17:18:53 +08:00
WWPXX
1e8e36249a 修改艾莉妮为一技能
二技能在范围内没有怪无法释放会重复点击
2022-12-01 16:29:51 +08:00
uye
f4cf8ed9d8 fix: 修复一个主线导航错误 2022-12-01 01:54:49 +08:00
MistEO
cc5db25fe5 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
984db76c2d Merge pull request #2950 from Hydrogina/dev
fix: 修复借助战刷信用无法进图 #2947
2022-11-30 21:09:00 +08:00
Clock
6350b23477 more ocrReplaces 2022-11-30 21:19:52 +09:00
Clock
c44f4b90d8 fix: fixed visiting and added more ocrReplaces to KR 2022-11-30 16:36:47 +09:00
Hydrogina
df7ecaac7a fix: 修复借助战刷信用无法进图 #2947
fix: 修复OF-1未开启情况下信用任务卡住&功能说明不明确 #2949
2022-11-30 13:06:44 +08:00
Hydrogina
4235ce9358 fix: 修复借助战刷信用无法进图 #2947
fix: 修复OF-1未开启情况下信用任务卡住&功能说明不明确 #2949
2022-11-30 13:03:00 +08:00
MistEO
b81d53ee48 Merge pull request #2941 from MaaAssistantArknights/dev
Release v4.8.0-alpha.1
v4.8.0-alpha.1
2022-11-29 21:51:02 +08:00
MistEO
d6d2313f5b docs: fix docs 2022-11-29 21:49:50 +08:00
MistEO
0441493a34 chore: 更新fastdeploy到fed3cfc (仍然替换了yaml-cpp) 2022-11-29 21:49:43 +08:00
MistEO
68fa1548f9 docs: update changelog 2022-11-29 21:43:10 +08:00
MistEO
5885abc550 Merge pull request #2935 from Hydrogina/dev
fix: 修复借助战作战失败后卡住的问题
2022-11-29 21:18:05 +08:00
MistEO
82973d9383 Merge pull request #2940 from 178619/dev
Yostar KR Support
2022-11-29 21:14:20 +08:00
Clock
a7926263e9 Yostar KR Support 2022-11-29 20:11:14 +09:00
uye
e5206bbe96 docs: Update 3.4-任务流程协议.md 2022-11-29 17:45:22 +08:00
uye
32fa9bd98c fix: 修复主线关卡导航 2022-11-29 17:27:14 +08:00
Horror Proton
d1c6d00baf fix: set OPENCV_DIRECTORY for patched FastDeploy.cmake 2022-11-29 16:15:35 +08:00
Hydrogina
2f30cae07a fix: 修复借助战作战失败后卡住的问题 使用baseTask 2022-11-29 15:40:16 +08:00
Hydrogina
8da3e972cc fix: 修复借助战作战失败后卡住的问题 2022-11-29 10:47:38 +08:00
MistEO
f8ac05037f Merge branch 'master' into dev 2022-11-29 01:32:57 +08:00
MistEO
b465d23127 fix: drops rec error
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2894
2022-11-29 00:41:49 +08:00
MistEO
14f9ca6ad3 fix: 修复水月肉鸽不期而遇放弃的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2895
2022-11-29 00:18:42 +08:00
MistEO
0f704d2ebf Merge pull request #2931 from MaaAssistantArknights/release/v4.7.3
Release v4.7.3
v4.7.3
2022-11-29 00:03:01 +08:00
MistEO
e1c744c139 docs: update changelog 2022-11-29 00:02:22 +08:00