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
8,177 Commits 60 Branches 1,840 Tags
389357d301e970159209bb6e6c19b13dd30e7fc1
Commit Graph

8177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
389357d301 chore: Auto Update Game Resources - 2023-07-31 alpha/v4.20.1-alpha.1.d125.g389357d30 2023-07-31 21:47:44 +00:00
David
aed571b6d2 fix: missing name-component for SSS + tweaked regex 2023-07-31 23:45:28 +02:00
David
ac230a68e9 fix: Dossoles ROI and Stage name fixes + temp OCR rep for long names 2023-07-31 23:27:16 +02:00
uye
4e15ae3077 fix: 修正繁中服水月肉鴿 "漩渦" 的關卡辨識問題 (#5731) 2023-07-31 19:39:07 +08:00
uye
7dc204014e feat: 主目录存在 DEBUG.txt 时每次开始任务都重新解析tasks.json (#5736) 2023-07-31 19:33:14 +08:00
uye
1efb690e4f fix: 关闭模拟器权限不够时失败报错 
fix #5739
 2023-07-31 19:04:36 +08:00
uye
49a8393e6e feat: debug版本/release版本加DEBUG.txt load时重新加载tasks.json 2023-07-31 18:47:54 +08:00
uye
205694959b fix: 连接失败后自动重启模拟器功能失效 
fix #5732
alpha/v4.20.1-alpha.1.d116.g205694959 		2023-07-31 12:45:35 +08:00
uye
0b1bb2f6c7 feat: 主目录存在 DEBUG.txt 时每次开始任务都重新解析tasks.json 2023-07-31 11:32:30 +08:00
momomochi
4eaf0dd5f0 修正 "漩渦" 的辨識問題 2023-07-31 09:23:25 +08:00
David
67538b8c0e Rename SSS_AcahuallanJungle.json to SSS_AcahuallanJungle_WORKING.json 2023-07-30 23:23:07 +02:00
David
27d3922302 Rename SSS_Under-ConstructionDossolesPlate.json to SSS_Dossoles_BROKEN_,waitforfix.json 2023-07-30 23:22:37 +02:00
MistEO
111082f118 chore: Auto Update Game Resources - 2023-07-30 alpha/v4.20.1-alpha.1.d113.g111082f11 2023-07-30 20:46:29 +00:00
David
129f9a2a5b feat: SSS Implementation for YostarEN 2023-07-30 22:35:29 +02:00
David
f668b5aece duplicate: same as 5f0f2f8610 2023-07-30 17:20:56 +02:00
David
5aad921076 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-07-30 16:47:05 +02:00
David
10c5f832a1 i18n: 5ec976c919 moved changes to new file to allow future edits 2023-07-30 16:47:00 +02:00
MistEO
a7b7241d32 繁中服肉鴿 (#5717) 2023-07-30 22:23:35 +08:00
MistEO
60604a6934 fix:修复了傀影肉鸽部分关卡的部署逻辑 (#5712) 2023-07-30 22:23:19 +08:00
David
5f0f2f8610 duplicate: same as 1aebcee468 2023-07-30 14:45:09 +02:00
David
1aebcee468 duplicate: repeats in Ocr replace EN tasks.json 2023-07-30 14:44:15 +02:00
Lancarus
1034c980fa fix:修复了傀影肉鸽部分关卡的作战逻辑 2023-07-30 19:50:25 +08:00
Lancarus
77eadc2e25 fix:配合作战逻辑更改了部分傀影肉鸽不期而遇事件的选项 2023-07-30 19:47:45 +08:00
Lancarus
2246bdbc73 fix:修复了傀影肉鸽的商品与顺序 
增加了"effect"和“no”字段方便查看效果和prts比对
 2023-07-30 19:45:41 +08:00
Lancarus
1bdd36bbb4 Merge branch 'MaaAssistantArknights:dev' into dev 2023-07-30 19:39:41 +08:00
uye
09113ef6ca Implement ADB hard restart. (#5666) 2023-07-30 19:32:44 +08:00
AsterNighT
5d8eb72e74 Fix: Wrap Process.Kill in try/catch 2023-07-30 19:04:35 +08:00
David
e1ea9a6299 chore: SSS available in global, removed from regex 2023-07-30 12:59:36 +02:00
vonnoq
5ea526dcd7 繁中服水月肉鴿過關圖 2023-07-30 18:30:36 +08:00
vonnoq
4611279bfd Merge branch 'MaaAssistantArknights:dev' into dev 2023-07-30 18:28:33 +08:00
David
5ec976c919 i18n: Added EN translation to SSS files 2023-07-30 12:11:34 +02:00
uye
f1fcf1190e typo: fix typo 2023-07-30 17:29:31 +08:00
uye
36aa9bae3c feat: 繁中服支持牛牛抽卡 
fix #5652
 2023-07-30 17:29:03 +08:00
uye
3dd14b373c fix: 主线导航识别问题 2023-07-30 17:12:08 +08:00
uye
d425389372 feat: 给牛牛抽卡提示增加阴间特效 (#5694) 2023-07-30 15:37:35 +08:00
vonnoq
1c0ce607e9 繁中服肉鴿 2023-07-30 15:31:08 +08:00
uye
845a26ace5 fix: mumu模拟器在游戏未启动时关闭游戏报错，增加关闭游戏日志和判断 2023-07-30 14:36:00 +08:00
Lancarus
993c114e5d fix:修复了傀影肉鸽部分关卡的部署逻辑 
删掉了"blacklist_location"里和"deploy_plan"冲突的坐标
 2023-07-30 12:20:18 +08:00
MistEO
1292313bb9 Fix:一些文字识别问题与死囚之夜部分高台站位 (#5710) 2023-07-30 10:07:46 +08:00
MistEO
07256ed138 优化傀影肉鸽招募逻辑和棘刺队作战逻辑 (#5707) 2023-07-30 10:07:00 +08:00
cenfusheng
3c6961d74b Fix: 修复归溟幽灵鲨的识别问题 2023-07-30 09:40:30 +08:00
cenfusheng
568dee5a10 Fix: 修复繁中服部分带标点的文字识别内容（TXWY） 
万恶的引号
 2023-07-30 09:34:30 +08:00
cenfusheng
f2e03ba03a Fix: 优化死囚之夜高台斩味 2023-07-30 09:24:39 +08:00
cenfusheng
c45fb68aad Fix: 修复部分异格干员的文字识别问题（TXWY） 
不给异格本体加^是吧（
 2023-07-30 09:04:42 +08:00
Lancarus
e52877a2bf 优化傀影肉鸽部分关卡作战逻辑 2023-07-30 05:48:15 +08:00
Lancarus
6e788c8f6f 优化傀影肉鸽选人逻辑 2023-07-30 05:43:59 +08:00
Lancarus
70db734a98 Merge branch 'MaaAssistantArknights:dev' into dev 2023-07-30 05:39:41 +08:00
David
19a28e9239 chore: from 88ed4008e4 switched to WordOcr from ImageOcr 
I'll leave the WBChapterToWB.png just in case something breaks
 2023-07-29 23:23:07 +02:00
David
fddec13161 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-07-29 22:53:12 +02:00
David
d1d6aab0d2 fix: ulterior changes / fixes from 9f2c7488b3 2023-07-29 22:52:41 +02:00