fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 01:40:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,701 Commits 61 Branches 1,836 Tags
e62cfdbf8dc29a5507254e9d97aa70fe6ba36db2
Commit Graph

2508 Commits

Author SHA1 Message Date
zzyyyl
6a1b72638e fix: 修复 beta.3 打开即闪退的问题 2022-11-06 15:52:27 +08:00
MistEO
63691306e0 perf: 优化自动更新的版本号解析 2022-11-06 14:12:41 +08:00
MistEO
878c908829 Merge pull request #2626 from MaaAssistantArknights/feat/TaskData 
feat: 优化 TaskData
 2022-11-06 13:59:20 +08:00
MistEO
63d7857e71 fix: 修复nightly版本检查更新不正确的问题 2022-11-06 02:56:33 +08:00
zzyyyl
ca39ae1c14 feat: baseTask 定义但留空表示不使用已生成的同名任务 
例如国际服覆写不使用同名国服任务

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

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

* fix: typos

* Update tasks.json

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

* Update tasks.json

Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-11-03 21:23:11 +08:00
uye
0efbfe6293 refactor: 主线导航改为从左往右寻找 2022-11-03 20:27:06 +08:00
zzyyyl
797f418f5b style: format 2022-11-03 18:07:10 +08:00
zzyyyl
faab4b3c18 feat: 增加 #self 任务 
`"A": { "next": [ "#self" ] }`
`A->self = A`
`B@A->self = B@A`
 2022-11-03 18:05:29 +08:00
zzyyyl
a5cd569f01 feat: 肉鸽招募前先往前翻两页，因为有可能进招募界面时不是从最左边开始 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2571
 2022-11-03 01:26:18 +08:00
uye
dd952714f9 fix: 修复活动开放时间判断错误 2022-11-03 00:40:55 +08:00
MistEO
1ecc9f060e perf: 优化自动战斗输入神秘代码时重复请求的问题 2022-11-03 00:14:11 +08:00
MistEO
94c08cfd89 Merge pull request #2565 from dantmnf/dev 
fix: suppress exception on RegistryKey.OpenSubKey fail
 2022-11-03 00:11:17 +08:00
uye
0ae74d8fe3 feat: 叙拉古人活动导航 2022-11-02 22:51:14 +08:00
MistEO
d3bf05b6e0 fix: 修复加载资源时的crash 2022-11-02 22:32:25 +08:00
MistEO
c5b95bc303 Merge pull request #2550 from MaaAssistantArknights/feat/cover_task 
feat: tasks.json 中，国际服资源显式声明的参数覆写同名国服资源
 2022-11-02 22:05:55 +08:00
MistEO
f989f5d84d feat: 分离不同肉鸽的招募、购物配置 (#2562) 2022-11-02 21:30:51 +08:00
MistEO
d07b5e8b05 Merge pull request #2546 from MaaAssistantArknights/perf/swipe_task 
refactor: 重构滑动任务
 2022-11-02 21:18:24 +08:00
dantmnf
f6bfdd54b6 fix: suppress exception on RegistryKey.OpenSubKey fail 2022-11-02 20:54:34 +08:00
uye
260139052a style: 修改肉鸽策略描述 2022-11-02 18:35:28 +08:00
MistEO
64cbc15568 Merge branch 'perf/swipe_task' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into perf/swipe_task 2022-11-02 00:25:03 +08:00
MistEO
2fe3d84b4b fix: 调整滑动参数 2022-11-02 00:24:54 +08:00
zzyyyl
157c548d0d fix: 修复错别字，UnableToAgent 小优化 2022-11-01 23:59:15 +08:00
MistEO
c9a354d238 refactor: 重构滑动任务 2022-11-01 23:24:14 +08:00
zzyyyl
2596c9437b feat: tasks.json 中，同名国际服资源显式声明的参数覆写国服资源 2022-11-01 21:26:08 +08:00
MistEO
d269ef69a8 fix: 修复 release note 太长时崩溃的问题 2022-11-01 18:07:34 +08:00
MistEO
880f33b208 fix: 修复界面*显示错误 2022-10-31 23:10:45 +08:00
MistEO
33841362bf fix: 修复战斗中嵯峨识别错误 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2529
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2317
 2022-10-31 23:10:15 +08:00
MistEO
1e6c33527b perf: 优化c#日志打印 2022-10-31 22:40:39 +08:00
MistEO
f27e9199d4 perf: rename UILogColor 2022-10-31 22:20:02 +08:00
MistEO
fee582a2bf perf: 优化检查更新返回逻辑，新增提示重启弹窗 2022-10-31 22:18:19 +08:00
MistEO
1396bddb18 perf: 优化检查更新类型 2022-10-31 21:18:39 +08:00
MistEO
881e9e23d6 Merge pull request #2524 from MaaAssistantArknights/perf/new_version_toast 
perf: 整理检查更新的弹出通知逻辑，做了一下i18n
 2022-10-31 20:55:48 +08:00
zzyyyl
8a2506b1cf Update src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs 
Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-10-31 20:06:16 +08:00
zzyyyl
826008551c feat: 检查更新失败时不报 “已是最新版本” 而是报错 2022-10-31 16:19:25 +08:00