fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 18:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,505 Commits 61 Branches 1,839 Tags
d42ee65061ba39c0c134f0b6fa050af02837948a
Commit Graph

4505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zzyyyl
d42ee65061 fix: 修复水月肉鸽boss关跑路的问题 2022-10-30 13:02:55 +08:00
zzyyyl
6429b82ef1 fix: 修复 OTA 内无子文件夹时且当前文件夹下无.old文件夹时更新报错的问题 2022-10-30 11:46:28 +08:00
MistEO
4e0d4b611b fix: 兼容连接模式不真实获取uuid 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2495
 2022-10-30 05:55:01 +08:00
MistEO
75caf545fe fix: 尝试修复傀影肉鸽不期而遇卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2304
 2022-10-30 05:13:18 +08:00
MistEO
19600ee781 fix: 修复台服肉鸽分队名识别错误 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2311
 2022-10-30 05:07:42 +08:00
MistEO
20533f26ef docs: update changelog 2022-10-30 04:22:33 +08:00
MistEO
ba8b49399a chore: update mac ui 2022-10-30 04:22:06 +08:00
MistEO
953973e5fa fix: 肉鸽刷源石锭模式不再截图 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2488
 2022-10-30 04:20:38 +08:00
MistEO
99183c8cc7 fix: C# warning 2022-10-30 04:05:44 +08:00
MistEO
27bba9eaec fix: 修复关卡导航往右滑不到位的问题 2022-10-30 04:03:30 +08:00
MistEO
5bad3b1a9f fix: 修复资源本关卡导航失效的问题 2022-10-30 03:29: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
MistEO
9fe0237f34 docs: update changelog and package def 2022-10-30 02:55:45 +08:00
MistEO
42cce17dad Merge pull request #2418 from MaaAssistantArknights/perf/task 
perf: 对任务流程及配置的一些优化
 2022-10-30 02:51:44 +08:00
Horror Proton
2d6899f58f chore: update OTA filenames, etc 2022-10-30 02:30:18 +08:00
Horror Proton
f022ffb58a chore: add md5sum.txt in OTA pack 2022-10-30 02:30:18 +08:00
Horror Proton
c1df71a598 chore: add OTA workflow 2022-10-30 02:30:18 +08:00
MistEO
1e88188b7f docs: update pictures 2022-10-30 02:30:18 +08:00
MistEO
62be321eb7 docs: 修改 ISSUE 模板 2022-10-30 02:30:18 +08:00
Yanstime
974fd1b40f Update 1.1-详细介绍.md 2022-10-30 02:30:18 +08:00
Yanstime
5700a57220 Update 1.1-详细介绍.md 2022-10-30 02:30:18 +08:00
uye
b1d7cb0739 fix: 尝试修复 指定材料 功能的问题 
fix #2354
fix #2431
fix #2476
 2022-10-30 02:26:22 +08:00
MistEO
ab2f8557c8 Merge pull request #2506 from MaaAssistantArknights/feat/ota 
feat: 更新 GUI 的 OTA 机制
 2022-10-30 02:26:22 +08:00
MistEO
77afaa0750 chore: update server name for PenguinStats 2022-10-30 02:23:53 +08:00
MistEO
e25a173b35 fix: 修复台服高资识别错误的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2508
 2022-10-30 02:22:33 +08:00
MistEO
b64933750c fix: 修复更新后保存gui.json时冲突的问题 2022-10-30 00:43:35 +08:00
zzyyyl
0f60226522 feat: 更新 OTA 机制 2022-10-30 00:43:12 +08:00
zzyyyl
5daaaf075d fix: 修复更新出错的问题 2022-10-29 22:04:46 +08:00
zzyyyl
671da4b9fb fix: 尝试修复不期而遇卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2501
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2478
 2022-10-29 21:22:53 +08:00
zzyyyl
6abc4cd2c5 fix: 修复有时商店购买进阶券/招募券卡住的问题 2022-10-29 21:18:14 +08:00
MistEO
5b5719abcd Merge pull request #2504 from StarWishLXH/dev 
fix: 修复ADB重连失败重启模拟器重试功能在重试时不进行任何操作直接停止
 2022-10-29 20:37:03 +08:00
MistEO
09967a1a4b fix: 修复自定义基建时的warning 2022-10-29 20:36:20 +08:00
StarWish
d150ed5e95 fix: 修复ADB重连失败时重启模拟器重试功能在重试时不进行任何操作直接停止 2022-10-29 17:56:20 +08:00
zzyyyl
f73d5242bc feat: 将 virtual task 中的 "" 更换为 "#back" 2022-10-29 16:54:36 +08:00
zzyyyl
e1b28ea2ef style: format 2022-10-29 16:54:36 +08:00
zzyyyl
18a7d69769 fix: 修复卡在隐私协议界面的问题 2022-10-29 16:54:35 +08:00
zzyyyl
3cff20fd02 feat: 抽出一个 sharp_task StartUpThemes#next 2022-10-29 16:54:35 +08:00
zzyyyl
1fe6bdd71a feat: 删除 Main 任务，简化资源关卡导航，简化章节导航 2022-10-29 16:54:35 +08:00
zzyyyl
314fd3776e perf(TaskData): append_prefix 小优化 2022-10-29 16:54:35 +08:00
zzyyyl
64895479c5 feat: 用 virtual task 优化 Loading 相关任务 2022-10-29 16:54:35 +08:00
zzyyyl
211b839bd7 feat: 增加 virtual task 
```
"Loading": {
    "next": [ "Loading", "#next", "" ]
},
"B": {
    "next": [ "Other", "B@Loading" ]
}
```

可以生成:
   "B@Loading"->next = [ "B@Loading", "Other", "B" ]
   "Loading"  ->next = [ "Loading" ]
注 (在 m_raw_all_tasks_info 中):
   "B@Loading"->next = [ "B@Loading", "B#next", "B" ]
 2022-10-29 16:54:35 +08:00
zzyyyl
421f075a0b feat: 增加肉鸽战斗结束的加载画面 2022-10-29 16:54:34 +08:00
zzyyyl
99d90eaad9 feat: 稍微修改 tasks.json 中肉鸽开始的逻辑 
`Roguelike@Begin` 增加 GetDrops#next 即允许从 战斗掉落界面 开始任务
 2022-10-29 16:54:34 +08:00
zzyyyl
c0e4befb5c feat: 用 baseTask 字段优化 tasks.json 
拆出三个基类: `Roguelike@Stage`, `Roguelike@StageEnter`, `Roguelike@StageEnterBattle`
分别是 关卡图标相关、 进入关卡相关、 进入战斗关卡相关
 2022-10-29 16:54:34 +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
zzyyyl
5c538633e0 feat: 尝试把 sharp_task 的生成变为预处理，大幅修改 TaskData 2022-10-29 16:54:34 +08:00
zzyyyl
8acb1ec1c3 feat: 检查是否有 JustReturn 任务不是最后一个任务 2022-10-29 16:54:34 +08:00
zzyyyl
c6137d5159 feat: 对于相同任务，第一次识别后第二次就不再识别 
`"next": [ "A", "B", "A", "A" ]` <=> `"next": [ "A", "B" ]`
 2022-10-29 16:54:33 +08:00
zzyyyl
89a8f257f7 feat: 用 baseTask 字段简化 tasks.json 2022-10-29 16:54:25 +08:00