Commit Graph

9166 Commits

Author SHA1 Message Date
status102
caa353cc53 fix: 修复无法对后续加载的图片资源进行存在检测的错误,跳过宿舍技能检查 2023-10-05 09:20:58 +08:00
北雁 Cryolitia
ae517e70bb fix: Sync with OS not working (#6672)
fix #6663 

sync with
3005f5593f (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
802886ddac 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
ea76c837b9 feat: 优化萨米肉鸽逻辑 (#6679) 2023-10-04 02:39:36 +08:00
Sherkey
6584762e98 fix: 修复错误条件下UI显示"投资后进入第二层"按钮的问题 (#6676)
之前铸币了(
2023-10-04 02:21:45 +08:00
Lancarus
324c550b79 feat: 优化萨米肉鸽逻辑 2023-10-04 02:09:00 +08:00
Infko
2ad09491df ci: 移除 qodana 的插件来恢复工作流 (#6675)
加载插件时 eap 有效期变为 30 天
不加载能有 60 天
2023-10-04 01:37:22 +08:00
zzyyyl
2f364315fd debug: 增加一项检查和一些日志 2023-10-04 00:44:02 +08:00
zzyyyl
73b5235f14 fix: 修复抄作业网络连接失败的问题
学姐改的什么玩意(

link to 7633dbfef2
2023-10-03 18:42:02 +08:00
Lancarus
65b76867a0 feat: 肉鸽不同层数逻辑 (#6508) 2023-10-03 15:57:57 +08:00
David
246d3e0943 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
0a5d655860 fix: 修复基建换班后刷理智失败的问题 2023-10-03 14:52:14 +08:00
zzyyyl
528fceacce fix: 修复肉鸽层数逻辑的小问题
Co-authored-by: Lancarus <duzhen92@qq.com>
2023-10-03 14:20:47 +08:00
David
8e16b0feb2 style: hidden "Manual switch" button 2023-10-02 21:49:56 +02:00
zzyyyl
0e259023f2 feat: 肉鸽烧水时低难度有热水无效,高难度烧到水才停止
主要针对第一次进入肉鸽
2023-10-03 03:49:01 +08:00
zzyyyl
3d80d2ee79 feat: 重写烧水 2023-10-03 03:13:56 +08:00
zzyyyl
03740b8bd2 perf: 一些简单的代码优化&重写 2023-10-03 02:54:01 +08:00
zzyyyl
9bc1ae8ab9 feat: 使用 ocrReplace 重写肉鸽选点策略 2023-10-03 02:54:00 +08:00
zzyyyl
42b0222116 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
9d4778e42e feat: 增加刷经验模式根据层数改变选点策略
Co-authored-by: Lancarus <duzhen92@qq.com>
2023-10-03 02:54:00 +08:00
Lancarus
c94fac2156 feat: 增加不同层数的stages策略 [skip ci] 2023-10-03 02:53:52 +08:00
MistEO
a16939bd1f fix: 修复模拟器连接错误的问题 (#6661) 2023-10-03 01:56:56 +08:00
SherkeyXD
328007bf8f refactor: 修改变量名使其更直观 2023-10-03 01:53:02 +08:00
SherkeyXD
5fc938eb93 fix: 修正在连接地址为空时蓝叠模拟器HyperV版本无法连接的问题 2023-10-03 01:27:40 +08:00
SherkeyXD
d99541bbbc fix: 修正tcp连接检测部分的错误变量名 2023-10-03 01:26:30 +08:00
Horror Proton
d233ace08e fix: fix crash caused by Matcher::set_task_info
fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/6654
2023-10-02 21:01:02 +08:00
zzyyyl
57fab38915 style: format 2023-10-02 20:55:51 +08:00
Lancarus
7361ec116c feat: 优化萨米肉鸽部关卡策略 (#6656) 2023-10-02 20:45:32 +08:00
zzyyyl
b2dbdf8f19 fix: 尝试修复掉落识别闪退的问题 2023-10-02 20:27:38 +08:00
Lancarus
b7df42c62c feat: 优化萨米肉鸽部关卡策略 2023-10-02 20:24:06 +08:00
zzyyyl
762435d29b chore: 源文件 -> Source
link to #6646
2023-10-02 19:25:06 +08:00
zzyyyl
94f624af30 fix: 修复肉鸽自动撤退字段引发闪退的问题 (#6650)
fix #6641
2023-10-02 18:28:39 +08:00
zzyyyl
5f6f780188 feat: 支持多图单阈值的写法 2023-10-02 18:02:37 +08:00
MiaoYan JY
2b7500cbe5 fix: 修复肉鸽自动撤退字段引发闪退的问题 2023-10-02 17:52:14 +08:00
zzyyyl
bc8a1d8108 fix: templThreshold 2023-10-02 17:46:38 +08:00
zzyyyl
d6821e8871 fix: smoking test 2023-10-02 17:40:34 +08:00
MistEO
ed96142f4e perf: 肉鸽主题从Status分离 (#6646) 2023-10-02 17:20:37 +08:00
zzyyyl
04799bb0cd fix: 修复模板匹配阈值解析错误的问题 2023-10-02 17:20:00 +08:00
status102
00a9e1e9a8 perf: 肉鸽主题从Status分离 2023-10-02 16:55:14 +08:00
MistEO
d674a14f7f fix: 尝试修复基建的模板匹配错误 2023-10-02 16:44:34 +08:00
David
8cdbed22f0 chore: updated event schedule 2023-10-02 10:38:35 +02:00
David
00194a6113 fix: disabled cache for multi template recognition
ref:
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/6608#issuecomment-1742462512
2023-10-02 09:38:37 +02:00
zzyyyl
8df318fc3f fix: 修复 templ size is too large 时闪退的问题
fix #6639
2023-10-02 15:11:04 +08:00
David
8c7f6a690e fix: typo in StartToWakeUpOCR EN 2023-10-02 08:57:26 +02:00
MistEO
b1ba112a3d perf: WpfGui自动战斗解析作业后,提示文本移动至最顶端 (#6625) 2023-10-02 11:40:05 +08:00
MistEO
956ceed350 fix: 修复Costura未正常启用的问题 (#6632) 2023-10-02 11:39:34 +08:00
MistEO
20233ec7ad feat: 支持多模板匹配,任一达到阈值即视为命中 (#6608) 2023-10-02 11:37:40 +08:00
David
a65da98152 fix: LoopTimes no longer negative
fix #6634
2023-10-01 23:48:18 +02:00
David
29c162ada7 chore: added new ignored templates
[skip ci]
2023-10-01 22:35:04 +02:00
David
0ac8f87a40 perf: BattleQuickFormationRole cleared templates
[skip ci]
2023-10-01 22:34:39 +02:00