feat: YostarKR KR navigation (#289)

MaaAssistantArknights · Feb 8, 2025 · d73fe33 · d73fe33
1 parent fac6c87
commit d73fe33
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 50 deletions.
diff --git a/MaaAssistantArknights/api/gui/StageActivity.json b/MaaAssistantArknights/api/gui/StageActivity.json
@@ -141,54 +141,15 @@
     "YoStarKR": {
         "sideStoryStage": [
             {
-                "Display": "AS-6",
-                "Value": "AS-6",
-                "Drop": "포도당, 원암 (합성옥 효율 34%)",
-                "MinimumRequired": "v5.5.0",
-                "Activity": {
-                    "Tip": "Sidestory「태양을 뿌리쳐라」",
-                    "StageName": "AS",
-                    "UtcStartTime": "2025/01/16 16:00:00",
-                    "UtcExpireTime": "2025/02/06 03:59:59",
-                    "TimeZone": 9
-                }
-            },
-            {
-                "Display": "AS-7",
-                "Value": "AS-7",
-                "Drop": "30043",
-                "MinimumRequired": "v5.5.0",
-                "Activity": {
-                    "Tip": "Sidestory「태양을 뿌리쳐라」",
-                    "StageName": "AS",
-                    "UtcStartTime": "2025/01/16 16:00:00",
-                    "UtcExpireTime": "2025/02/06 03:59:59",
-                    "TimeZone": 9
-                }
-            },
-            {
-                "Display": "AS-8",
-                "Value": "AS-8",
-                "Drop": "30093",
-                "MinimumRequired": "v5.5.0",
-                "Activity": {
-                    "Tip": "Sidestory「태양을 뿌리쳐라」",
-                    "StageName": "AS",
-                    "UtcStartTime": "2025/01/16 16:00:00",
-                    "UtcExpireTime": "2025/02/06 03:59:59",
-                    "TimeZone": 9
-                }
-            },
-            {
-                "Display": "AS-9",
-                "Value": "AS-9",
-                "Drop": "31083",
+                "Display": "KR-8",
+                "Value": "KR-8",
+                "Drop": "30063",
                 "MinimumRequired": "v5.5.0",
                 "Activity": {
-                    "Tip": "Sidestory「태양을 뿌리쳐라」",
-                    "StageName": "AS",
+                    "Tip": "Sidestory「카즈델리안 레스큐」",
+                    "StageName": "KR",
                     "UtcStartTime": "2025/01/16 16:00:00",
-                    "UtcExpireTime": "2025/02/06 03:59:59",
+                    "UtcExpireTime": "2025/04/06 03:59:59",
                     "TimeZone": 9
                 }
             }

diff --git a/MaaAssistantArknights/api/resource/global/YoStarKR/resource/tasks.json b/MaaAssistantArknights/api/resource/global/YoStarKR/resource/tasks.json
@@ -10,11 +10,51 @@
     "OrundumActivitiesConfirm": {
         "text": ["뽑기"]
     },
-    "AS-OpenOcr": {
-        "text": ["태양을", "뿌리쳐라", "이벤트", "개방중"],
-        "roi": [0, 500, 500, 150]
+    "KR-8": {
+        "algorithm": "JustReturn",
+        "sub": ["KR-OpenOpt"],
+        "next": ["KR-8@SideStoryStage", "KR-8@SwipeToStage"]
     },
-    "ASChapterToAS": {
-        "text": ["시민", "정원"]
+    "KR-8@SideStoryStage": {
+        "text": ["KR-8"]
+    },
+    "KR-7": {
+        "algorithm": "JustReturn",
+        "sub": ["KR-OpenOpt"],
+        "next": ["KR-7@SideStoryStage", "KR-7@SwipeToStage"]
+    },
+    "KR-7@SideStoryStage": {
+        "text": ["KR-7"]
+    },
+    "KR-4": {
+        "algorithm": "JustReturn",
+        "sub": ["KR-OpenOpt"],
+        "next": ["KR-4@SideStoryStage", "KR-4@SwipeToStage"]
+    },
+    "KR-4@SideStoryStage": {
+        "text": ["KR-4"]
+    },
+    "KR-OpenOpt": {
+        "algorithm": "JustReturn",
+        "next": ["KR-OpenOcr", "KR-Open"]
+    },
+    "KR-Open": {
+        "baseTask": "SS-Open",
+        "template": "StageSideStory.png",
+        "next": ["KRChapterToKR"]
+    },
+    "KR-OpenOcr": {
+        "algorithm": "OcrDetect",
+        "baseTask": "SS-OpenOcr",
+        "text": ["카즈델리안", "레스큐", "이벤트", "개방"],
+        "next": ["KRChapterToKR"]
+    },
+    "KRChapterToKR": {
+        "algorithm": "OcrDetect",
+        "action": "ClickSelf",
+        "text": ["용광로", "오르기"],
+        "preDelay": 3000,
+        "roi": [786, 478, 201, 144],
+        "next": ["#self", "ChapterSwipeToTheRight"]
     }
 }