diff --git a/assets/interface.json b/assets/interface.json index b93b875..2c1dd49 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -162,6 +162,20 @@ "option": { "作战关卡": { "cases": [ + { + "name": "6-14 厄险(祝圣秘银)", + "param": { + "EnterTheShow": { + "next": "MainChapter_6" + }, + "TargetStageName": { + "text": "14" + }, + "StageDifficulty": { + "next": "StageDifficulty_Hard" + } + } + }, { "name": "3-9 厄险(百灵百验鸟)", "param": { diff --git a/assets/resource/base/image/Combat/MainChapter_6Enter.png b/assets/resource/base/image/Combat/MainChapter_6Enter.png new file mode 100644 index 0000000..5485054 Binary files /dev/null and b/assets/resource/base/image/Combat/MainChapter_6Enter.png differ diff --git a/assets/resource/base/image/EatCandy/MiniCandy.png b/assets/resource/base/image/EatCandy/MiniCandy.png new file mode 100644 index 0000000..a73009d Binary files /dev/null and b/assets/resource/base/image/EatCandy/MiniCandy.png differ diff --git a/assets/resource/base/pipeline/combat.json b/assets/resource/base/pipeline/combat.json index 836d7d2..9248481 100644 --- a/assets/resource/base/pipeline/combat.json +++ b/assets/resource/base/pipeline/combat.json @@ -121,6 +121,25 @@ "action": "Click", "next": "SwipeLeftAndFindStage" }, + "MainChapter_6": { + "doc": "主线第六章 今夜星光灿烂", + "next": [ + "MainChapter_6Enter", + "Sub_SwipeLeftForChapter" + ] + }, + "MainChapter_6Enter": { + "recognition": "TemplateMatch", + "template": "Combat/MainChapter_6Enter.png", + "roi": [ + 0, + 90, + 1280, + 460 + ], + "action": "Click", + "next": "SwipeLeftAndFindStage" + }, "Sub_ResourceChapterLabel": { "is_sub": true, "recognition": "TemplateMatch", diff --git a/assets/resource/base/pipeline/eat_candy.json b/assets/resource/base/pipeline/eat_candy.json index 070c807..f79f4ea 100644 --- a/assets/resource/base/pipeline/eat_candy.json +++ b/assets/resource/base/pipeline/eat_candy.json @@ -2,11 +2,25 @@ "EatCandyWithin24H": { "enabled": false, "next": [ + "MiniCandy24H", "SmallCandy24H", "BigCandy24H", "NotCandy24H" ] }, + "MiniCandy24H": { + "recognition": "OCR", + "text": "小时", + "roi": [ + 989, + 212, + 165, + 200 + ], + "next": [ + "EatMiniCandy24H" + ] + }, "SmallCandy24H": { "recognition": "OCR", "text": "小时", @@ -51,6 +65,21 @@ "Sub_StartUp" ] }, + "EatMiniCandy24H": { + "recognition": "TemplateMatch", + "template": "EatCandy/MiniCandy.png", + "roi": [ + 989, + 212, + 165, + 200 + ], + "action": "Click", + "next": [ + "EatCandyConfirm", + "MiniCandy24HNotEnough" + ] + }, "EatSmallCandy24H": { "recognition": "TemplateMatch", "template": "EatCandy/SmallCandy.png", @@ -96,6 +125,22 @@ "AllIn" ] }, + "MiniCandy24HNotEnough": { + "recognition": "OCR", + "text": "苦目软糖", + "roi": [ + 989, + 212, + 165, + 200 + ], + "next": [ + "SmallCandy24H", + "Sub_QuitEatCandyPage", + "HomeFlag", + "Sub_StartUp" + ] + }, "SmallCandy24HNotEnough": { "recognition": "OCR", "text": "苦目糖果",