fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 10:57:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,154 Commits 60 Branches 1,841 Tags
3dbf9c47db413de4eca2861a2d1332e8bfa264e4
Commit Graph

2341 Commits

Author SHA1 Message Date
cenfusheng
b048b1f952 feat：适配萨米肉鸽关卡“豪华车队” 
增加对该关卡的适配
 2023-08-03 12:47:33 +08:00
筱竹聽雨
9e483a2f69 fix: 修复纯烬艾雅法拉识别 (#5791) 
修复纯烬艾雅法拉识别
 2023-08-03 09:39:50 +08:00
momomochi
d96052daf8 新增水月肉鴿不期而遇關卡名稱的 ocrReplace 2023-08-03 09:14:06 +08:00
David
89a0909abd chore: same as 206cac7 2023-08-02 18:57:06 +02:00
David
206cac78ac chore: SSS Identification issue with NON-1080 emulators 2023-08-02 18:49:45 +02:00
MistEO
30b4b069f9 chore: revert "version" of YostarEN 2023-08-02 20:53:27 +08:00
MistEO
49cb124516 chore: Auto Update Game Resources - 2023-08-02 2023-08-02 09:47:38 +00:00
David
b67d21b842 refactor: from 9bdece8 Manual Stage navigation EN 
The reason I had to do the first commit is because the "baseTask"
wasn't working properly, so I copied the inheritor,
and now it's working as intended.
 2023-08-02 11:26:34 +02:00
筱竹聽雨
e494fe3d73 Update tasks.json 
修复干员识别
 2023-08-02 13:44:09 +08:00
MistEO
4fa8b3fedd 繁中服水月肉鴿「委託完成」卡住 (#5766) 
報錯卡住
換一張
 2023-08-02 11:16:44 +08:00
David
6df7b577be fix: Wrong event in display 
@MistEO Please change the auto update resources as it's the third time it changes the event name because it has a wrong event schedule. There is no Ling event rerun right now.
It's Chongyue and Lin event time.
 2023-08-01 23:20:59 +02:00
MistEO
0629925e34 chore: Auto Update Game Resources - 2023-08-01 2023-08-01 18:47:29 +00:00
vonnoq
5e9aa8b332 水月肉鴿圖檔 
報錯卡住
換一張
 2023-08-02 02:24:06 +08:00
uye
20faa49648 feat: 支持活动导航 2023-08-01 19:57:16 +08:00
MistEO
04f38f06ac feat: 新增萨米肉鸽4~5层部署策略 (#5725) 2023-08-01 17:34:13 +08:00
MistEO
e94847bead fix:日服水月肉鸽事件选项确认页面 (#5749) 
日服水月肉鸽 不期而遇 等节点选项曾无法自动选择，修改roi后正常。
 2023-08-01 17:34:02 +08:00
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
ManicSteiner
8e7b9d4754 fix:日服水月肉鸽事件选项确认页面 2023-08-01 10:27:54 +08: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
momomochi
7e9f07a494 修正 "漩渦" 的辨識問題 2023-07-31 09:23:25 +08:00
DuKong
6d3069e577 feat: 新增萨米肉鸽4~5层部署策略 2023-07-31 08:06:02 +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
DuKong
64362ab893 feat: 新增萨米肉鸽4~5层部署策略 2023-07-30 19:41:29 +08:00
Lancarus
fc2d5dcdb6 Merge branch 'MaaAssistantArknights:dev' into dev 2023-07-30 19:39:41 +08: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