fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 10:32:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,490 Commits 61 Branches 1,840 Tags
9618968d38d23536c51f2fad05577cd76bee2e39
Commit Graph

1228 Commits

Author SHA1 Message Date
zzyyyl
a541c3e525 feat: 检查是否有 JustReturn 任务不是最后一个任务 2022-10-29 16:54:34 +08:00
zzyyyl
42d3cdf412 feat: 用 baseTask 字段简化 tasks.json 2022-10-29 16:54:25 +08:00
zzyyyl
b93f796a2c fix: 修复 copilot 自动编队的 roi 问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2459
 2022-10-29 00:03:53 +08:00
DavidWang19
0a62b36c47 Merge pull request #2471 from MaaAssistantArknights/perf/roguefight_v3 
perf: 改进肉鸽招募逻辑并修复了部分bug
 2022-10-28 14:58:50 +01:00
WWPXX
8167cfefd2 根据队伍优化选取等级 2022-10-28 21:55:31 +08:00
DavidWang19
96db264e52 feat: 新增根据队伍内已有近战干员数量决定招募权重的选项并修复了一些bug 2022-10-27 15:59:50 +01:00
zzyyyl
ae3e2f9bcb fix: 修复 "Return" 任务没 roi 的问题 2022-10-27 21:15:05 +08:00
zzyyyl
b58ecd022d fix: 修复一些返回按钮位置变动的问题 2022-10-27 21:09:54 +08:00
MistEO
ec7f10f424 Merge pull request #2405 from MaaAssistantArknights/perf/roguefight_v3 
perf: 改进肉鸽招募和部署逻辑
 2022-10-27 20:13:00 +08:00
DavidWang19
16e93186e6 feat: 新增根据队伍内已有同职业干员数量决定招募权重的选项 2022-10-26 23:03:52 +01:00
KiyuM1n
190d930c2c 更新終局圖檔 2022-10-27 00:15:16 +08:00
KiyuM1n
d016f4dacb 加入收集日常獎勵圖檔 2022-10-27 00:12:24 +08:00
KiyuM1n
d3cae73a86 更新終局圖檔 2022-10-27 00:01:17 +08:00
zzyyyl
03746598ab fix: 修复万象追忆录更新时卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2446
 2022-10-26 23:50:18 +08:00
MistEO
42da45e807 feat: 基建宿舍”信赖排序“改为从低到高的方式 2022-10-26 23:17:26 +08:00
MistEO
2ec3022eae fix: 修复美服掉落识别，开放日服掉落上传，更新掉落测试集 2022-10-26 22:48:58 +08:00
Horror Proton
96e7b01496 fix: add replace rules for txwy client 
ref: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2311
 2022-10-26 16:07:29 +08:00
MistEO
61483af38a chore: 优化内置243作业无人机的使用 2022-10-26 00:37:50 +08:00
MistEO
8f85844370 chore: 更新台服gamedata数据 
link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2311
 2022-10-26 00:21:11 +08:00
MistEO
a36679f1ee feat: 新增肉鸽关卡识别错误时自动保存图片功能，修复台服一个肉鸽关卡识别错误 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2311
 2022-10-25 23:56:43 +08:00
MistEO
aab55771c5 fix: 肉鸽不招募”砾“了 
识别错误，解决不了.jpg
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2333
 2022-10-25 23:44:27 +08:00
MistEO
2ab5cdb33b merge: dev to perf/multi_ocr 2022-10-25 22:44:33 +08:00
MistEO
fff0865d6e fix: 修复繁中服部分肉鸽识别错误 2022-10-25 22:39:02 +08:00
KiyuM1n
a0080952c1 chore: 更新台服肉鸽json 
台服ocr內容
 2022-10-25 22:38:36 +08:00
MistEO
a31b303eec fix: fix rebase error 2022-10-25 22:33:04 +08:00
Horror Proton
e7d702598f 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
eaed0d4cd6 perf: 删除一些已经用不上了的数字replace 2022-10-25 22:33:04 +08:00
MistEO
2af05e8e75 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
85f5f7365b feat: 更新战斗结束的模板图片 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2422
 2022-10-25 02:09:09 +08:00
MistEO
bb82bc1d6e chore: remove note from json 2022-10-25 00:32:17 +08:00
KiyuM1n
70f6bbf980 Merge branch 'MaaAssistantArknights:dev' into dev 2022-10-25 00:20:16 +08:00
KiyuM1n
91c1aace9e Update tasks.json 
台服ocr內容
 2022-10-25 00:17:52 +08:00
MistEO
a0256d7bba fix: fix rebase error 2022-10-24 23:38:01 +08:00
Horror Proton
28366130d1 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
d2b5191ca7 Merge pull request #2381 from MaaAssistantArknights/feat/sharp_task 
feat: 增加 `#` 型任务 和 `baseTask` 字段
 2022-10-24 21:58:17 +08:00
zzyyyl
71135979d8 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
99bae5c1a3 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
d4c026be2f fix. 修复官方153作业红云组,泡泡组断暖机的问题，优化了换班前后各组顺序 2022-10-24 19:51:39 +08:00
zzyyyl
d04ef3f4f4 feat: 用 baseTask 字段简化 tasks.json 2022-10-23 22:19:22 +08:00
zzyyyl
cc24509cdd style: 肉鸽相关 Task 按照字典序排序 2022-10-23 22:19:14 +08:00
zzyyyl
aa189aed40 feat: baseTask @ # 任务同时使用的例子 2022-10-23 22:19:06 +08:00
zzyyyl
ceb62f91c1 feat: 用 "#" 型任务简化 tasks.json 2022-10-23 22:18:01 +08:00
DavidWang19
1a90afb018 perf: 新增强制部署时禁用医疗干员的选项 2022-10-23 10:27:14 +01:00
MistEO
33a14dd378 fix: 修复基建宿舍未进驻的逻辑，并尽可能将宿舍的人填满 2022-10-23 01:59:03 +08:00
WWPXX
b8a66f2229 perf: 优化肉鸽部署顺序以及位置 (#2388) 
* 优化部署顺序以及位置

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

* 优化部署方向位置顺序

* Update roguelike_copilot.json

Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-10-23 00:12:01 +08:00
MistEO
2acf75e7b1 feat: support roguelike shopping, more stages, more opers for JP and EN client 2022-10-23 00:10:56 +08:00
zzyyyl
5a12c7eaf4 fix: 修复关卡 溟痕乐园 识别错误的问题 2022-10-22 23:31:16 +08:00
MistEO
2ddba7f54d feat: support drops rec for EN client 2022-10-22 20:04:27 +08:00
MistEO
b67cb2d19e chore: 更新游戏数据 2022-10-22 17:55:01 +08:00
MistEO
a206754575 fix: 自定义一键强制改变菲亚梅塔的位置，修复技能不生效的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2260
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2335
 2022-10-22 16:46:45 +08:00