From d2d51f015e789cad70690a5d6df4ca580b47ec03 Mon Sep 17 00:00:00 2001 From: Constrat <56174894+Constrat@users.noreply.github.com> Date: Mon, 13 Jan 2025 12:32:19 +0100 Subject: [PATCH] feat: preload YostarEN AS navigation --- .../api/gui/StageActivity.json | 55 +++++++------------ .../global/YoStarEN/resource/tasks.json | 27 ++++++--- 2 files changed, 40 insertions(+), 42 deletions(-) diff --git a/MaaAssistantArknights/api/gui/StageActivity.json b/MaaAssistantArknights/api/gui/StageActivity.json index 8617ae84..b89cb408 100644 --- a/MaaAssistantArknights/api/gui/StageActivity.json +++ b/MaaAssistantArknights/api/gui/StageActivity.json @@ -204,54 +204,41 @@ "YoStarEN": { "sideStoryStage": [ { - "Display": "SSReopen-SL", - "Value": "SSReopen-SL", - "Drop": "Clear SL1~8", - "MinimumRequired": "v5.5.0", - "Activity": { - "Tip": "So Long Adele - Rerun", - "StageName": "SL", - "UtcStartTime": "2025/01/03 10:00:00", - "UtcExpireTime": "2025/01/13 03:59:59", - "TimeZone": -7 - } - }, - { - "Display": "SL-6", - "Value": "SL-6", - "Drop": "30053", + "Display": "AS-7", + "Value": "AS-7", + "Drop": "30043", "MinimumRequired": "v5.5.0", "Activity": { - "Tip": "So Long Adele - Rerun", - "StageName": "SL", - "UtcStartTime": "2025/01/03 10:00:00", - "UtcExpireTime": "2025/01/13 03:59:59", + "Tip": " Adventure That Cannot Wait for the Sun", + "StageName": "AS", + "UtcStartTime": "2025/01/16 10:00:00", + "UtcExpireTime": "2025/02/06 03:59:59", "TimeZone": -7 } }, { - "Display": "SL-7", - "Value": "SL-7", - "Drop": "31033", + "Display": "AS-8", + "Value": "AS-8", + "Drop": "30093", "MinimumRequired": "v5.5.0", "Activity": { - "Tip": "So Long Adele - Rerun", - "StageName": "SL", - "UtcStartTime": "2025/01/03 10:00:00", - "UtcExpireTime": "2025/01/13 03:59:59", + "Tip": " Adventure That Cannot Wait for the Sun", + "StageName": "AS", + "UtcStartTime": "2025/01/16 10:00:00", + "UtcExpireTime": "2025/02/06 03:59:59", "TimeZone": -7 } }, { - "Display": "SL-8", - "Value": "SL-8", - "Drop": "30083", + "Display": "AS-9", + "Value": "AS-9", + "Drop": "31083", "MinimumRequired": "v5.5.0", "Activity": { - "Tip": "So Long Adele - Rerun", - "StageName": "SL", - "UtcStartTime": "2025/01/03 10:00:00", - "UtcExpireTime": "2025/01/13 03:59:59", + "Tip": " Adventure That Cannot Wait for the Sun", + "StageName": "AS", + "UtcStartTime": "2025/01/16 10:00:00", + "UtcExpireTime": "2025/02/06 03:59:59", "TimeZone": -7 } } diff --git a/MaaAssistantArknights/api/resource/global/YoStarEN/resource/tasks.json b/MaaAssistantArknights/api/resource/global/YoStarEN/resource/tasks.json index cc846d28..990766dc 100644 --- a/MaaAssistantArknights/api/resource/global/YoStarEN/resource/tasks.json +++ b/MaaAssistantArknights/api/resource/global/YoStarEN/resource/tasks.json @@ -1,11 +1,22 @@ { - "SL-Open":{ - "baseTask": "SS-Open", - "template": ["StageSideStory.png", "StageActivity.png"], - "next": ["SLChapterToSL"] + "AS-OpenOcr": { + "text": [ + "Adventure", + "Cannot", + "Wait", + "Sun", + "Harvest", + "Gathering", + "Treasure", + "House" + ] }, - "SLChapterToSL": { - "text": ["A HOLIDAY", "AT THE HOT SPRINGS"], - "roi": [1046, 465, 198, 61] + "ASChapterToAS": { + "text": [ + "Citizen", + "CITIZEN", + "Garden", + "GARDEN" + ] } -} +} \ No newline at end of file