diff --git a/resource/global/YoStarEN/resource/tasks.json b/resource/global/YoStarEN/resource/tasks.json index baaccce30a..1f9ea7a7e0 100644 --- a/resource/global/YoStarEN/resource/tasks.json +++ b/resource/global/YoStarEN/resource/tasks.json @@ -10,6 +10,14 @@ "next": ["ODChapterToOD"], "template": "StageSideStory.png" }, + "Sarkaz@Roguelike@InitialDrop2": { + "action": "ClickRect", + "algorithm": "OcrDetect", + "next": ["Sarkaz@Roguelike@Squad-EnterPoint", "Sarkaz@Roguelike@InitialDrop2"], + "roi": [600, 16, 145, 36], + "specificRect": [545, 432, 187, 127], + "text": ["Members", "Initial", "Collectibles"] + }, "ClickChapter1": { "text": ["Hour of An Awakening", "Hour of An"] }, @@ -2931,26 +2939,18 @@ "ocrReplace": [["Hypothese.*", "Hypotheses Compilation"]], "text": ["Hypotheses Compilation"] }, + "Sarkaz@Roguelike@StageSafeHouseReuse": { + "text": ["Use the Safe House again", "Use the Safe"] + }, "Sarkaz@Roguelike@StartExplore": { - "roi": [1014, 481, 266, 219], "next": [ "Sarkaz@Roguelike@Squad-EnterPoint", "Sarkaz@Roguelike@InitialDrop", "Sarkaz@Roguelike@ChooseDifficulty", "Sarkaz@Roguelike@StartExplore-EnterCheck", "Sarkaz@Roguelike@InitialDrop2" - ] - }, - "Sarkaz@Roguelike@InitialDrop2": { - "algorithm": "OcrDetect", - "action": "ClickRect", - "roi": [600, 16, 145, 36], - "specificRect": [545, 432, 187, 127], - "text": ["Members", "Initial", "Collectibles"], - "next": ["Sarkaz@Roguelike@Squad-EnterPoint", "Sarkaz@Roguelike@InitialDrop2"] - }, - "Sarkaz@Roguelike@StageSafeHouseReuse": { - "text": ["Use the Safe House again", "Use the Safe"] + ], + "roi": [1014, 481, 266, 219] }, "Sarkaz@Roguelike@StrategyChange-FastInvestment": { "ocrReplace": [ diff --git a/resource/global/YoStarJP/resource/tasks.json b/resource/global/YoStarJP/resource/tasks.json index b1308a7cab..5e40bbf9cf 100644 --- a/resource/global/YoStarJP/resource/tasks.json +++ b/resource/global/YoStarJP/resource/tasks.json @@ -5,6 +5,14 @@ "Mizuki@Roguelike@ChooseDifficultyConfirm": { "text": ["選択"] }, + "Sarkaz@Roguelike@InitialDrop2": { + "action": "ClickRect", + "algorithm": "OcrDetect", + "next": ["Sarkaz@Roguelike@Squad-EnterPoint", "Sarkaz@Roguelike@InitialDrop2"], + "roi": [600, 16, 145, 36], + "specificRect": [545, 432, 187, 127], + "text": ["初期所持秘宝", "小隊隊員"] + }, "ClickChapter1": { "text": ["覚醒"] }, @@ -2333,23 +2341,6 @@ "Roguelike@Squad-EnterPoint": { "text": ["分隊"] }, - "Sarkaz@Roguelike@StartExplore": { - "next": [ - "Sarkaz@Roguelike@Squad-EnterPoint", - "Sarkaz@Roguelike@InitialDrop", - "Sarkaz@Roguelike@ChooseDifficulty", - "Sarkaz@Roguelike@StartExplore-EnterCheck", - "Sarkaz@Roguelike@InitialDrop2" - ] - }, - "Sarkaz@Roguelike@InitialDrop2": { - "algorithm": "OcrDetect", - "action": "ClickRect", - "roi": [600, 16, 145, 36], - "specificRect": [545, 432, 187, 127], - "text": ["初期所持秘宝", "小隊隊員"], - "next": ["Sarkaz@Roguelike@Squad-EnterPoint", "Sarkaz@Roguelike@InitialDrop2"] - }, "Roguelike@StageEncounterOcr": { "ocrReplace": [ ["野営", "扎营"], @@ -2921,6 +2912,15 @@ "Sarkaz@Roguelike@StageSafeHouseReuse": { "text": ["セーフハウスを利用する"] }, + "Sarkaz@Roguelike@StartExplore": { + "next": [ + "Sarkaz@Roguelike@Squad-EnterPoint", + "Sarkaz@Roguelike@InitialDrop", + "Sarkaz@Roguelike@ChooseDifficulty", + "Sarkaz@Roguelike@StartExplore-EnterCheck", + "Sarkaz@Roguelike@InitialDrop2" + ] + }, "Sarkaz@Roguelike@StrategyChange-FastInvestment": { "ocrReplace": [ ["溶魂の端緒", "_fastInvestment"], diff --git a/resource/global/YoStarKR/resource/tasks.json b/resource/global/YoStarKR/resource/tasks.json index 301a808853..89c0404dbd 100644 --- a/resource/global/YoStarKR/resource/tasks.json +++ b/resource/global/YoStarKR/resource/tasks.json @@ -10,6 +10,15 @@ "Sami@Roguelike@StageEnterBattleAgain": { "specificRect": [1180, 460, 30, 20] }, + "Sarkaz@Roguelike@InitialDrop2": { + "action": "ClickRect", + "algorithm": "OcrDetect", + "doc": "월간 소대 시작 시 체크 표시가 없어서 만들어진 작업", + "next": ["Sarkaz@Roguelike@Squad-EnterPoint", "Sarkaz@Roguelike@InitialDrop2"], + "roi": [600, 16, 145, 36], + "specificRect": [545, 432, 187, 127], + "text": ["오퍼", "레이터", "초기", "소장품"] + }, "StartUpNotificationKR": { "action": "ClickSelf", "algorithm": "OcrDetect", @@ -2780,6 +2789,9 @@ "Sarkaz@Roguelike@StageRefresh": { "templThreshold": 0.7 }, + "Sarkaz@Roguelike@StageSafeHouseReuse": { + "text": ["안전가옥활용"] + }, "Sarkaz@Roguelike@StartExplore": { "doc": "월간 소대 시작 시 체크 표시가 없어서 만들어진 작업", "next": [ @@ -2790,18 +2802,6 @@ "Sarkaz@Roguelike@InitialDrop2" ] }, - "Sarkaz@Roguelike@InitialDrop2": { - "doc": "월간 소대 시작 시 체크 표시가 없어서 만들어진 작업", - "algorithm": "OcrDetect", - "action": "ClickRect", - "roi": [600, 16, 145, 36], - "specificRect": [545, 432, 187, 127], - "text": ["오퍼", "레이터", "초기", "소장품"], - "next": ["Sarkaz@Roguelike@Squad-EnterPoint", "Sarkaz@Roguelike@InitialDrop2"] - }, - "Sarkaz@Roguelike@StageSafeHouseReuse": { - "text": ["안전가옥활용"] - }, "Sarkaz@Roguelike@StrategyChange-FastInvestment": { "ocrReplace": [ [".*영혼융합.+", "영혼 융합의 시작"],