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
3,115 Commits 62 Branches 1,839 Tags
0da7fa63f2763c8a8783a9f7ff2feffc2ae2d0a5
Commit Graph

3115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
et
0da7fa63f2 fix: 后备招募逻辑无视 required 标志 2022-08-15 21:53:35 +08:00
et
ab11201fe1 style: 为 lambda 加上 const 2022-08-15 21:52:27 +08:00
et
71cbf6ceee perf: 使用重写的 ranges 2022-08-15 21:51:30 +08:00
et
76179ba9a5 style: 为新增的函数添加注释 2022-08-15 21:50:56 +08:00
et
9471ebe2eb feat: 肉鸽招募支持跨职业优先级 2022-08-15 21:22:53 +08:00
et
684fe99c09 feat: 添加肉鸽招募界面专用滑动 2022-08-15 18:50:02 +08:00
Stardust-Djohn
4ef01f35f5 docs: 补充了安卓手机使用adb连接MAA的说明，以及使用adb临时修改手机分辨率为720p的步骤 (#1560) 
* Update 模拟器支持.md

补充了安卓手机使用adb连接MAA的说明，以及使用adb临时修改手机分辨率为720p的步骤

* Update 模拟器支持.md

尝试改回上一次提交时前面部分弄乱的格式
X_X

* Update 模拟器支持.md

* Update 模拟器支持.md

* docs: 整理连接手机的文档，修正格式，加入无线 adb 的连接方法

* docs: 修正格式

* docs: 修正格式 again

Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-08-15 01:27:25 +08:00
uye
b34c318415 fix: 修复一个笔误 2022-08-15 00:34:38 +08:00
Horror Proton
aa5e5e2942 perf: change accessibility of derived member function with using keyword 2022-08-14 23:16:03 +08:00
MistEO
072e9827a5 test: 添加掉落识别测试集 2022-08-14 17:25:30 +08:00
MistEO
3b0c34e3e6 fix: 修复一处关卡掉落识别错误 
fix #1558
 2022-08-14 13:52:27 +08:00
lhhxxxxx
6443e54ee7 fix. 修复空白符导致无法识别的问题 2022-08-14 05:58:28 +08:00
MistEO
05022702ff style: format 2022-08-14 03:06:10 +08:00
MistEO
d6c86cbb2c fix: 修复 C# 的一些warning，删除一些没用的参数 2022-08-14 02:59:25 +08:00
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