diff --git a/assets/interface.json b/assets/interface.json index 0d2c7ce6..a1ad808d 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -34,7 +34,7 @@ "entry": "Psychube" }, { - "name": "自动深眠(配置一二队后再运行,队列名称默认)", + "name": "自动深眠(先配置一二队以后再运行,上下半队列名称需要分别为「成员队列一」和「成员队列二」)", "entry": "Limbo" }, { @@ -76,8 +76,15 @@ } }, { - "name": "当期活动推图", - "entry": "FloorItToTheGoldenCity_StagePromotion", + "name": "当期活动推图(故事模式)", + "entry": "FloorItToTheGoldenCity_StoryMode_StagePromotion", + "option": [ + "体力不够自动吃糖" + ] + }, + { + "name": "当期活动推图(探索模式)", + "entry": "FloorItToTheGoldenCity_ExploreMode_StagePromotion", "option": [ "体力不够自动吃糖" ] diff --git a/assets/resource/base/image/Combat/Activity/FloorItToTheGoldenCityChooseExploreMode.png b/assets/resource/base/image/Combat/Activity/FloorItToTheGoldenCityChooseExploreMode.png new file mode 100644 index 00000000..70827abe Binary files /dev/null and b/assets/resource/base/image/Combat/Activity/FloorItToTheGoldenCityChooseExploreMode.png differ diff --git a/assets/resource/base/pipeline/activity/FloorItToTheGoldenCity.json b/assets/resource/base/pipeline/activity/FloorItToTheGoldenCity.json index f99cc40e..28976583 100644 --- a/assets/resource/base/pipeline/activity/FloorItToTheGoldenCity.json +++ b/assets/resource/base/pipeline/activity/FloorItToTheGoldenCity.json @@ -33,13 +33,13 @@ "action": "Click", "next": "SwipeLeftAndFindStage" }, - "FloorItToTheGoldenCity_StagePromotion": { + "FloorItToTheGoldenCity_StoryMode_StagePromotion": { "next": [ - "FloorItToTheGoldenCityEnterTheShow_StagePromotion", + "FloorItToTheGoldenCityEnterTheShow_StoryMode_StagePromotion", "Sub_StartUp" ] }, - "FloorItToTheGoldenCityEnterTheShow_StagePromotion": { + "FloorItToTheGoldenCityEnterTheShow_StoryMode_StagePromotion": { "recognition": "TemplateMatch", "template": "Combat/Activity/FloorItToTheGoldenCityEnterTheShow.png", "roi": [ @@ -51,11 +51,11 @@ "action": "Click", "post_wait_freezes": 1, "next": [ - "FloorItToTheGoldenCityMainChapter_StagePromotion", - "FloorItToTheGoldenCityEnterTheShow_StagePromotion" + "FloorItToTheGoldenCityMainChapter_StoryMode_StagePromotion", + "FloorItToTheGoldenCityEnterTheShow_StoryMode_StagePromotion" ] }, - "FloorItToTheGoldenCityMainChapter_StagePromotion": { + "FloorItToTheGoldenCityMainChapter_StoryMode_StagePromotion": { "recognition": "TemplateMatch", "template": "Combat/Activity/FloorItToTheGoldenCityMainChapter.png", "roi": [ @@ -68,5 +68,55 @@ "next": [ "StagePromotion_SwipeRightAndFindStage" ] + }, + "FloorItToTheGoldenCity_ExploreMode_StagePromotion": { + "next": [ + "FloorItToTheGoldenCityEnterTheShow_ExploreMode_StagePromotion", + "Sub_StartUp" + ] + }, + "FloorItToTheGoldenCityEnterTheShow_ExploreMode_StagePromotion": { + "recognition": "TemplateMatch", + "template": "Combat/Activity/FloorItToTheGoldenCityEnterTheShow.png", + "roi": [ + 920, + 144, + 244, + 146 + ], + "action": "Click", + "post_wait_freezes": 1, + "next": [ + "FloorItToTheGoldenCityMainChapter_ExploreMode_StagePromotion", + "FloorItToTheGoldenCityEnterTheShow_ExploreMode_StagePromotion" + ] + }, + "FloorItToTheGoldenCityMainChapter_ExploreMode_StagePromotion": { + "recognition": "TemplateMatch", + "template": "Combat/Activity/FloorItToTheGoldenCityMainChapter.png", + "roi": [ + 988, + 571, + 281, + 144 + ], + "action": "Click", + "next": [ + "FloorItToTheGoldenCityChooseExploreMode_StagePromotion" + ] + }, + "FloorItToTheGoldenCityChooseExploreMode_StagePromotion": { + "recognition": "TemplateMatch", + "template": "Combat/Activity/FloorItToTheGoldenCityChooseExploreMode.png", + "roi": [ + 30, + 240, + 196, + 70 + ], + "action": "Click", + "next": [ + "StagePromotion_SwipeRightAndFindStage" + ] } } \ No newline at end of file