From 24f3a7b8f024fb4e9c633a2407e1d0de83c58b37 Mon Sep 17 00:00:00 2001 From: Constrat <56174894+Constrat@users.noreply.github.com.> Date: Mon, 2 Sep 2024 13:53:13 +0200 Subject: [PATCH] feat: YostarEN CR navigation --- .../api/gui/StageActivity.json | 104 +++++++----------- .../global/YoStarEN/resource/tasks.json | 8 +- 2 files changed, 43 insertions(+), 69 deletions(-) diff --git a/MaaAssistantArknights/api/gui/StageActivity.json b/MaaAssistantArknights/api/gui/StageActivity.json index bb0da3c0..63bc9a51 100644 --- a/MaaAssistantArknights/api/gui/StageActivity.json +++ b/MaaAssistantArknights/api/gui/StageActivity.json @@ -117,54 +117,41 @@ "YoStarJP": { "sideStoryStage": [ { - "Display": "SSReopen-FC", - "Value": "SSReopen-FC", - "Drop": "SS「この炎が照らす先」復刻 1~8", - "MinimumRequired": "v5.3.1", - "Activity": { - "Tip": "サイドストーリー「この炎が照らす先」復刻", - "StageName": "FC", - "UtcStartTime": "2024/08/21 16:00:00", - "UtcExpireTime": "2024/08/31 03:59:59", - "TimeZone": 9 - } - }, - { - "Display": "FC-5", - "Value": "FC-5", - "Drop": "30023", + "Display": "CR-6", + "Value": "CR-6", + "Drop": "30033", "MinimumRequired": "v5.3.1", "Activity": { "Tip": "サイドストーリー「この炎が照らす先」復刻", - "StageName": "FC", - "UtcStartTime": "2024/08/21 16:00:00", - "UtcExpireTime": "2024/08/31 03:59:59", + "StageName": "CR", + "UtcStartTime": "2024/09/05 16:00:00", + "UtcExpireTime": "2024/09/19 03:59:59", "TimeZone": 9 } }, { - "Display": "FC-6", - "Value": "FC-6", - "Drop": "30043", + "Display": "CR-7", + "Value": "CR-7", + "Drop": "31023", "MinimumRequired": "v5.3.1", "Activity": { "Tip": "サイドストーリー「この炎が照らす先」復刻", - "StageName": "FC", - "UtcStartTime": "2024/08/21 16:00:00", - "UtcExpireTime": "2024/08/31 03:59:59", + "StageName": "CR", + "UtcStartTime": "2024/09/05 16:00:00", + "UtcExpireTime": "2024/09/19 03:59:59", "TimeZone": 9 } }, { - "Display": "FC-7", - "Value": "FC-7", - "Drop": "31043", + "Display": "CR-8", + "Value": "CR-8", + "Drop": "30063", "MinimumRequired": "v5.3.1", "Activity": { "Tip": "サイドストーリー「この炎が照らす先」復刻", - "StageName": "FC", - "UtcStartTime": "2024/08/21 16:00:00", - "UtcExpireTime": "2024/08/31 03:59:59", + "StageName": "CR", + "UtcStartTime": "2024/09/05 16:00:00", + "UtcExpireTime": "2024/09/19 03:59:59", "TimeZone": 9 } } @@ -230,54 +217,41 @@ "YoStarEN": { "sideStoryStage": [ { - "Display": "SSReopen-FC", - "Value": "SSReopen-FC", - "Drop": "Clears 1~8 (Auto-deploy required)", - "MinimumRequired": "v5.5.0", - "Activity": { - "Tip": "What the Firelight Casts - Rerun", - "StageName": "FC", - "UtcStartTime": "2024/08/21 10:00:00", - "UtcExpireTime": "2024/08/31 03:59:59", - "TimeZone": -7 - } - }, - { - "Display": "FC-5", - "Value": "FC-5", - "Drop": "30023", + "Display": "CR-6", + "Value": "CR-6", + "Drop": "30033", "MinimumRequired": "v5.5.0", "Activity": { - "Tip": "What the Firelight Casts - Rerun", - "StageName": "FC", - "UtcStartTime": "2024/08/21 10:00:00", - "UtcExpireTime": "2024/08/31 03:59:59", + "Tip": "Operation Lucent Arrowhead", + "StageName": "CR", + "UtcStartTime": "2024/09/05 10:00:00", + "UtcExpireTime": "2024/09/19 03:59:59", "TimeZone": -7 } }, { - "Display": "FC-6", - "Value": "FC-6", - "Drop": "30043", + "Display": "CR-7", + "Value": "CR-7", + "Drop": "31023", "MinimumRequired": "v5.5.0", "Activity": { - "Tip": "What the Firelight Casts - Rerun", - "StageName": "FC", - "UtcStartTime": "2024/08/21 10:00:00", - "UtcExpireTime": "2024/08/31 03:59:59", + "Tip": "Operation Lucent Arrowhead", + "StageName": "CR", + "UtcStartTime": "2024/09/05 10:00:00", + "UtcExpireTime": "2024/09/19 03:59:59", "TimeZone": -7 } }, { - "Display": "FC-7", - "Value": "FC-7", - "Drop": "31043", + "Display": "CR-8", + "Value": "CR-8", + "Drop": "30063", "MinimumRequired": "v5.5.0", "Activity": { - "Tip": "What the Firelight Casts - Rerun", - "StageName": "FC", - "UtcStartTime": "2024/08/21 10:00:00", - "UtcExpireTime": "2024/08/31 03:59:59", + "Tip": "Operation Lucent Arrowhead", + "StageName": "CR", + "UtcStartTime": "2024/09/05 10:00:00", + "UtcExpireTime": "2024/09/19 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 31c9b71d..a135e87a 100644 --- a/MaaAssistantArknights/api/resource/global/YoStarEN/resource/tasks.json +++ b/MaaAssistantArknights/api/resource/global/YoStarEN/resource/tasks.json @@ -1,9 +1,9 @@ { - "FC-OpenOcr": { - "text": ["What the Firelight Casts", "open"] + "CR-OpenOcr": { + "text": ["Operation", "Lucent", "Arrowhead"] }, - "FCChapterToFC": { - "text": ["SWAMP", "MISTS"] + "CRChapterToCR": { + "text": ["Roam", "Exhibition", "ROAM", "EXHIBITION"] }, "Mizuki@Roguelike@GetDropSelectRecruit": { "templThreshold": 0.8,