fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 18:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,268 Commits 61 Branches 1,839 Tags
7ebce50f2f8d26ff7022c75d0ec0e64cb0b1747b
Commit Graph

4577 Commits

Author SHA1 Message Date
Songyang.Huo
7ebce50f2f 修复一处提示文本格式化错误。 2023-10-06 16:31:01 +08:00
Songyang.Huo
d5233af8da 增加了对Https的校验 2023-10-06 16:15:17 +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
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
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
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
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
zzyyyl
5858a61967 debug: 增加一项检查和一些日志 2023-10-04 00:44:02 +08:00
zzyyyl
2bf60de8c7 fix: 修复抄作业网络连接失败的问题 
学姐改的什么玩意（

link to 919cc79e68
 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
MiaoYan JY
d1d88759f2 feat: 新增匹配av号、bv号以及分p的支持 2023-10-03 14:04:15 +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
25fbc4cf5c feat: 增加刷经验模式根据层数改变选点策略 
Co-authored-by: Lancarus <duzhen92@qq.com>
 2023-10-03 02:54:00 +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
 2023-10-02 21:01:02 +08:00
zzyyyl
c8c45cf6d8 style: format 2023-10-02 20:55:51 +08:00
zzyyyl
bf4134efb2 fix: 尝试修复掉落识别闪退的问题 2023-10-02 20:27:38 +08:00
status102
bd72f57f38 feat: 肉鸽新增 WpfGui选项-中止行为等待至本次战斗结束后 2023-10-02 19:58:48 +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: 支持多图单阈值的写法 2023-10-02 18:02:37 +08:00
MiaoYan JY
4b866fb93e fix: 修复肉鸽自动撤退字段引发闪退的问题 2023-10-02 17:52:14 +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
zzyyyl
466be7766d fix: 修复 templ size is too large 时闪退的问题 
fix #6639
 2023-10-02 15:11:04 +08:00
MistEO
37332ee0d5 perf: WpfGui自动战斗解析作业后，提示文本移动至最顶端 (#6625) 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
SherkeyXD
9e5c999f23 fix: 修复Costura未正常启用的问题 2023-10-02 02:24:10 +08:00
Lancarus
853af70ac1 fix: 修复肉鸽助战招募卡住放弃的问题 (#6630) 
fix #6556
 2023-10-02 01:48:52 +08:00