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
4,712 Commits 60 Branches 1,840 Tags
f5253105fdfdff08e4979149fe596c3f5f0374b5
Commit Graph

2518 Commits

Author SHA1 Message Date
zzyyyl
f5253105fd style: 优化格式 2022-11-10 15:23:58 +08:00
zzyyyl
8382967c8d fix: 通知异常时使用兼容版通知 2022-11-10 14:50:51 +08:00
zzyyyl
b9c563ca91 feat: 给通知相关的套一层 Execute.OnUIThread 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2692
 2022-11-10 14:28:37 +08:00
zzyyyl
11587f3f49 fix: typos 2022-11-09 23:34:49 +08:00
zzyyyl
f1ec6d9cd5 fix: 修复有时 Failed initializing notifications 的问题 
加了一层 try catch

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2692
 2022-11-09 23:33:05 +08:00
MistEO
97f0c0536f chore: 新版本OTA打包的时候，别急.jpg 2022-11-08 21:15:44 +08:00
Hao Guan
382849ebc3 fix: 修复 Mac 肉鸽干员及练度识别 2022-11-07 23:38:39 +10:00
MistEO
1ff8e22162 fix: 修复一些可能的数字识别错误 2022-11-07 21:21:16 +08:00
Tastror
4470a7ee00 Merge pull request #2633 from wallsman/dev 
doc: tweak and translation JP lines
 2022-11-06 21:00:33 +08:00
zzyyyl
c386de674f fix: 修复 beta.3 打开即闪退的问题 2022-11-06 15:52:27 +08:00
Wallsman
4d306f9047 Update ja-jp.xaml 2022-11-06 16:13:11 +09:00
Wallsman
2dffdac054 doc: tweak JP line 
Has the argument changed? <system:String x:Key="IdentifyTheMistakes">
 2022-11-06 16:05:34 +09:00
MistEO
2f72e7a668 perf: 优化自动更新的版本号解析 2022-11-06 14:12:41 +08:00
MistEO
942f6affcb Merge pull request #2626 from MaaAssistantArknights/feat/TaskData 
feat: 优化 TaskData
 2022-11-06 13:59:20 +08:00
MistEO
0ad0daff7f fix: 修复nightly版本检查更新不正确的问题 2022-11-06 02:56:33 +08:00
zzyyyl
c985cd0ca3 feat: baseTask 定义但留空表示不使用已生成的同名任务 
例如国际服覆写不使用同名国服任务

perf: 检测任务是否循环依赖（在此之前若循环依赖会直接 runtime error (递归爆栈)）

例如 `"A": { "baseTask": "A" }`
 2022-11-06 01:58:05 +08:00
zzyyyl
b13dabce31 feat: 把 get 和 get_raw 放进 .cpp 而不是 .h 中 2022-11-06 01:57:56 +08:00
MistEO
210db4bbd0 feat: 新增dll无法加载时弹窗的解决方案提示 
ref to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2620
 2022-11-05 23:27:05 +08:00
zzyyyl
1867129df0 style: format 2022-11-05 19:01:27 +08:00
MistEO
8d31b06888 fix: 修复访问好友失败不报错的问题 2022-11-05 18:00:54 +08:00
MistEO
4884b693f4 fix: 尝试修复基建选人有时候滑不到最左边的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2613
 2022-11-05 17:58:04 +08:00
MistEO
ea047ae4d0 fix: build error 2022-11-05 16:48:02 +08:00
MistEO
57e00f3965 feat: 增加一个是否使用原始数据进行OCR的配置项 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2604
 2022-11-05 16:32:29 +08:00
