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,470 Commits 61 Branches 1,839 Tags
e1b28ea2ef9d8392cd207fcfc2ad586e1c96253b
Commit Graph

4470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
DavidWang19
af9372b694 feat: 增加了中途开始肉鸽的编队信息处理 2022-10-29 06:53:43 +01:00
MistEO
541736e31e Merge pull request #2474 from gdlcf88/user-friendly-exception-handling 
feat: 用户友好的异常处理
 2022-10-29 13:23:23 +08:00
DavidWang19
94f7ae7500 fix: 修复了不能检测到开始肉鸽的bug 2022-10-29 05:58:49 +01:00
uye
9ec1c987ed Update README.md 2022-10-29 01:56:44 +08:00
uye
a6e69695cb Update README_en-US.md 2022-10-29 01:56:41 +08:00
uye
314c114789 Update README_ja-JP.md 2022-10-29 01:56:40 +08:00
uye
f5f52e0e05 Update README_zh-TW.md 2022-10-29 01:56:37 +08:00
MistEO
3864b57bdd fix: 修复美服无法成功上传企鹅的问题 2022-10-29 00:56:48 +08:00
MistEO
1a2b93553a chore: update translations. 2022-10-29 00:48:58 +08:00
zzyyyl
492cfe32fb fix: 修复 copilot 自动编队的 roi 问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2459
 2022-10-29 00:03:53 +08:00
DavidWang19
086cb82b93 Merge pull request #2471 from MaaAssistantArknights/perf/roguefight_v3 
perf: 改进肉鸽招募逻辑并修复了部分bug
 2022-10-28 14:58:50 +01:00
DavidWang19
9a059e4761 Merge pull request #2489 from WWPXX233/perf/roguefight_v3 
根据队伍优化选取等级
 2022-10-28 14:57:12 +01:00
WWPXX
cab6d03c8e 根据队伍优化选取等级 2022-10-28 21:55:31 +08:00
zzyyyl
82bbfc8898 fix: 修复某些情况下停止键不可用的问题 2022-10-28 18:13:59 +08:00
gdlcf88
6530dc90a1 移除Pause方法 2022-10-28 17:31:15 +08:00
gdlcf88
d834fc205f 引入MaaUrls 2022-10-28 14:10:15 +08:00
gdlcf88
0200cc7315 feat: 用户友好的异常处理 2022-10-27 23:49:20 +08:00
zzyyyl
5691801c66 fix: 修复下载完整包导致 noavx 相关文件被覆盖的问题 2022-10-27 23:11:13 +08:00
uye
db29442902 feat: 添加7群加群链接 2022-10-27 23:01:52 +08:00
DavidWang19
02ce94d98a feat: 新增根据队伍内已有近战干员数量决定招募权重的选项并修复了一些bug 2022-10-27 15:59:50 +01:00
Tastror
86e7d7296e docs: 更改错误输出提示 2022-10-27 22:30:45 +08:00
zzyyyl
19d9ae7f3a fix: 修复 "Return" 任务没 roi 的问题 2022-10-27 21:15:05 +08:00
zzyyyl
5f88acc262 fix: 修复一些返回按钮位置变动的问题 2022-10-27 21:09:54 +08:00
MistEO
8bbd0fcb78 Merge pull request #2468 from MaaAssistantArknights/dev 
Release v4.6.5-beta.3
 2022-10-27 20:54:57 +08:00
MistEO
859e98f701 chore: update MeoAsstMac 2022-10-27 20:43:37 +08:00
MistEO
d1c3b7b0aa docs: update changelog 2022-10-27 20:41:24 +08:00
MistEO
96a73cdb65 Merge pull request #2405 from MaaAssistantArknights/perf/roguefight_v3 
perf: 改进肉鸽招募和部署逻辑
 2022-10-27 20:13:00 +08:00
zzyyyl
6d5796e839 fix: 继续修复停止按钮有时失效的问题 2022-10-27 20:02:43 +08:00
MistEO
eed774db92 Merge pull request #2467 from MaaAssistantArknights/feat/version_update 
feat: 更新更新逻辑
 2022-10-27 19:50:49 +08:00
zzyyyl
70ef90bcf1 fix: 修复停止按钮有时失效的问题 2022-10-27 19:37:23 +08:00
zzyyyl
c71df27ffc feat: 加一句 TODO 2022-10-27 18:46:01 +08:00
zzyyyl
5876dc6c3a feat: 更新更新逻辑 2022-10-27 18:37:43 +08:00
MistEO
a76a587bf6 perf: 优化自定义基建识别名字时候一堆warn日志的问题 2022-10-27 14:18:27 +08:00
MistEO
ad8993a3a1 fix: runtime warning in ImageAnalyzer ROI check 2022-10-27 11:24:00 +08:00
MistEO
f446c8afdb fix: 修复工作线程标志位判断错误 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2460
 2022-10-27 10:42:42 +08:00