fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 10:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,075 Commits 61 Branches 1,839 Tags
75f9e1b63d3704cb19fdfdfd7e2b431c41e9907a
Commit Graph

3075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
75f9e1b63d style: format 2022-08-14 03:06:10 +08:00
MistEO
05ab248ebe fix: 修复 C# 的一些warning，删除一些没用的参数 2022-08-14 02:59:25 +08:00
MistEO
6ca69d9ef7 feat: 新增支持对多开蓝叠 HyperV 模拟器的支持（需要自己修改配置） 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1533
 2022-08-14 02:17:32 +08:00
MistEO
edb1791594 fix: 修复基建宿舍信赖入驻的一些小问题 2022-08-14 02:07:02 +08:00
MistEO
5881544972 Merge pull request #1475 from Hydrogina/dev 
feat:dorm

增加宿舍蹭信赖功能。现在如果所有心情未满的干员已进入宿舍，会将信赖未满的干员加入宿舍的空位中。
 2022-08-14 01:47:25 +08:00
Hydrogina
3324646e50 fix:对按钮使用模板匹配，添加说明注释 2022-08-14 00:27:56 +08:00
Hydrogina
dee3f908bb fix:删除检测信赖值 2022-08-13 23:20:28 +08:00
MistEO
d4552f8a16 Merge pull request #1548 from horror-proton/test/functional 
perf: 简化部分 lambda 表达式的写法
 2022-08-13 22:56:07 +08:00
Horror Proton
08c153de3e perf: simplify for loops and lambdas, etc 2022-08-13 19:09:25 +08:00
MistEO
01b05fd85d style: format 2022-08-13 18:05:02 +08:00
Hydrogina
eae42b2045 fix:对按钮使用模板匹配 2022-08-13 11:26:59 +08:00
uye
0cce12228e fix: 修复自动编队部分干员识别问题 
fix #1543
 2022-08-13 11:06:48 +08:00
MistEO
27a6b6a1d0 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-13 00:13:02 +08:00
MistEO
a15bb0ced8 feat: 新增了一个暂时用不上的任务，修改一个变量名 2022-08-13 00:12:54 +08:00
zzyyyl
26940f8117 Merge branch 'master' into dev 2022-08-12 23:36:07 +08:00
zzyyyl
23226be5a9 chore: 更新 issue-checker 2022-08-12 23:30:49 +08:00
MistEO
673c823d40 feat: 界面支持公招三星设置短时间 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/1519
 2022-08-12 22:57:33 +08:00
Hydrogina
7c4b11ff0f fix:使用未进驻标签进行筛选 2022-08-12 21:47:17 +08:00
MistEO
17b42bd600 Merge pull request #1519 from horror-proton/test/recruit_time 
允许自定义公开招募时间
 2022-08-12 19:33:52 +08:00
uye
c3a7553729 Merge pull request #1535 from Tastror/dev 
修改了部分日文文本
 2022-08-12 19:32:03 +08:00
unknown
67b1800fb2 小改 2022-08-12 19:24:26 +08:00
unknown
0cc3fe111f 更新了日语内容 2022-08-12 19:18:55 +08:00
unknown
1811909e5d 修改了部分日文文本 2022-08-12 16:55:05 +08:00
zzyyyl
fb5fea6248 chore: Update issue template 2022-08-12 15:46:23 +08:00
uye
c32aafc183 fix: 修复活动关卡导航失败的问题 2022-08-12 13:47:50 +08:00
Hydrogina
50924f13f9 fix:通过ocr干员进驻设施标签，避免将正在控制中枢工作的干员放入宿舍 2022-08-12 12:26:15 +08:00
Horror Proton
fa86b9439f feat: update recruit time settings 2022-08-11 23:44:31 +08:00
Hydrogina
1e4d4ae7e2 fix:改为使用face_hash来鉴别干员入驻宿舍情况 2022-08-11 22:20:02 +08:00
MistEO
90b6b5194b 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
3cca7585c2 feat: add json interface for recruitment time 2022-08-11 21:44:17 +08:00
MistEO
ed32bf48ff Merge pull request #1512 from MaaAssistantArknights/feat/stage_wayfinding 
feat: 支持全部主线关卡导航（仅 core 部分）
 2022-08-11 21:35:28 +08:00
Horror Proton
83e8848517 feat: update recruit time adjustment to allow custom time settings 2022-08-11 20:12:25 +08:00
Horror Proton
9efdbdcac4 feat: use ocr to check recruit timer 2022-08-11 20:12:16 +08:00
MistEO
a82d429c92 Merge pull request #1514 from MaaAssistantArknights/dev 
Release v4.2.4
 2022-08-11 19:08:59 +08:00
MistEO
37f8d502ca docs: 更新CHANGELOG 2022-08-11 19:08:46 +08:00
MistEO
d84d0af048 chore: 开放 IC 关卡导航 2022-08-11 19:08:05 +08:00
MistEO
bea663e6ac Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-11 16:46:42 +08:00
MistEO
7b0f0bfe92 chore: 更新活动关卡掉落数据 2022-08-11 16:46:32 +08:00
MistEO
3f476c2818 Merge pull request #1516 from lhhxxxxx/dev 
refactor. uniform color style
 2022-08-11 10:56:22 +08:00
MistEO
2b4f82a4d3 chore: 更新泰迪仓库里的资源 2022-08-11 10:53:22 +08:00
lhhxxxxx
d3e969af02 style. 预览完整setting 2022-08-11 04:17:03 +08:00
lhhxxxxx
49379dfbfd refactor. uniform color style 2022-08-11 03:48:50 +08:00
zzyyyl
0980a23966 docs: update changelog 2022-08-11 01:15:53 +08:00
zzyyyl
1711a8c51d Merge pull request #1515 from MaaAssistantArknights/master 
chore: labeler 相关优化，增加英文议题模板
 2022-08-11 01:14:04 +08:00
zzyyyl
67b597949d docs: update changelog 2022-08-11 00:59:35 +08:00
zzyyyl
4b1516225d chore: 更新公招 傀影, 巫恋, 刻刀 的数据 2022-08-11 00:58:39 +08:00
MistEO
662ad67d4f docs: update changelog 2022-08-11 00:35:10 +08:00
Horror Proton
eac2e3f0d2 perf: remove an unused function 2022-08-11 00:28:04 +08:00
MistEO
e5d44474dd 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
8d0b5a80ca dev -> add boss stage names in EN 2022-08-10 12:17:17 -04:00