fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 18:01:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,396 Commits 61 Branches 1,838 Tags
c162a1912a0fbb0a67bca1b00a7aeaa010797746
Commit Graph

703 Commits

Author SHA1 Message Date
MistEO
2663324bce merge: dev to perf/multi_ocr 2022-10-25 22:44:33 +08:00
MistEO
be3cf8abb7 fix: fix rebase error 2022-10-25 22:33:04 +08:00
MistEO
7236c6bc91 perf: 删除一些已经用不上了的数字replace 2022-10-25 22:33:04 +08:00
zzyyyl
14e2038abe feat: 更新战斗结束的模板图片 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2422
 2022-10-25 02:09:09 +08:00
MistEO
b771b0c9f5 fix: fix rebase error 2022-10-24 23:38:01 +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
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
zzyyyl
5a83408fca fix: 修复关卡 溟痕乐园 识别错误的问题 2022-10-22 23:31:16 +08:00
zzyyyl
98870fb646 fix(TaskData): 修复 syntax_check 检查模板类型时无法确定 algorithm 的问题 2022-10-21 16:39:16 +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
b9ec1e6477 fix: 修复基建搓玉补货后不换人的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2366
 2022-10-20 21:51:46 +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
MistEO
be4de9c2e3 fix: 修复战斗中部分干员cooling识别错误的问题 
能天使 oper_cooling_analyze | 870
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2313
 2022-10-15 02:11:45 +08:00
zzyyyl
f418059b4c fix: 修复嵯峨 ocr 识别错误的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2317
 2022-10-14 15:20:33 +08:00
uye
e0c412e400 fix: 修复11章开启后自定义导航无法进入第9/10章 2022-10-14 01:37:14 +08:00
Horror Proton
63db7af6fd fix: add ocr replace for recruit tag 王员 手员 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2299
 2022-10-13 13:28:07 +08:00
MistEO
0ced784169 fix: 修复肉鸽战斗中一直点能天使的问题 2022-10-12 21:51:27 +08:00
MistEO
d9eb81c6e8 fix: 修复水月肉鸽中，排异反应干员无法识别的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2177
 2022-10-11 23:03:55 +08:00
MistEO
0936704e54 fix: 修复肉鸽选技能太快卡在开始行动界面的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2280
 2022-10-11 20:15:28 +08:00
MistEO
396981e73d fix: 修复会客室不收取线索的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2273
 2022-10-11 19:57:01 +08:00
MistEO
9a5cb3a7a7 fix: 修复水月肉鸽通关后卡住的问题 2022-10-11 19:32:45 +08:00
MistEO
5bb329b612 fix: 修复傀影肉鸽凌晨4点更新后卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2242
 2022-10-09 17:17:00 +08:00
MistEO
ddbffcdd69 fix: 修复战斗中将“能天使”认为是cooling的问题 
oper_cooling_analyze | 804
 2022-10-09 14:31:38 +08:00
DavidWang19
a21812a676 fix: 修复了召唤物识别错误的问题 2022-10-09 00:56:34 +08:00
MistEO
f83d55e9c2 feat: 新增肉鸽队伍满时降低招募优先级+提升晋升优先级的逻辑 2022-10-09 00:55:13 +08:00
DavidWang19
3bfbfa86c2 resolve conflict 2022-10-09 00:54:09 +08:00
zzyyyl
b13019ddc0 fix: 修复各种 tasks.json 2022-10-09 00:42:53 +08:00
MistEO
9e7abf4b74 Merge pull request #2116 from MaaAssistantArknights/feat/at 
feat: 增加模板任务逻辑
 2022-10-09 00:05:48 +08:00
MistEO
3ff3f89a59 fix: 修复傀影肉鸽潜在的不期而遇卡住问题 2022-10-08 23:15:39 +08:00
MistEO
0626d32a03 fix: 修复网络不佳时，信用商店购物卡住的问题。并优化信用商店购物速度 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1349
 2022-10-08 21:01:16 +08:00
MistEO
a217bbd2f0 fix: 修复水月肉鸽在干员招募界面弹出奖励后不招干员的问题 2022-10-08 20:33:16 +08:00
zzyyyl
f62a387e8f perf: 优化肉鸽重连逻辑 
怎么全是 deletion？没想到吧
 2022-10-07 22:00:53 +08:00
zzyyyl
2047422b9c feat: 更新 tasks.json 
1. StartUp 任务在 EndOfAction 界面不再直接停止，而是一直点击返回直到主界面
2. 把 StartUp 相关的 task 放到一起
3. `set_times_limit("A")` 对 `B@A`、`B@...@A` 任务也生效
 2022-10-07 19:57:30 +08:00
zzyyyl
95b5362b2c refactor: 用模板任务简化 task 2022-10-07 19:55:31 +08:00