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
9,490 Commits 61 Branches 1,838 Tags
9e56a8bd29b1fbcf6d3901a9779d3c94dea1631f
Commit Graph

9490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Songyang.Huo
19d89dd935 Merge branch 'dev' of https://github.com/hsyhhssyy/MaaAssistantArknights into dev 2023-10-06 18:02:03 +08:00
Songyang.Huo
05d0c02ad4 将所有字符串l18n内容移动到一起，补全所有l18n并据其调整了一点界面格式. 2023-10-06 18:01:46 +08:00
MistEO
d61ed3a3c0 fix: 修复无法对后续加载的图片资源进行存在检测的错误，跳过宿舍技能检查 (#6686) 2023-10-06 17:56:20 +08:00
MistEO
f1f77e626a chore: 改改注释 2023-10-06 17:56:01 +08:00
MistEO
5c28e6ec4b feat: OCR manipulation params for QuickFormation (#6697) 2023-10-06 17:54:13 +08:00
SherkeyXD
a26e901b29 docs: 添加远程控制部分的文档 
Co-authored-by: Songyang.Huo <hsyhhssyy@gmail.com>
 2023-10-06 17:45:44 +08:00
Songyang.Huo
c1b5199f4c 删除意外添加的没用的内容 2023-10-06 16:39:06 +08:00
Songyang.Huo
b2438153a9 删掉意外添加的没用的内容 2023-10-06 16:37:58 +08:00
Songyang.Huo
7ebce50f2f 修复一处提示文本格式化错误。 2023-10-06 16:31:01 +08:00
Songyang.Huo
d5233af8da 增加了对Https的校验 2023-10-06 16:15:17 +08:00
shxyke
e6b0d58a8e chore: add ability to download specific maadeps (#6700) 2023-10-06 09:31:16 +08:00
David
5f2b003630 chroe: cn default values 2023-10-05 21:32:34 +02:00
youqii
b1257356f1 docs: 更新回调消息协议 2023-10-05 21:48:19 +08:00
youqii
f0fabfb4b4 pref: 根据 qodana 优化代码 2023-10-05 20:59:42 +08:00
youqii
b535f1ef80 feat: 增加回调消息，增加多语言界面适配 2023-10-05 20:01:29 +08:00
youqii
470d3c712d feat: 优化任务逻辑 2023-10-05 20:01:28 +08:00
youqii
bdb8f777b6 feat: 在GUI中加入选项 2023-10-05 20:01:28 +08:00
youqii
fa132665ef feat: 公招用完招募许可后继续刷新 2023-10-05 20:01:28 +08:00
shxyke
9dd1315170 fix: fix host executable suffix error alpha/v4.24.1-alpha.1.d226.g9dd131517 2023-10-05 17:26:10 +08:00
zzyyyl
cf348d7a19 feat: 支持不同界面公招 2023-10-05 17:07:35 +08:00
status102
7a0c10864e perf: 移除m_loaded 2023-10-05 09:25:22 +08:00
status102
40d092b11b fix: 修复无法对后续加载的图片资源进行存在检测的错误，跳过宿舍技能检查 2023-10-05 09:20:58 +08:00
Songyang.Huo
0aeef53151 Merge branch 'MaaAssistantArknights-dev' into dev 2023-10-05 08:51:38 +08:00
Songyang.Huo
231b61d55a ResolveConflict 2023-10-05 08:51:20 +08:00
Songyang.Huo
22f3323517 远程控制功能 2023-10-05 08:45:07 +08:00
David
877d4dd4be chore: specialParams implementation 2023-10-04 22:23:13 +02:00
David
414256d2a4 feat: OCR manipulation for QuickFormation 2023-10-04 22:22:56 +02:00
David
0f444ac923 fix: 泰拉大陆调查团 EN regex 
[skip ci]
alpha/v4.24.1-alpha.1.d224.g0f444ac92 		2023-10-04 21:11:31 +02:00
zzyyyl
a6d557e11d debug: 删除一些日志 2023-10-05 02:41:38 +08:00
zzyyyl
81bdc4425f fix: 修复肉鸽获取 Sami@Roguelike@StrategyChange 等任务时的闪退问题 
憨憨 zzyyyl 不会用 string_view
 2023-10-05 02:36:23 +08:00
MistEO
f4da503520 feat: 新增av号、bv号对分p的支持 (#6670) 2023-10-04 22:50:01 +08:00
MistEO
d498217bbc docs: 优化文档视觉效果，添加文档编写指南 (#6611) 2023-10-04 22:49:44 +08:00
MistEO
37b5925b75 feat: Add ThriftController (#6573) 2023-10-04 22:49:26 +08:00
MistEO
7db3936e1c feat: WpfGui新增 肉鸽设置-中止行为等待至本次战斗结束后 (#6591) 2023-10-04 22:47:06 +08:00
MistEO
238509170f feat: 自动战斗-战斗列表-关卡名允许在作业标题未匹配到关卡名时，对文件名进行匹配。若还无法匹配到，则置空 (#6694) 2023-10-04 22:45:17 +08:00
status102
fcca77c9c9 feat: 自动战斗-战斗列表-关卡名允许在作业标题未匹配到关卡名时，对文件名进行匹配。若还无法匹配到，则置空 2023-10-04 21:12:27 +08:00
status102
1eadcde4b0 fix: remove test code 2023-10-04 13:59:39 +08:00
shxyke
a077e58719 feat: Add ThriftController 2023-10-04 09:53:16 +08:00
北雁 Cryolitia
2a2c137d82 fix: Sync with OS not working (#6672) 
fix #6663 

sync with
6c5265022c (diff-36c75f83140bc44df90233c9c18fa86d157ce94b19f15290a13b72dff0fa5e03R446)

sync with
686f88631f

fix a stupid enum type convert problem that caused #6663
0833cc1019 (diff-36c75f83140bc44df90233c9c18fa86d157ce94b19f15290a13b72dff0fa5e03L3260)
 2023-10-03 20:57:58 +02:00
David
1f9f48128f fix: Combat with Support templ error 
fix lazy load template error Fight with Support #6584
[skip ci]
 2023-10-03 20:47:06 +02:00
Lancarus
7b354505be feat: 优化萨米肉鸽逻辑 (#6679) 2023-10-04 02:39:36 +08:00
Sherkey
7cc1139ad9 fix: 修复错误条件下UI显示"投资后进入第二层"按钮的问题 (#6676) 
之前铸币了（
 2023-10-04 02:21:45 +08:00
Lancarus
acad862075 feat: 优化萨米肉鸽逻辑 2023-10-04 02:09:00 +08:00
Infko
0ae8591edb ci: 移除 qodana 的插件来恢复工作流 (#6675) 
加载插件时 eap 有效期变为 30 天
不加载能有 60 天
 2023-10-04 01:37:22 +08:00
zzyyyl
5858a61967 debug: 增加一项检查和一些日志 alpha/v4.24.1-alpha.1.d201.g5858a6196 2023-10-04 00:44:02 +08:00
zzyyyl
2bf60de8c7 fix: 修复抄作业网络连接失败的问题 
学姐改的什么玩意（

link to 919cc79e68
alpha/v4.24.1-alpha.1.d200.g2bf60de8c 		2023-10-03 18:42:02 +08:00
MiaoYan JY
587ec35c6b feat: 优化正则 2023-10-03 17:00:16 +08:00
Lancarus
7ef39b00e1 feat: 肉鸽不同层数逻辑 (#6508) 2023-10-03 15:57:57 +08:00
David
000459dd34 style: hidden "Manual switch" button (#6665) 
YostarEN, KR and JP do not allow multi-accounting. The "Manual Switch" button
is not needed
 2023-10-03 09:56:22 +02:00
zzyyyl
2ce48e5bcf fix: 修复基建换班后刷理智失败的问题 alpha/v4.24.1-alpha.1.d188.g2ce48e5bc 2023-10-03 14:52:14 +08:00