fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 17:57:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,101 Commits 61 Branches 1,837 Tags
fc40fde80e058f8d13f1a6e2c4e885131ba73e81
Commit Graph

3101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
fc40fde80e feat: 新增支持对多开蓝叠 HyperV 模拟器的支持（需要自己修改配置） 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1533
 2022-08-14 02:17:32 +08:00
MistEO
a7daedcc60 fix: 修复基建宿舍信赖入驻的一些小问题 2022-08-14 02:07:02 +08:00
MistEO
afb565654f Merge pull request #1475 from Hydrogina/dev 
feat:dorm

增加宿舍蹭信赖功能。现在如果所有心情未满的干员已进入宿舍，会将信赖未满的干员加入宿舍的空位中。
 2022-08-14 01:47:25 +08:00
Hydrogina
700f6ae803 fix:对按钮使用模板匹配，添加说明注释 2022-08-14 00:27:56 +08:00
Hydrogina
33e89ad993 fix:删除检测信赖值 2022-08-13 23:20:28 +08:00
MistEO
86b073ff6d Merge pull request #1548 from horror-proton/test/functional 
perf: 简化部分 lambda 表达式的写法
 2022-08-13 22:56:07 +08:00
Horror Proton
4f27e3e162 perf: simplify for loops and lambdas, etc 2022-08-13 19:09:25 +08:00
MistEO
1815c83756 style: format 2022-08-13 18:05:02 +08:00
Hydrogina
dc0f045aea fix:对按钮使用模板匹配 2022-08-13 11:26:59 +08:00
uye
4954a590a1 fix: 修复自动编队部分干员识别问题 
fix #1543
 2022-08-13 11:06:48 +08:00
MistEO
5234ee5c64 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-13 00:13:02 +08:00
MistEO
fc967847a7 feat: 新增了一个暂时用不上的任务，修改一个变量名 2022-08-13 00:12:54 +08:00
zzyyyl
7c5de57f97 Merge branch 'master' into dev 2022-08-12 23:36:07 +08:00
zzyyyl
7fade2b71f chore: 更新 issue-checker 2022-08-12 23:30:49 +08:00
MistEO
84b488974e feat: 界面支持公招三星设置短时间 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/1519
 2022-08-12 22:57:33 +08:00
Hydrogina
cfbc2c0989 fix:使用未进驻标签进行筛选 2022-08-12 21:47:17 +08:00
MistEO
85d36ee653 Merge pull request #1519 from horror-proton/test/recruit_time 
允许自定义公开招募时间
 2022-08-12 19:33:52 +08:00
uye
d0085b7ace Merge pull request #1535 from Tastror/dev 
修改了部分日文文本
 2022-08-12 19:32:03 +08:00
unknown
0788a29b2a 小改 2022-08-12 19:24:26 +08:00
unknown
2000531b73 更新了日语内容 2022-08-12 19:18:55 +08:00
unknown
752483bbaa 修改了部分日文文本 2022-08-12 16:55:05 +08:00
zzyyyl
e2f57aeb2d chore: Update issue template 2022-08-12 15:46:23 +08:00
uye
94142f2636 fix: 修复活动关卡导航失败的问题 2022-08-12 13:47:50 +08:00
Hydrogina
89c39142ed fix:通过ocr干员进驻设施标签，避免将正在控制中枢工作的干员放入宿舍 2022-08-12 12:26:15 +08:00
Horror Proton
973d9e503b feat: update recruit time settings 2022-08-11 23:44:31 +08:00
Hydrogina
91533cf7ba fix:改为使用face_hash来鉴别干员入驻宿舍情况 2022-08-11 22:20:02 +08:00
MistEO
83ba7ba1b8 fix: 修复肉鸽招募识别不到干员的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1523
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1474
 2022-08-11 22:10:02 +08:00
Horror Proton
99943a4e3c feat: add json interface for recruitment time 2022-08-11 21:44:17 +08:00
MistEO
f865791a99 Merge pull request #1512 from MaaAssistantArknights/feat/stage_wayfinding 
feat: 支持全部主线关卡导航（仅 core 部分）
 2022-08-11 21:35:28 +08:00
Horror Proton
968453e4c2 feat: update recruit time adjustment to allow custom time settings 2022-08-11 20:12:25 +08:00
Horror Proton
e253a4605c feat: use ocr to check recruit timer 2022-08-11 20:12:16 +08:00
MistEO
2d4c762de1 Merge pull request #1514 from MaaAssistantArknights/dev 
Release v4.2.4
v4.2.4 		2022-08-11 19:08:59 +08:00
MistEO
8e6ae4df3a docs: 更新CHANGELOG 2022-08-11 19:08:46 +08:00
MistEO
e4068166d8 chore: 开放 IC 关卡导航 2022-08-11 19:08:05 +08:00
MistEO
42c21695b9 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-11 16:46:42 +08:00
MistEO
dee7ccd967 chore: 更新活动关卡掉落数据 2022-08-11 16:46:32 +08:00
MistEO
adbf009652 Merge pull request #1516 from lhhxxxxx/dev 
refactor. uniform color style
 2022-08-11 10:56:22 +08:00
MistEO
e2a91885cc chore: 更新泰迪仓库里的资源 2022-08-11 10:53:22 +08:00
lhhxxxxx
f1eabc9e5f style. 预览完整setting 2022-08-11 04:17:03 +08:00
lhhxxxxx
0ef76eee4a refactor. uniform color style 2022-08-11 03:48:50 +08:00
zzyyyl
224d51fdbb docs: update changelog 2022-08-11 01:15:53 +08:00
zzyyyl
4a7cf2d018 Merge pull request #1515 from MaaAssistantArknights/master 
chore: labeler 相关优化，增加英文议题模板
 2022-08-11 01:14:04 +08:00
zzyyyl
80688cc6b8 docs: update changelog 2022-08-11 00:59:35 +08:00
zzyyyl
e90889dec8 chore: 更新公招 傀影, 巫恋, 刻刀 的数据 2022-08-11 00:58:39 +08:00
MistEO
1b27f14a58 docs: update changelog 2022-08-11 00:35:10 +08:00
Horror Proton
a31b6c3cb0 perf: remove an unused function 2022-08-11 00:28:04 +08:00
MistEO
d475f1a591 Merge pull request #1513 from cookie223/patch-3 
dev -> add boss stage names in EN
 2022-08-11 00:19:21 +08:00
Qi Chu
d2996c64a3 dev -> add boss stage names in EN 2022-08-10 12:17:17 -04:00
MistEO
a16168aff7 Merge pull request #1507 from cglcv/dev 
fix. 修复目录带空格时无法自启的问题
 2022-08-11 00:13:45 +08:00
MistEO
028f55558e feat: 支持全部主线关卡导航（仅 core 部分） 2022-08-11 00:05:56 +08:00