fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 18:01:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,552 Commits 61 Branches 1,838 Tags
a0671d33053469dfa90368fa5df6bcf4700a7c21
Commit Graph

271 Commits

Author SHA1 Message Date
MistEO
544dbc8ebe fix: 修复保全CheckIfStartOver卡住问题 2023-01-13 16:07:16 +08:00
MistEO
b0f891b3d3 fix: 修复部分模板加载时的warning 2023-01-11 20:21:39 +08:00
MistEO
ed003a7eb8 fix: 修复 引航者试炼 - 恢弘试炼 不开始的问题 2023-01-11 10:36:21 +08:00
MistEO
b2439a616e chore: 更新资源 20230110 2023-01-10 22:37:55 +08:00
MistEO
d340e33029 temp 2023-01-10 21:45:21 +08:00
MistEO
de20e7abbd feat: 完成保全的掉落干员选择等一些逻辑 2023-01-09 00:20:27 +08:00
MistEO
a6db15cf99 feat: 简单支持了下保全开局跳过换人 2023-01-08 22:07:04 +08:00
MistEO
4f8bb72ea6 feat: 初步完成保全部署策略 2023-01-08 21:17:12 +08:00
MistEO
e3f3c63997 feat: 初步完成保全json解析及进入作战前部分操作 2023-01-08 21:17:07 +08:00
MistEO
c239f86847 perf: update resource for drops_v2 2023-01-07 23:28:59 +08:00
MistEO
660ec2e35b chore: 更新资源: 2023/1/1 2023-01-01 15:43:20 +08:00
MistEO
784d821bf5 chore: 更新活动关卡数据 2022-12-22 16:07:09 +08:00
wangli
659a6a892e feat: MaaCore添加肉鸽助战支持 2022-12-19 20:45:59 +08:00
MistEO
6c0dc37787 chore: 更新2022/12/15游戏数据（不包括关卡掉落信息） 2022-12-15 14:07:52 +08:00
uye
5e72353323 feat: 添加活动导航 2022-12-14 14:59:14 +08:00
MistEO
20ba8dab1a merge: dev 2022-12-13 17:44:06 +08:00
Hydrogina
9a066d16b2 fix: 修复借助战刷信用无法进图 #2947 
fix: 修复OF-1未开启情况下信用任务卡住&功能说明不明确 #2949
 2022-11-30 13:03:00 +08:00
uye
fd8a2034f8 feat: SideStory「风雪过境」复刻活动关卡导航 2022-11-26 16:58:09 +08:00
Horror Proton
5ada3a16e9 feat: update skill ready icon matching 2022-11-26 10:29:42 +08:00
Hydrogina
caf939f9fe feat: 修改OF-1导航 2022-11-24 13:25:32 +08:00
Hydrogina
fb38fed2ff Merge branch 'dev' into dev 2022-11-23 20:06:41 +08:00
Hydrogina
23d9a46831 feat:添加借助战作战赚信用功能 2022-11-22 18:23:29 +08:00
uye
a5c8e75484 feat: 添加主线难度选择 (Normal/Hard) 2022-11-22 17:39:43 +08:00
MistEO
d49049e83b chore: 更新地图数据 2022-11-15 21:38:34 +08:00
uye
d9941ea2b3 fix: 修复危机合约开放后IS关导航问题 2022-11-15 18:38:07 +08:00
uye
aaf50818f2 refactor: 主线导航改为从左往右寻找 2022-11-03 20:27:06 +08:00
uye
b0e04d0a29 fix: 修复活动导航可能遇到的问题 2022-11-03 01:50:26 +08:00
zzyyyl
99dce5f195 feat: 增加活动商业洽谈会弹窗的自动关闭 2022-11-03 00:04:00 +08:00
uye
d73621ba63 feat: 叙拉古人活动导航 2022-11-02 22:51:14 +08:00
MistEO
5e67c3256e feat: 自动战斗支持自动跳过战斗前剧情 2022-11-02 22:34:55 +08:00
MistEO
3627834a5d chore: 更新泰迪的资源 2022-11-01 16:58:59 +08:00
MistEO
a40a9977fb chore: 不再支持点击用户隐私协议 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2426
 2022-10-30 03:01:07 +08:00
MistEO
99fddc6572 Revert "fix: 修复卡在隐私协议界面的问题" 
This reverts commit 18a7d69769.

涉及用户协议，可能存在法律风险，经项目组讨论，不建议帮用户点

close https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2426
 2022-10-30 02:56:33 +08:00
zzyyyl
18a7d69769 fix: 修复卡在隐私协议界面的问题 2022-10-29 16:54:35 +08:00
zzyyyl
1fe6bdd71a feat: 删除 Main 任务，简化资源关卡导航，简化章节导航 2022-10-29 16:54:35 +08:00
zzyyyl
a5f3b3631d fix: 修复部分任务生成失败的问题 
```
"B@A1": { "next": [ "B@A2#next" ] },
"B@A2": { "next": [ "N0" ] },
"C@B@A2": { "next": [ "N1" ] }
```
以上这种情况, `Task.get("C@B@A1")->next` 应该为 `[ "N1" ]` 而不是 `[ "C@N0" ]`.
 2022-10-29 16:54:34 +08:00
MistEO
0c803d77ad feat: 基建宿舍”信赖排序“改为从低到高的方式 2022-10-26 23:17:26 +08:00
zzyyyl
14e2038abe feat: 更新战斗结束的模板图片 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2422
 2022-10-25 02:09:09 +08:00
MistEO
1a6a73768e Merge pull request #2381 from MaaAssistantArknights/feat/sharp_task 
feat: 增加 `#` 型任务 和 `baseTask` 字段
 2022-10-24 21:58:17 +08:00
zzyyyl
0f6d2ac6f5 fix: 修复没有信赖提升标志时跳过掉落识别的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2360
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2348
 2022-10-24 21:25:35 +08:00
zzyyyl
9801f25f59 feat: 增加加载界面图片 
不知道有没有修了，暂时不打 fix

https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2414
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2374
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2378
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2294
 2022-10-24 19:55:14 +08:00
zzyyyl
57fdf31a56 feat: baseTask @ # 任务同时使用的例子 2022-10-23 22:19:06 +08:00
MistEO
9364f067c8 fix: 修复基建宿舍未进驻的逻辑，并尽可能将宿舍的人填满 2022-10-23 01:59:03 +08:00
MistEO
b3ee61649a fix: 修复肉鸽卡在“误入奇境”的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2367
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2262
 2022-10-21 00:53:51 +08:00
zzyyyl
6e039269e1 perf: 修改部分任务名 2022-10-15 16:32:50 +08:00
zzyyyl
ec21bc401a fix: 修复回调 2022-10-15 16:32:50 +08:00
zzyyyl
adbfd815ad refactor: 重构肉鸽文件结构 2022-10-15 16:32:49 +08:00
uye
e0c412e400 fix: 修复11章开启后自定义导航无法进入第9/10章 2022-10-14 01:37:14 +08:00
MistEO
8979770bf9 chore: 更新掉落识别资源 2022-10-11 19:22:34 +08:00
MistEO
eb17c83ba5 chore: 更新第十一章除企鹅数据外的资源 2022-10-11 16:34:54 +08:00