MistEO
a80baced92 perf: 新增一些可用的github镜像站 2022-11-05 02:16:41 +08:00
zzyyyl
3409e4de09 feat: 关卡导航若进入章节界面时已经出现待选关卡则直接点击不再滑动 (#2591) 
* feat: 关卡导航时若进入章节界面时已经出现对应关卡，不再滑动

* fix: typos

* Update tasks.json

Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-11-04 23:08:29 +08:00
MistEO
daf2e10796 feat: 新增从 ota.maa.plus 下载 OTA 包 2022-11-04 23:02:43 +08:00
zzyyyl
2fd891750c feat: 给 OcrTaskInfo 加一个 without_det，默认 false；进入关卡前的关卡名识别不使用检测模型 2022-11-03 23:13:53 +08:00
zzyyyl
ee783a51c4 feat: 给 OcrTaskInfo 加一个 is_ascii，默认 false；关卡识别仍然使用 CharModel 2022-11-03 23:13:53 +08:00
zzyyyl
c4d761289b feat: 主线关卡导航也改用 tasks.json 逻辑 2022-11-03 23:13:53 +08:00
uye
a2f79a4439 Merge pull request #2587 from MaaAssistantArknights/ABA2396-2 
refactor: 修改主线导航方式
 2022-11-03 22:06:40 +08:00
zzyyyl
3b980ee069 fix: 修复 #self 任务有时崩溃的问题 2022-11-03 21:24:20 +08:00
Hao Guan
7c86d2402f fix: 修复macOS采购中心识别错误 (#2583) 
* fix: 修复macOS采购中心识别错误

* Update tasks.json

Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-11-03 21:23:11 +08:00
uye
aaf50818f2 refactor: 主线导航改为从左往右寻找 2022-11-03 20:27:06 +08:00
zzyyyl
69e6f11499 style: format 2022-11-03 18:07:10 +08:00
zzyyyl
efaea40e9c feat: 增加 #self 任务 
`"A": { "next": [ "#self" ] }`
`A->self = A`
`B@A->self = B@A`
 2022-11-03 18:05:29 +08:00
zzyyyl
e23ccf2389 feat: 肉鸽招募前先往前翻两页，因为有可能进招募界面时不是从最左边开始 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2571
 2022-11-03 01:26:18 +08:00
uye
ca2c0380ac fix: 修复活动开放时间判断错误 2022-11-03 00:40:55 +08:00
MistEO
afe03806fc perf: 优化自动战斗输入神秘代码时重复请求的问题 2022-11-03 00:14:11 +08:00
MistEO
1b34bd9a2d Merge pull request #2565 from dantmnf/dev 
fix: suppress exception on RegistryKey.OpenSubKey fail
 2022-11-03 00:11:17 +08:00
uye
d73621ba63 feat: 叙拉古人活动导航 2022-11-02 22:51:14 +08:00
MistEO
08fcff8b82 fix: 修复加载资源时的crash 2022-11-02 22:32:25 +08:00
MistEO
020d6acb55 Merge pull request #2550 from MaaAssistantArknights/feat/cover_task 
feat: tasks.json 中，国际服资源显式声明的参数覆写同名国服资源
 2022-11-02 22:05:55 +08:00
MistEO
b0fa045f90 feat: 分离不同肉鸽的招募、购物配置 (#2562) 2022-11-02 21:30:51 +08:00
MistEO
07e08a2271 Merge pull request #2546 from MaaAssistantArknights/perf/swipe_task 
refactor: 重构滑动任务
 2022-11-02 21:18:24 +08:00
dantmnf
ccd42117d9 fix: suppress exception on RegistryKey.OpenSubKey fail 2022-11-02 20:54:34 +08:00
uye
51bb93f4d6 style: 修改肉鸽策略描述 2022-11-02 18:35:28 +08:00
MistEO
6eacb0c6b8 Merge branch 'perf/swipe_task' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into perf/swipe_task 2022-11-02 00:25:03 +08:00
MistEO
3a20f21fdf fix: 调整滑动参数 2022-11-02 00:24:54 +08:00
zzyyyl
a6befc6ad7 fix: 修复错别字，UnableToAgent 小优化 2022-11-01 23:59:15 +08:00
MistEO
a4363e98c8 refactor: 重构滑动任务 2022-11-01 23:24:14 +08:00