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,519 Commits 60 Branches 1,840 Tags
098a64a078fe0c5f2bedb04ad9f0ec79fa6c4fea
Commit Graph

1244 Commits

Author SHA1 Message Date
zzyyyl
ff4c0f127e feat: 章节导航允许划动多次 2022-10-30 20:19:01 +08:00
MistEO
16d472ba1f chore: rename rear_delay to post_delay 2022-10-30 18:52:33 +08:00
uye
269ad2e7b3 fix: 修复伊桑识别错误 2022-10-30 15:09:31 +08:00
zzyyyl
d42ee65061 fix: 修复水月肉鸽boss关跑路的问题 2022-10-30 13:02:55 +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
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
42cce17dad Merge pull request #2418 from MaaAssistantArknights/perf/task 
perf: 对任务流程及配置的一些优化
 2022-10-30 02:51:44 +08:00
MistEO
e25a173b35 fix: 修复台服高资识别错误的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2508
 2022-10-30 02:22:33 +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
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
64895479c5 feat: 用 virtual task 优化 Loading 相关任务 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
8acb1ec1c3 feat: 检查是否有 JustReturn 任务不是最后一个任务 2022-10-29 16:54:34 +08:00
zzyyyl
89a8f257f7 feat: 用 baseTask 字段简化 tasks.json 2022-10-29 16:54:25 +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
WWPXX
cab6d03c8e 根据队伍优化选取等级 2022-10-28 21:55:31 +08:00
DavidWang19
02ce94d98a feat: 新增根据队伍内已有近战干员数量决定招募权重的选项并修复了一些bug 2022-10-27 15:59:50 +01: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
96a73cdb65 Merge pull request #2405 from MaaAssistantArknights/perf/roguefight_v3 
perf: 改进肉鸽招募和部署逻辑
 2022-10-27 20:13:00 +08:00
DavidWang19
d4dc680dcc feat: 新增根据队伍内已有同职业干员数量决定招募权重的选项 2022-10-26 23:03:52 +01:00
KiyuM1n
160c5a42b2 更新終局圖檔 2022-10-27 00:15:16 +08:00
KiyuM1n
108b39560f 加入收集日常獎勵圖檔 2022-10-27 00:12:24 +08:00
KiyuM1n
6e9b681ecf 更新終局圖檔 2022-10-27 00:01:17 +08:00
zzyyyl
90391ddbf6 fix: 修复万象追忆录更新时卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2446
 2022-10-26 23:50:18 +08:00
MistEO
0c803d77ad feat: 基建宿舍”信赖排序“改为从低到高的方式 2022-10-26 23:17:26 +08:00
MistEO
409844fd49 fix: 修复美服掉落识别，开放日服掉落上传，更新掉落测试集 2022-10-26 22:48:58 +08:00
Horror Proton
d87b181ab9 fix: add replace rules for txwy client 
ref: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2311
 2022-10-26 16:07:29 +08:00
MistEO
759ac7859b chore: 优化内置243作业无人机的使用 2022-10-26 00:37:50 +08:00
MistEO
89439e4b6e chore: 更新台服gamedata数据 
link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2311
 2022-10-26 00:21:11 +08:00
MistEO
11968e806f feat: 新增肉鸽关卡识别错误时自动保存图片功能，修复台服一个肉鸽关卡识别错误 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2311
 2022-10-25 23:56:43 +08:00
MistEO
5e8ee91b33 fix: 肉鸽不招募”砾“了 
识别错误，解决不了.jpg
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2333
 2022-10-25 23:44:27 +08:00
MistEO
2663324bce merge: dev to perf/multi_ocr 2022-10-25 22:44:33 +08:00
MistEO
d183bc94bc fix: 修复繁中服部分肉鸽识别错误 2022-10-25 22:39:02 +08:00
KiyuM1n
2fefabb0ba chore: 更新台服肉鸽json 
台服ocr內容
 2022-10-25 22:38:36 +08:00
MistEO
be3cf8abb7 fix: fix rebase error 2022-10-25 22:33:04 +08:00
Horror Proton
7c8d0fbfaf feat: add drop quantity roi and intensity range for JP 
ref: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2363
 2022-10-25 22:33:04 +08:00