fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 02:23:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,379 Commits 62 Branches 1,839 Tags
ed02fe647e65a7a075f45c983cc356b5bb93d8e2
Commit Graph

1192 Commits

Author SHA1 Message Date
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
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
MistEO
8a54f78439 feat: support drops rec for EN client 2022-10-22 20:04:27 +08:00
MistEO
d96820a590 chore: 更新游戏数据 2022-10-22 17:55:01 +08:00
MistEO
63508cbfcb 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
MistEO
5e369f8f16 perf: 优化肉鸽地图部署 2022-10-22 13:20:24 +08:00
zzyyyl
98870fb646 fix(TaskData): 修复 syntax_check 检查模板类型时无法确定 algorithm 的问题 2022-10-21 16:39:16 +08:00
MistEO
fe03c75164 fix: 修复debug默认下外服加载错误，修复掉落上传服务器错误 2022-10-21 01:08:55 +08:00
MistEO
b3ee61649a fix: 修复肉鸽卡在“误入奇境”的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2367
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2262
 2022-10-21 00:53:51 +08:00
MistEO
64ff87877b perf: 优化肉鸽“NextLevel"任务 2022-10-20 23:27:01 +08:00
MistEO
a8b9b10561 fix: 修复傀影肉鸽卡在楼层界面的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1178
 2022-10-20 23:20:01 +08:00
MistEO
658a3629e0 fix: 修复“8面骰子”识别错误 2022-10-20 23:08:31 +08:00
MistEO
cbd53d436d fix: 修复水月肉鸽“海窟沙暴”关卡名识别错误 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2325
 2022-10-20 23:06:38 +08:00
MistEO
4c948b0485 fix: 初步修复日服掉落无法上传问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2363
 2022-10-20 22:10:53 +08:00
MistEO
7ebec10793 fix: 同步修复美服掉落识别的问题 2022-10-20 22:10:33 +08:00
MistEO
b9ec1e6477 fix: 修复基建搓玉补货后不换人的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2366
 2022-10-20 21:51:46 +08:00
zzyyyl
e24be62b83 fix: 同步外服 StartButton1 的设置 2022-10-20 16:41:07 +08:00
zzyyyl
843303a367 fix: JP Client 结算界面识别问题 again 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2363
 2022-10-20 16:35:01 +08:00
zzyyyl
6a86b43047 fix: JP Client 结算界面识别问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2363
 2022-10-20 16:20:16 +08:00
zzyyyl
003c5db0cd feat: 适配台服肉鸽 2022-10-15 22:38:17 +08:00
MistEO
0bcfbad87a Merge pull request #2272 from MaaAssistantArknights/refactor/roguelike 
refactor: 重构肉鸽任务并修改回调
 2022-10-15 22:28:00 +08:00
MistEO
1097950a9e Merge pull request #2322 from KiyuM1n/dev 
feat: 適配台服肉鴿
 2022-10-15 22:27:09 +08:00
KiyuM1n
3bb5ae5084 補齊部分圖檔 
剩餘
Roguelike1GamePass
Roguelike1GamePassSkip1
 2022-10-15 17:42:29 +08:00
zzyyyl
bb0d06dbcb feat: 新版肉鸽外服支持 2022-10-15 16:32:50 +08:00
zzyyyl
6e039269e1 perf: 修改部分任务名 2022-10-15 16:32:50 +08:00
zzyyyl
ec21bc401a fix: 修复回调 2022-10-15 16:32:50 +08:00
zzyyyl
5fd5c7d274 style: 字典序排列肉鸽相关 task 2022-10-15 16:32:50 +08:00
zzyyyl
c72c9983a6 fix: 修复写错的任务 2022-10-15 16:32:49 +08:00
zzyyyl
adbfd815ad refactor: 重构肉鸽文件结构 2022-10-15 16:32:49 +08:00
zzyyyl
f764904cc3 fix: 修复任务流程 2022-10-15 16:32:48 +08:00
KiyuM1n
f91818f558 加入肉鴿的文字替換 
不完整 只改了一小部分
 2022-10-15 03:17:04 +08:00
KiyuM1n
125c9b40b5 台服肉鴿圖檔 
Roguelike1StageDreadfulFoeEnter
Roguelike1GamePassSkip1
Roguelike1GamePass
因為還沒遇上 所以是國服的圖檔
 2022-10-15 03:15:13 +08:00
MistEO
be4de9c2e3 fix: 修复战斗中部分干员cooling识别错误的问题 
能天使 oper_cooling_analyze | 870
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2313
 2022-10-15 02:11:45 +08:00