diff --git a/assets/interface.json b/assets/interface.json index a3bf0af1..3fccb4f9 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -51,6 +51,42 @@ "name": "关闭游戏", "entry": "Close1999" }, + { + "name": "活动：飞驰，明日之城 18 艰难", + "entry": "FloorItToTheGoldenCity", + "option": [ + "复现次数", + "刷完全部体力", + "吃全部临期糖" + ], + "param": { + "EnterTheShow": { + "next": "FloorItToTheGoldenCity" + }, + "TargetStageName": { + "text": "18" + }, + "StageDifficulty": { + "next": "ActivityStageDifficulty" + } + } + }, + { + "name": "当期活动推图", + "entry": "FloorItToTheGoldenCity_StagePromotion", + "option": [ + "体力不够自动吃糖" + ] + }, + { + "name": "局外演绎：黄昏的音序", + "entry": "SeriesOfDusks", + "param": { + "EnterTheShow": { + "next": "OutsideDeduction" + } + } + }, { "name": "活动：绿湖噩梦 17 艰难（已结束）", "entry": "ANightmareAtGreenLake", @@ -174,15 +210,6 @@ { "name": "肉鸽：山麓的回音（已结束）", "entry": "EchoesinInTheMountain" - }, - { - "name": "局外演绎：黄昏的音序", - "entry": "SeriesOfDusks", - "param": { - "EnterTheShow": { - "next": "OutsideDeduction" - } - } } ], "recognizer": {}, @@ -733,6 +760,26 @@ } } ] + }, + "体力不够自动吃糖": { + "cases": [ + { + "name": "Yes", + "param": { + "StagePromotion_EatCandy": { + "enabled": true + } + } + }, + { + "name": "No", + "param": { + "StagePromotion_EatCandy": { + "enabled": false + } + } + } + ] } } } \ No newline at end of file diff --git a/assets/resource/base/image/Combat/Activity/FloorItToTheGoldenCityEnterTheShow.png b/assets/resource/base/image/Combat/Activity/FloorItToTheGoldenCityEnterTheShow.png new file mode 100644 index 00000000..20239ca0 Binary files /dev/null and b/assets/resource/base/image/Combat/Activity/FloorItToTheGoldenCityEnterTheShow.png differ diff --git a/assets/resource/base/image/Combat/Activity/FloorItToTheGoldenCityMainChapter.png b/assets/resource/base/image/Combat/Activity/FloorItToTheGoldenCityMainChapter.png new file mode 100644 index 00000000..d4ea4ba2 Binary files /dev/null and b/assets/resource/base/image/Combat/Activity/FloorItToTheGoldenCityMainChapter.png differ diff --git a/assets/resource/base/image/Combat/CantAuto.png b/assets/resource/base/image/Combat/CantAuto.png new file mode 100644 index 00000000..d3d82927 Binary files /dev/null and b/assets/resource/base/image/Combat/CantAuto.png differ diff --git a/assets/resource/base/pipeline/activity/FloorItToTheGoldenCity.json b/assets/resource/base/pipeline/activity/FloorItToTheGoldenCity.json new file mode 100644 index 00000000..f99cc40e --- /dev/null +++ b/assets/resource/base/pipeline/activity/FloorItToTheGoldenCity.json @@ -0,0 +1,72 @@ +{ + "FloorItToTheGoldenCity": { + "next": [ + "FloorItToTheGoldenCityEnterTheShow", + "Sub_StartUp" + ] + }, + "FloorItToTheGoldenCityEnterTheShow": { + "recognition": "TemplateMatch", + "template": "Combat/Activity/FloorItToTheGoldenCityEnterTheShow.png", + "roi": [ + 920, + 144, + 244, + 146 + ], + "action": "Click", + "post_wait_freezes": 1, + "next": [ + "FloorItToTheGoldenCityMainChapter", + "FloorItToTheGoldenCityEnterTheShow" + ] + }, + "FloorItToTheGoldenCityMainChapter": { + "recognition": "TemplateMatch", + "template": "Combat/Activity/FloorItToTheGoldenCityMainChapter.png", + "roi": [ + 988, + 571, + 281, + 144 + ], + "action": "Click", + "next": "SwipeLeftAndFindStage" + }, + "FloorItToTheGoldenCity_StagePromotion": { + "next": [ + "FloorItToTheGoldenCityEnterTheShow_StagePromotion", + "Sub_StartUp" + ] + }, + "FloorItToTheGoldenCityEnterTheShow_StagePromotion": { + "recognition": "TemplateMatch", + "template": "Combat/Activity/FloorItToTheGoldenCityEnterTheShow.png", + "roi": [ + 920, + 144, + 244, + 146 + ], + "action": "Click", + "post_wait_freezes": 1, + "next": [ + "FloorItToTheGoldenCityMainChapter_StagePromotion", + "FloorItToTheGoldenCityEnterTheShow_StagePromotion" + ] + }, + "FloorItToTheGoldenCityMainChapter_StagePromotion": { + "recognition": "TemplateMatch", + "template": "Combat/Activity/FloorItToTheGoldenCityMainChapter.png", + "roi": [ + 988, + 571, + 281, + 144 + ], + "action": "Click", + "next": [ + "StagePromotion_SwipeRightAndFindStage" + ] + } +} \ No newline at end of file diff --git a/assets/resource/base/pipeline/activity/StagePromotion.json b/assets/resource/base/pipeline/activity/StagePromotion.json new file mode 100644 index 00000000..ecf89225 --- /dev/null +++ b/assets/resource/base/pipeline/activity/StagePromotion.json @@ -0,0 +1,375 @@ +{ + "StagePromotion_SwipeRightAndFindStage": { + "next": [ + "StagePromotion_NextStage2", + "StagePromotion_NextStage1", + "StagePromotion_SwipeRightForStageList" + ] + }, + "StagePromotion_NextStage1": { + "recognition": "ColorMatch", + "roi": [ + 44, + 533, + 1209, + 50 + ], + "method": 4, + "lower": [ + 122, + 122, + 122 + ], + "upper": [ + 122, + 122, + 122 + ], + "count": 80, + "action": "Click", + "next": [ + "StagePromotion_ReadyForAction", + "StagePromotion_NextStage1" + ] + }, + "StagePromotion_NextStage2": { + "recognition": "ColorMatch", + "roi": [ + 422, + 533, + 200, + 50 + ], + "method": 4, + "lower": [ + 122, + 122, + 122 + ], + "upper": [ + 122, + 122, + 122 + ], + "count": 160, + "action": "Click", + "next": [ + "StagePromotion_ReadyForAction", + "StagePromotion_NextStage2" + ] + }, + "StagePromotion_ReadyForAction": { + "recognition": "OCR", + "text": [ + "开始行动" + ], + "roi": [ + 900, + 500, + 380, + 220 + ], + "action": "Click", + "next": [ + "StagePromotion_Skip", + "StagePromotion_Combating", + "StagePromotion_EatCandy", + "StagePromotion_BalanceModel", + "StagePromotion_ReadyForAction" + ] + }, + "StagePromotion_BalanceModel": { + "is_sub": true, + "recognition": "OCR", + "text": [ + "制衡模式" + ], + "roi": [ + 510, + 105, + 290, + 115 + ], + "action": "Click", + "target_offset": [ + -200, + -100, + 30, + 30 + ] + }, + "StagePromotion_EatCandy": { + "enabled": false, + "recognition": "OCR", + "text": [ + "活性", + "恢复" + ], + "roi": [ + 465, + 571, + 277, + 149 + ], + "next": [ + "StagePromotion_SmallCandy", + "StagePromotion_MiniCandy", + "StagePromotion_BigCandy" + ] + }, + "StagePromotion_MiniCandy": { + "recognition": "TemplateMatch", + "template": "EatCandy/MiniCandy.png", + "roi": [ + 989, + 212, + 165, + 200 + ], + "action": "Click", + "next": [ + "StagePromotion_MiniCandyConfirm", + "StagePromotion_MiniCandy" + ] + }, + "StagePromotion_SmallCandy": { + "recognition": "TemplateMatch", + "template": "EatCandy/SmallCandy.png", + "roi": [ + 829, + 65, + 145, + 295 + ], + "action": "Click", + "next": [ + "StagePromotion_EatCandyConfirm", + "StagePromotion_SmallCandy" + ] + }, + "StagePromotion_BigCandy": { + "recognition": "TemplateMatch", + "template": "EatCandy/BigCandy.png", + "roi": [ + 856, + 373, + 196, + 344 + ], + "action": "Click", + "next": [ + "StagePromotion_EatCandyConfirm", + "StagePromotion_SmallCandy" + ] + }, + "StagePromotion_MiniCandyConfirm": { + "recognition": "TemplateMatch", + "template": "EatCandy/ConvertCandyConfirm.png", + "roi": [ + 594, + 491, + 88, + 48 + ], + "action": "Click", + "next": [ + "StagePromotion_QuitEatCandyPage", + "StagePromotion_EatCandyConfirm" + ] + }, + "StagePromotion_EatCandyConfirm": { + "recognition": "TemplateMatch", + "template": "EatCandy/Confirm.png", + "roi": [ + 709, + 352, + 189, + 151 + ], + "action": "Click", + "next": [ + "StagePromotion_QuitEatCandyPage", + "StagePromotion_EatCandyConfirm" + ] + }, + "StagePromotion_QuitEatCandyPage": { + "recognition": "OCR", + "text": [ + "活性", + "恢复" + ], + "roi": [ + 465, + 571, + 277, + 149 + ], + "action": "Click", + "target": [ + 1116, + 636, + 155, + 76 + ], + "next": [ + "StagePromotion_ReadyForAction", + "StagePromotion_QuitEatCandyPage" + ] + }, + "StagePromotion_Skip": { + "recognition": "OCR", + "text": [ + "跳过" + ], + "roi": [ + 1015, + 7, + 263, + 70 + ], + "action": "Click", + "next": [ + "StagePromotion_Confirm", + "StagePromotion_Combating", + "StagePromotion_Skip" + ] + }, + "StagePromotion_Confirm": { + "recognition": "OCR", + "text": [ + "确认" + ], + "roi": [ + 687, + 336, + 280, + 174 + ], + "action": "Click", + "next": [ + "StagePromotion_ReadyForAction", + "StagePromotion_NextStage2", + "StagePromotion_NextStage1", + "StagePromotion_Skip", + "StagePromotion_Confirm" + ] + }, + "StagePromotion_Combating": { + "recognition": "TemplateMatch", + "template": "OutsideDeduction/SOD_Combating.png", + "roi": [ + 1208, + 6, + 64, + 64 + ], + "timeout":40000, + "next": [ + "StagePromotion_Victory", + "StagePromotion_CombatDefeat", + "StagePromotion_Dialog_1", + "StagePromotion_Dialog_2", + "StagePromotion_Combating" + ] + }, + "StagePromotion_Victory": { + "recognition": "OCR", + "text": [ + "战斗", + "胜利" + ], + "roi": [ + 678, + 10, + 473, + 240 + ], + "action": "Click", + "post_wait_freezes": 1, + "next": [ + "StagePromotion_Skip", + "StagePromotion_ReadyForAction", + "StagePromotion_NextStage2", + "StagePromotion_NextStage1", + "StagePromotion_Victory" + ] + }, + "StagePromotion_CombatDefeat": { + "recognition": "OCR", + "text": [ + "战斗", + "失败" + ], + "roi": [ + 384, + 42, + 446, + 214 + ] + }, + "StagePromotion_Dialog_1": { + "recognition": "TemplateMatch", + "template": "OutsideDeduction/SOD_Dialog_1.png", + "roi": [ + 164, + 19, + 37, + 52 + ], + "action": "Click", + "next": [ + "StagePromotion_Dialog_1", + "StagePromotion_Dialog_2", + "StagePromotion_Combating", + "StagePromotion_Victory", + "StagePromotion_CombatDefeat" + ] + }, + "StagePromotion_Dialog_2": { + "recognition": "TemplateMatch", + "template": "OutsideDeduction/SOD_Dialog_2.png", + "roi": [ + 1074, + 29, + 42, + 38 + ], + "action": "Click", + "next": [ + "StagePromotion_Dialog_1", + "StagePromotion_Dialog_2", + "StagePromotion_Combating", + "StagePromotion_Victory", + "StagePromotion_CombatDefeat" + ] + }, + "StagePromotion_CantAuto": { + "recognition": "TemplateMatch", + "template": "Combat/CantAuto.png", + "roi": [ + 1072, + 6, + 72, + 72 + ] + }, + "StagePromotion_SwipeRightForStageList": { + "action": "Swipe", + "begin": [ + 900, + 600, + 100, + 50 + ], + "end": [ + 300, + 600, + 100, + 50 + ], + "post_wait_freezes": 1, + "next": [ + "StagePromotion_SwipeRightAndFindStage" + ] + } +} \ No newline at end of file diff --git a/assets/resource/base/pipeline/combat.json b/assets/resource/base/pipeline/combat.json index 7bab0e70..276b94ca 100644 --- a/assets/resource/base/pipeline/combat.json +++ b/assets/resource/base/pipeline/combat.json @@ -480,6 +480,9 @@ 470, 1280, 160 + ], + "next": [ + "SwipeRightForStageList" ] }, "SwipeLeftForStageList": { @@ -501,6 +504,31 @@ "SwipeLeftAndFindStage" ] }, + "SwipeRightAndFindStage": { + "next": [ + "TargetStageName", + "SwipeRightForStageList" + ] + }, + "SwipeRightForStageList": { + "action": "Swipe", + "begin": [ + 900, + 600, + 100, + 50 + ], + "end": [ + 300, + 600, + 100, + 50 + ], + "post_wait_freezes": 1, + "next": [ + "SwipeRightAndFindStage" + ] + }, "StageDifficulty": { "next_doc": "Set in code." },