fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 02:10:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,976 Commits 61 Branches 1,838 Tags
4b3b84df8f487be0ac86506c28dbebc4635f1282
Commit Graph

4976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
4b3b84df8f refactor: Rename Configer -> Config 2022-11-25 23:31:30 +08:00
MistEO
f9e6dd3e5a refactor: 重构 PackageTask 2022-11-25 23:16:29 +08:00
MistEO
a92cb7b5d3 fix: 修复 filter 错误 2022-11-25 21:18:47 +08:00
MistEO
9e5337d240 Merge pull request #2849 from Hydrogina/dev 
feat: 添加借助战作战赚信用功能
 2022-11-25 21:10:35 +08:00
MistEO
c6cdd30f4f chore: 优化一点点逻辑 2022-11-25 21:02:34 +08:00
MistEO
416c05bca1 chore: 加点日志 2022-11-25 20:55:46 +08:00
MistEO
44de3ef45b Merge pull request #2897 from MaaAssistantArknights/revert-2893-dev 
Revert "更新 夜神模拟器 介绍"
 2022-11-25 20:53:21 +08:00
MistEO
423dbdae70 Revert "更新 夜神模拟器 介绍" 2022-11-25 20:52:58 +08:00
MistEO
a4198da68d fix: 修复开始战斗后delay的缓存不生效的问题 2022-11-25 20:51:19 +08:00
DavidWang19
f14576bd59 Merge pull request #2893 from ntgmc/dev 
更新 夜神模拟器 介绍
 2022-11-25 12:46:27 +00:00
MistEO
10bb86dc98 fix: 修复极端情况下不停掉落识别的问题 2022-11-25 20:19:08 +08:00
MAA无情关ISSUE人
32f6fc0d35 更新 夜神模拟器 介绍 
这个真的挺多人反馈的
 2022-11-25 16:03:23 +08:00
Horror Proton
2d1196849c fix: update ocr replace list 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2885
 2022-11-25 15:53:06 +08:00
Hydrogina
2360bbcbb1 feat:借助战作战使用AbstractTask 2022-11-25 11:35:17 +08:00
MistEO
7e14dc8e6a Merge pull request #2888 from WWPXX233/patch-1 
优化育生池干员朝向
 2022-11-25 00:37:10 +08:00
WWPXX
313b19b894 优化育生池干员朝向 2022-11-24 22:43:05 +08:00
MistEO
b00bee5745 fix: build error 2022-11-24 20:56:46 +08:00
MistEO
617d50080f Revert "fix: 修复VS上编辑器的红线" 
This reverts commit c361426dc0.
 2022-11-24 20:52:13 +08:00
Horror Proton
95b265ed4d fix: update ocr replace list 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2885
 2022-11-24 19:06:32 +08:00
Hydrogina
86c052aa82 feat: 借助战作战从json中读取关卡名 2022-11-24 19:01:33 +08:00
Hydrogina
b3c209a235 feat: 在CopilotTask中添加参数support_unit_name 2022-11-24 17:28:47 +08:00
MistEO
c361426dc0 fix: 修复VS上编辑器的红线 
其实是把红线换了个地方
 2022-11-24 17:26:36 +08:00
Hydrogina
5af2011055 feat: 修正resource_dir 2022-11-24 16:43:01 +08:00
Hydrogina
61bc4f2da4 feat: 添加借助战作战Tips 2022-11-24 15:44:58 +08:00
MistEO
e2f4cbff29 fix: 修复夜神模拟器偶尔截个黑屏的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2882
 2022-11-24 15:09:57 +08:00
MistEO
2b1cc4796e Merge pull request #2880 from MaaAssistantArknights/wallsman-patch-1 
Doc: hotfix
 2022-11-24 13:29:45 +08:00
Hydrogina
b1c4c0b83c feat: 修改OF-1导航 2022-11-24 13:25:32 +08:00
Wallsman
7f3d1ae1b8 Doc: hotfix 2022-11-24 13:09:22 +09:00
Hydrogina
c01755e16a Merge pull request #2 from Hydrogina/MaaAssistantArknights-dev 
Maa assistant arknights dev
 2022-11-24 12:04:15 +08:00
Hydrogina
e5d8d22a7f Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into MaaAssistantArknights-dev 2022-11-24 11:57:33 +08:00
MistEO
a7b7e2fe60 refactor: 整理Dir相关单例 2022-11-24 11:06:30 +08:00
MistEO
42582fb0e1 fix: build error on MSVC v142 2022-11-24 10:36:12 +08:00
MistEO
77dfd44ae2 Merge pull request #2874 from MaaAssistantArknights/dev 
Release v4.7.1 hotfix
v4.7.1 		2022-11-23 23:39:02 +08:00
MistEO
2a20acd443 chore: 再添加一些界面关于ADB替换的提示 2022-11-23 23:37:14 +08:00
MistEO
9d868348bf Merge pull request #2873 from MaaAssistantArknights/dev 
Release v4.7.1
 2022-11-23 23:30:00 +08:00
MistEO
bb9f15fe0d docs: update changelog 2022-11-23 23:29:38 +08:00
MistEO
e326cd3c2b perf: 优化检查更新的一些小细节 2022-11-23 23:20:32 +08:00
MistEO
01cdc39326 docs: fix changelog 2022-11-23 23:05:42 +08:00
tangge233
6754d75cdc fix: 检查更新镜像 API ，防止有时候检查更新失效 (#2867) 
* 加个镜像 API ，防止有时候检查更新失效

* Revert "加个镜像 API ，防止有时候检查更新失效"

This reverts commit b9ab106409.

* Revert "Revert "加个镜像 API ，防止有时候检查更新失效""

This reverts commit 68c55a8df4.

* 修改了下代码

* 获取 GitHub 上版本信息时尝试去使用镜像 API 以防止 rate limit 阻碍信息获取

* 忘改了几处……
 2022-11-23 23:05:01 +08:00
MistEO
5340b984ef fix: 修复替换完 adb 还是有界面提示的问题 2022-11-23 22:55:36 +08:00
MistEO
70ca43e566 fix: 修复肉鸽不期而遇中的紧急作战卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2858
 2022-11-23 22:53:17 +08:00
MistEO
17d14953ec Merge pull request #2871 from cenfusheng/dev 
修复三个识别问题
 2022-11-23 22:37:42 +08:00
MistEO
a8a03d7e73 feat: 新增一些触控相关的界面提示 2022-11-23 22:37:31 +08:00
MistEO
0f8140753c fix: 修复adb正在运行时，强制替换不掉的问题 2022-11-23 22:37:30 +08:00
cenfusheng
200564a6a8 修复三个识别问题 
影——傀影，桑芸——桑葚，罪——斥罪
 2022-11-23 21:22:24 +08:00
MistEO
b051c6f099 Merge pull request #2861 from hguandl/fix/macos-arp 
fix: 修复macOS启动卡住的问题
 2022-11-23 21:20:47 +08:00
Hydrogina
5d98fd023e Merge branch 'dev' into dev 2022-11-23 20:06:41 +08:00
Hydrogina
2795384484 feat: 优化Copilot任务助战功能封装性 2022-11-23 19:59:59 +08:00
Hydrogina
ae6079e862 feat: 在gui添加“借助战作战”选项 2022-11-23 19:34:34 +08:00
Hydrogina
8bd902133a feat: 将借助战作战移入VisitTask 
去除吃源石、吃理智药等冗余参数
 2022-11-23 18:27:57 +08:00