diff --git a/resource/tasks.json b/resource/tasks.json index 8de9ce0c70..8241101641 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -9911,6 +9911,7 @@ }, "Sarkaz@Roguelike@StageBoskyPassage": { "Doc": "诡谲断章", + "method": "CcoeffHSV", "templThreshold": 0.95, "baseTask": "Sarkaz@Roguelike@Stage", "next": [ @@ -9926,7 +9927,14 @@ ] }, "Sarkaz@Roguelike@StageCombatDps": { - "templThreshold": 0.975 + "templThreshold": 0.975, + "postDelay": 600, + "next": [ + "Sarkaz@Roguelike@StageRefresh", + "Sarkaz@Roguelike@StageCombatDpsEnter", + "Sarkaz@Roguelike@StageEmergencyDpsEnter", + "Sarkaz@Roguelike@Stages#next" + ] }, "Sarkaz@Roguelike@StageCombatDpsEnter": {}, "Sarkaz@Roguelike@StageConfrontation": { @@ -9956,13 +9964,21 @@ }, "Sarkaz@Roguelike@StageDreadfulFoeEnter": {}, "Sarkaz@Roguelike@StageEmergencyDps": { - "templThreshold": 0.95 + "templThreshold": 0.95, + "postDelay": 600, + "next": [ + "Sarkaz@Roguelike@StageRefresh", + "Sarkaz@Roguelike@StageCombatDpsEnter", + "Sarkaz@Roguelike@StageEmergencyDpsEnter", + "Sarkaz@Roguelike@Stages#next" + ] }, "Sarkaz@Roguelike@StageEmergencyDpsEnter": {}, "Sarkaz@Roguelike@StageEmergencyTransportation": { "Doc": "先行一步,拒绝可以获取2希望", "baseTask": "Sarkaz@Roguelike@Stage", - "templThreshold": 0.97, + "method": "CcoeffHSV", + "templThreshold": 0.95, "next": [ "Sarkaz@Roguelike@StageEncounterEnter", "Sarkaz@Roguelike@Stages#next" @@ -10136,7 +10152,8 @@ "Sarkaz@Roguelike@StageWindAndRain": { "Doc": "失与得", "baseTask": "Sarkaz@Roguelike@Stage", - "templThreshold": 0.97, + "method": "CcoeffHSV", + "templThreshold": 0.95, "next": [ "Sarkaz@Roguelike@StageEncounterEnter", "Sarkaz@Roguelike@Stages#next" @@ -10243,11 +10260,43 @@ "Sarkaz@Roguelike@CloseCollectionClose" ] }, + "Sarkaz@Roguelike@StageRefresh": { + "action": "ClickSelf", + "method": "CcoeffHSV", + "templThreshold": 0.9, + "postDelay": 500, + "roi": [790, 130, 60, 144], + "next": ["Sarkaz@Roguelike@StageRefreshConfirm"] + }, + "Sarkaz@Roguelike@StageRefreshConfirm": { + "action": "ClickSelf", + "postDelay": 700, + "roi": [767, 409, 469, 155], + "next": [ + "Sarkaz@Roguelike@StageRefreshNoThought", + "Sarkaz@Roguelike@StageRefreshClickLeft" + ] + }, + "Sarkaz@Roguelike@StageRefreshClickLeft": { + "action": "ClickRect", + "template": "Sarkaz@Roguelike@StageTraderEnter.png", + "roi": [1035, 370, 226, 300], + "specificRect": [153, 79, 63, 29], + "next": ["Sarkaz@Roguelike@Stages#next"] + }, + "Sarkaz@Roguelike@StageRefreshNoThought": { + "action": "ClickRect", + "templThreshold": 0.9, + "roi": [902, 24, 327, 179], + "specificRect": [1100, 558, 111, 50], + "next": ["Sarkaz@Roguelike@QuickFormation"] + }, "Sarkaz@Roguelike@StartExplore": { "roi": [1014, 481, 266, 219] }, - "Sarkaz@Roguelike@StrategyChange_mode0": { + "Sarkaz@Roguelike@StrategyChange_mode0_NOT_IN_USE": { "text": ["_aggressive", "_pragmatic", "_default"], + "baseTask": "Roguelike@StrategyChange_default", "ocrReplace": [ ["熔魂之始", "_aggressive"], ["锻铁根须", "_aggressive"], @@ -10258,6 +10307,18 @@ ["诡谲断章", "_SKIP_"] ] }, + "Sarkaz@Roguelike@StrategyChange_mode0": { + "text": ["_default"], + "ocrReplace": [ + ["熔魂之始", "_default"], + ["锻铁根须", "_default"], + ["灰铸迷城", "_default"], + ["或然歧域", "_default"], + ["虚实疆界", "_default"], + ["辉光天顶", "_default"], + ["诡谲断章", "_SKIP_"] + ] + }, "Sarkaz@Roguelike@StrategyChange_mode1": { "baseTask": "Sarkaz@Roguelike@StrategyChange_mode4", "Doc": "刷源石锭第二层就会退,这里借用第三层退的刷开局策略" diff --git a/resource/template/Sarkaz@Roguelike@StageRefresh.png b/resource/template/Sarkaz@Roguelike@StageRefresh.png new file mode 100644 index 0000000000..b4d662c9a8 Binary files /dev/null and b/resource/template/Sarkaz@Roguelike@StageRefresh.png differ diff --git a/resource/template/Sarkaz@Roguelike@StageRefreshConfirm.png b/resource/template/Sarkaz@Roguelike@StageRefreshConfirm.png new file mode 100644 index 0000000000..3efe12ffd8 Binary files /dev/null and b/resource/template/Sarkaz@Roguelike@StageRefreshConfirm.png differ diff --git a/resource/template/Sarkaz@Roguelike@StageRefreshNoThought.png b/resource/template/Sarkaz@Roguelike@StageRefreshNoThought.png new file mode 100644 index 0000000000..ac3332d985 Binary files /dev/null and b/resource/template/Sarkaz@Roguelike@StageRefreshNoThought.png differ