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,462 Commits 61 Branches 1,839 Tags
99d90eaad95cbcdf33761dd1b82847e5259cd892
Commit Graph

1223 Commits

Author SHA1 Message Date
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
MistEO
7236c6bc91 perf: 删除一些已经用不上了的数字replace 2022-10-25 22:33:04 +08:00
MistEO
59ae8d1a1b fix: 修复curl上传数据时的报错 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2427
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1747
 2022-10-25 22:25:42 +08:00
zzyyyl
14e2038abe feat: 更新战斗结束的模板图片 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2422
 2022-10-25 02:09:09 +08:00
MistEO
4811af9925 chore: remove note from json 2022-10-25 00:32:17 +08:00
KiyuM1n
dfdcf99ed1 Merge branch 'MaaAssistantArknights:dev' into dev 2022-10-25 00:20:16 +08:00
KiyuM1n
a0572fd624 Update tasks.json 
台服ocr內容
 2022-10-25 00:17:52 +08:00
MistEO
b771b0c9f5 fix: fix rebase error 2022-10-24 23:38:01 +08:00
Horror Proton
64a08e2c61 feat: add drop quantity roi and intensity range for JP 
ref: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2363
 2022-10-24 23:22:31 +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
lhhxxxxx
3dc46740f0 fix. 修复官方153作业红云组,泡泡组断暖机的问题，优化了换班前后各组顺序 2022-10-24 19:51:39 +08:00
zzyyyl
03df17518b feat: 用 baseTask 字段简化 tasks.json 2022-10-23 22:19:22 +08:00
zzyyyl
d187b6a511 style: 肉鸽相关 Task 按照字典序排序 2022-10-23 22:19:14 +08:00
zzyyyl
57fdf31a56 feat: baseTask @ # 任务同时使用的例子 2022-10-23 22:19:06 +08:00
zzyyyl
39292ddb2e feat: 用 "#" 型任务简化 tasks.json 2022-10-23 22:18:01 +08:00
DavidWang19
a1579d7449 perf: 新增强制部署时禁用医疗干员的选项 2022-10-23 10:27:14 +01:00
MistEO
9364f067c8 fix: 修复基建宿舍未进驻的逻辑，并尽可能将宿舍的人填满 2022-10-23 01:59:03 +08:00
WWPXX
d07e912a3b perf: 优化肉鸽部署顺序以及位置 (#2388) 
* 优化部署顺序以及位置

* 提高了带有控制技能的干员优先度

* 优化部署方向位置顺序

* Update roguelike_copilot.json

Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-10-23 00:12:01 +08:00
MistEO
007f4b15f1 feat: support roguelike shopping, more stages, more opers for JP and EN client 2022-10-23 00:10:56 +08:00
zzyyyl
5a83408fca fix: 修复关卡 溟痕乐园 识别错误的问题 2022-10-22 23:31:16 +08:00