fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,247 Commits 60 Branches 1,840 Tags
a077e587193d83bb8037cf2c3666e51ecbe9911b
Commit Graph

9247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
zzyyyl
d14f7482f2 fix: 修复肉鸽层数逻辑的小问题 
Co-authored-by: Lancarus <duzhen92@qq.com>
 2023-10-03 14:20:47 +08:00
David
4c4cdcb280 style: hidden "Manual switch" button 2023-10-02 21:49:56 +02:00
zzyyyl
6256dc111d feat: 肉鸽烧水时低难度有热水无效，高难度烧到水才停止 
主要针对第一次进入肉鸽
 2023-10-03 03:49:01 +08:00
zzyyyl
576155f545 feat: 重写烧水 2023-10-03 03:13:56 +08:00
zzyyyl
2272578cc0 perf: 一些简单的代码优化&重写 2023-10-03 02:54:01 +08:00
zzyyyl
611d292a12 feat: 使用 ocrReplace 重写肉鸽选点策略 2023-10-03 02:54:00 +08:00
zzyyyl
952bb8a539 feat: 按照 review 意见修改 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/6508#discussion_r1342628042

Co-authored-by: Lancarus <duzhen92@qq.com>
 2023-10-03 02:54:00 +08:00
zzyyyl
25fbc4cf5c feat: 增加刷经验模式根据层数改变选点策略 
Co-authored-by: Lancarus <duzhen92@qq.com>
 2023-10-03 02:54:00 +08:00
Lancarus
a47a313a61 feat: 增加不同层数的stages策略 [skip ci] 2023-10-03 02:53:52 +08:00
MistEO
915aa0f53b fix: 修复模拟器连接错误的问题 (#6661) 2023-10-03 01:56:56 +08:00
SherkeyXD
44f5ae0f4b refactor: 修改变量名使其更直观 2023-10-03 01:53:02 +08:00
SherkeyXD
df4219da8f fix: 修正在连接地址为空时蓝叠模拟器HyperV版本无法连接的问题 2023-10-03 01:27:40 +08:00
SherkeyXD
ce982ebdab fix: 修正tcp连接检测部分的错误变量名 2023-10-03 01:26:30 +08:00
Horror Proton
5f106ab0a5 fix: fix crash caused by Matcher::set_task_info 
fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/6654
alpha/v4.24.1-alpha.1.d183.g5f106ab0a 		2023-10-02 21:01:02 +08:00
zzyyyl
c8c45cf6d8 style: format 2023-10-02 20:55:51 +08:00
Lancarus
ec6afec1dd feat: 优化萨米肉鸽部关卡策略 (#6656) 2023-10-02 20:45:32 +08:00
zzyyyl
bf4134efb2 fix: 尝试修复掉落识别闪退的问题 2023-10-02 20:27:38 +08:00
Lancarus
e8baa79e73 feat: 优化萨米肉鸽部关卡策略 2023-10-02 20:24:06 +08:00
zzyyyl
d437a64480 chore: 源文件 -> Source 
link to #6646
 2023-10-02 19:25:06 +08:00
zzyyyl
efd19d2a0b fix: 修复肉鸽自动撤退字段引发闪退的问题 (#6650) 
fix #6641
 2023-10-02 18:28:39 +08:00
zzyyyl
aaafed51a1 feat: 支持多图单阈值的写法 alpha/v4.24.1-alpha.1.d175.gaaafed51a 2023-10-02 18:02:37 +08:00
MiaoYan JY
4b866fb93e fix: 修复肉鸽自动撤退字段引发闪退的问题 2023-10-02 17:52:14 +08:00
zzyyyl
1f9ef990e2 fix: templThreshold 2023-10-02 17:46:38 +08:00
zzyyyl
b949868455 fix: smoking test 2023-10-02 17:40:34 +08:00
MistEO
a5f8569528 perf: 肉鸽主题从Status分离 (#6646) 2023-10-02 17:20:37 +08:00
zzyyyl
209c906b56 fix: 修复模板匹配阈值解析错误的问题 2023-10-02 17:20:00 +08:00
status102
e8cc326a68 perf: 肉鸽主题从Status分离 2023-10-02 16:55:14 +08:00
MistEO
7a80079015 fix: 尝试修复基建的模板匹配错误 2023-10-02 16:44:34 +08:00
David
c6c9a37a13 chore: updated event schedule 2023-10-02 10:38:35 +02:00
David
183a9a5f29 fix: disabled cache for multi template recognition 
ref:
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/6608#issuecomment-1742462512
alpha/v4.24.1-alpha.1.d167.g183a9a5f2 		2023-10-02 09:38:37 +02:00
zzyyyl
466be7766d fix: 修复 templ size is too large 时闪退的问题 
fix #6639
 2023-10-02 15:11:04 +08:00
David
48116037ac fix: typo in StartToWakeUpOCR EN 2023-10-02 08:57:26 +02:00
MistEO
37332ee0d5 perf: WpfGui自动战斗解析作业后，提示文本移动至最顶端 (#6625) alpha/v4.24.1-alpha.1.d164.g37332ee0d 2023-10-02 11:40:05 +08:00
MistEO
6fd642b01d fix: 修复Costura未正常启用的问题 (#6632) 2023-10-02 11:39:34 +08:00
MistEO
436dcd1d11 feat: 支持多模板匹配，任一达到阈值即视为命中 (#6608) 2023-10-02 11:37:40 +08:00
David
ff88092e0a fix: LoopTimes no longer negative 
fix #6634
 2023-10-01 23:48:18 +02:00
David
e1253dec1e chore: added new ignored templates 
[skip ci]
 2023-10-01 22:35:04 +02:00
David
aa1c17baa3 perf: BattleQuickFormationRole cleared templates 
[skip ci]
 2023-10-01 22:34:39 +02:00