fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 10:32:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,114 Commits 61 Branches 1,840 Tags
5ce91d779b885af99c8c3fd6c697bb3cbcbb5c94
Commit Graph

8114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
5ce91d779b fix: 重製繁中服部分截圖 (#5748) 
主要是解決 #5691 下面提到的資源收集關卡截圖問題。

順便把基建的各設施截圖也一起重製，
應該可以解決 #5150 #5642 #5326 這幾個 issue 裡提到的設施略過問題 (?)
 2023-08-01 17:31:46 +08:00
David
7c1b1b8246 Rename SSS_Dossoles_BROKEN_,waitforfix.json to SSS_Under-ConstructionDossolesPlate.json 2023-08-01 09:32:10 +02:00
David
045fdd9a97 Rename SSS_AcahuallanJungle_WORKING.json to SSS_AcahuallanJungle.json 2023-08-01 09:31:33 +02:00
MistEO
b6c20aa5b1 chore: Auto Update Game Resources - 2023-08-01 2023-08-01 02:36:32 +00:00
momomochi
df075702ab 重製肉鴿 SKIP 與數據回溯截圖 2023-08-01 09:22:27 +08:00
momomochi
06aed1a4a9 重製資源關卡截圖_第二部分 2023-08-01 09:19:17 +08:00
MistEO
6623001f81 chore: Auto Update Game Resources - 2023-07-31 2023-07-31 21:47:44 +00:00
David
46ec7c3a33 fix: missing name-component for SSS + tweaked regex 2023-07-31 23:45:28 +02:00
David
adfca9c541 fix: Dossoles ROI and Stage name fixes + temp OCR rep for long names 2023-07-31 23:27:16 +02:00
momomochi987
bb6c0a95ff 重製資源關卡截圖_第一部分 2023-07-31 21:43:02 +08:00
momomochi987
c154af3db5 重製基建各設施截圖 2023-07-31 21:41:16 +08:00
uye
8e0f84ad6c fix: 修正繁中服水月肉鴿 "漩渦" 的關卡辨識問題 (#5731) 2023-07-31 19:39:07 +08:00
uye
54ad858dd2 feat: 主目录存在 DEBUG.txt 时每次开始任务都重新解析tasks.json (#5736) 2023-07-31 19:33:14 +08:00
uye
d52c99880c fix: 关闭模拟器权限不够时失败报错 
fix #5739
 2023-07-31 19:04:36 +08:00
uye
e167d5188c feat: debug版本/release版本加DEBUG.txt load时重新加载tasks.json 2023-07-31 18:47:54 +08:00
uye
eb912931da fix: 连接失败后自动重启模拟器功能失效 
fix #5732
 2023-07-31 12:45:35 +08:00
uye
35a757bb2e feat: 主目录存在 DEBUG.txt 时每次开始任务都重新解析tasks.json 2023-07-31 11:32:30 +08:00
momomochi
7e9f07a494 修正 "漩渦" 的辨識問題 2023-07-31 09:23:25 +08:00
David
a983cc8b32 Rename SSS_AcahuallanJungle.json to SSS_AcahuallanJungle_WORKING.json 2023-07-30 23:23:07 +02:00
David
1c90d24647 Rename SSS_Under-ConstructionDossolesPlate.json to SSS_Dossoles_BROKEN_,waitforfix.json 2023-07-30 23:22:37 +02:00
MistEO
62d472b7c3 chore: Auto Update Game Resources - 2023-07-30 2023-07-30 20:46:29 +00:00
David
721bf26a64 feat: SSS Implementation for YostarEN 2023-07-30 22:35:29 +02:00
David
3b47b3486d duplicate: same as 179cbe3ab3 2023-07-30 17:20:56 +02:00
David
7e6d5ef441 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-07-30 16:47:05 +02:00
David
9f51ae07b1 i18n: bb98eebfb7 moved changes to new file to allow future edits 2023-07-30 16:47:00 +02:00
MistEO
2ab225f6a1 繁中服肉鴿 (#5717) 2023-07-30 22:23:35 +08:00
MistEO
cffb85933b fix:修复了傀影肉鸽部分关卡的部署逻辑 (#5712) 2023-07-30 22:23:19 +08:00
David
179cbe3ab3 duplicate: same as 5382d40a30 2023-07-30 14:45:09 +02:00
David
5382d40a30 duplicate: repeats in Ocr replace EN tasks.json 2023-07-30 14:44:15 +02:00
Lancarus
a237c7bee3 fix:修复了傀影肉鸽部分关卡的作战逻辑 2023-07-30 19:50:25 +08:00
Lancarus
0e19b6cc55 fix:配合作战逻辑更改了部分傀影肉鸽不期而遇事件的选项 2023-07-30 19:47:45 +08:00
Lancarus
28cca27af3 fix:修复了傀影肉鸽的商品与顺序 
增加了"effect"和“no”字段方便查看效果和prts比对
 2023-07-30 19:45:41 +08:00
Lancarus
fc2d5dcdb6 Merge branch 'MaaAssistantArknights:dev' into dev 2023-07-30 19:39:41 +08:00
uye
bf4b54a302 Implement ADB hard restart. (#5666) 2023-07-30 19:32:44 +08:00
AsterNighT
f35609a579 Fix: Wrap Process.Kill in try/catch 2023-07-30 19:04:35 +08:00
David
06a1ef3fae chore: SSS available in global, removed from regex 2023-07-30 12:59:36 +02:00
vonnoq
c1161536cd 繁中服水月肉鴿過關圖 2023-07-30 18:30:36 +08:00
vonnoq
c93816082d Merge branch 'MaaAssistantArknights:dev' into dev 2023-07-30 18:28:33 +08:00
David
bb98eebfb7 i18n: Added EN translation to SSS files 2023-07-30 12:11:34 +02:00
uye
5bf89cb9b1 typo: fix typo 2023-07-30 17:29:31 +08:00
uye
9e388f3a8a feat: 繁中服支持牛牛抽卡 
fix #5652
 2023-07-30 17:29:03 +08:00
uye
6223d2aa2c fix: 主线导航识别问题 2023-07-30 17:12:08 +08:00
uye
7b9bcc4acf feat: 给牛牛抽卡提示增加阴间特效 (#5694) 2023-07-30 15:37:35 +08:00
vonnoq
d19fdb9772 繁中服肉鴿 2023-07-30 15:31:08 +08:00
uye
9aeb85a112 fix: mumu模拟器在游戏未启动时关闭游戏报错，增加关闭游戏日志和判断 2023-07-30 14:36:00 +08:00
Lancarus
9d32551019 fix:修复了傀影肉鸽部分关卡的部署逻辑 
删掉了"blacklist_location"里和"deploy_plan"冲突的坐标
 2023-07-30 12:20:18 +08:00
MistEO
a9252b36de Fix:一些文字识别问题与死囚之夜部分高台站位 (#5710) 2023-07-30 10:07:46 +08:00
MistEO
fe4dc97ed3 优化傀影肉鸽招募逻辑和棘刺队作战逻辑 (#5707) 2023-07-30 10:07:00 +08:00
cenfusheng
4d04894ac0 Fix: 修复归溟幽灵鲨的识别问题 2023-07-30 09:40:30 +08:00
cenfusheng
1a6f5e9822 Fix: 修复繁中服部分带标点的文字识别内容（TXWY） 
万恶的引号
 2023-07-30 09:34:30 +08:00