diff --git a/assets/interface.json b/assets/interface.json index 3e315fb..a88f93e 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -1206,8 +1206,8 @@ { "name": "Yes", "pipeline_override": { - "SeriesOfDusks": { - "next": "ODR_Entrance" + "SOD_UNOPENED": { + "next": "ODR_Start" } } } diff --git a/assets/resource/base/image/OutsideDeductionRapid/Chess2.png b/assets/resource/base/image/OutsideDeductionRapid/Chess2.png new file mode 100644 index 0000000..acf63c4 Binary files /dev/null and b/assets/resource/base/image/OutsideDeductionRapid/Chess2.png differ diff --git a/assets/resource/base/image/OutsideDeductionRapid/EventSelect.png b/assets/resource/base/image/OutsideDeductionRapid/EventSelect.png deleted file mode 100644 index c510693..0000000 Binary files a/assets/resource/base/image/OutsideDeductionRapid/EventSelect.png and /dev/null differ diff --git a/assets/resource/base/image/OutsideDeductionRapid/ExpectEntrance.jpg b/assets/resource/base/image/OutsideDeductionRapid/ExpectEntrance.jpg deleted file mode 100644 index c47acc8..0000000 Binary files a/assets/resource/base/image/OutsideDeductionRapid/ExpectEntrance.jpg and /dev/null differ diff --git a/assets/resource/base/pipeline/activity/outside_deduction.json b/assets/resource/base/pipeline/activity/outside_deduction.json index 4e50f4b..3094af1 100644 --- a/assets/resource/base/pipeline/activity/outside_deduction.json +++ b/assets/resource/base/pipeline/activity/outside_deduction.json @@ -1,8 +1,7 @@ { "SeriesOfDusks": { "next": [ - "SOD_Menu", - "SOD_Main" + "SOD_Menu" ], "interrupt": [ "OutsideDeduction", @@ -33,8 +32,7 @@ ], "only_rec": true, "next": [ - "SOD_UNOPENED", - "SOD_Main" + "SOD_UNOPENED" ], "interrupt": [ "SODStop", @@ -112,8 +110,7 @@ ], "only_rec": true, "next": [ - "SODStart", - "SOD_Main" + "SODStart" ], "interrupt": [ "SODStop" diff --git a/assets/resource/base/pipeline/activity/outside_deduction_rapid.json b/assets/resource/base/pipeline/activity/outside_deduction_rapid.json index ba3f5c2..470aa07 100644 --- a/assets/resource/base/pipeline/activity/outside_deduction_rapid.json +++ b/assets/resource/base/pipeline/activity/outside_deduction_rapid.json @@ -1,217 +1,24 @@ { - "SeriesOfDusksRapid": { - "doc": "首关速刷,需要先手动将“刻画生长-指引之歌”点满", - "next": "ODR_Entrance", - "interrupt": [ - "ODR_EnterFromTheShow", - "EnterTheShow", - "ReturnMain" - ] - }, - "ODR_Entrance": { - "doc": "黄昏的音序主界面", - "recognition": "TemplateMatch", - "template": "OutsideDeduction/SOD_MENU.png", - "roi": [ - 210, - 200, - 324, - 98 - ], - "next": "ODR_Start", - "interrupt": [ - "ODR_Entr_TryStopPrev", - "ODR_Entr_TryDlcUnmount" - ] - }, - "ODR_EnterFromTheShow": { - "doc": "从“入场”界面进入“局外演绎”", - "recognition": "TemplateMatch", - "template": "OutsideDeduction/OutsideDeduction.png", - "roi": [ - 427, - 602, - 811, - 104 - ], - "action": "Click", - "post_delay": 3000 - }, - "ODR_CheckAtEntr": { - "doc": "若已经在主界面,则继续卸载DLC", - "recognition": "TemplateMatch", - "template": "OutsideDeduction/SOD_MENU.png", - "roi": [ - 210, - 200, - 324, - 98 - ], - "next": "ODR_Entr_TryDlcUnmount", - "interrupt": "ODR_Entrance" - }, - "ODR_Entr_TryStopPrev": { - "doc": "尝试终止上一局游戏", - "recognition": "TemplateMatch", - "template": "OutsideDeduction/SODStop.png", - "roi": [ - 830, - 597, - 67, - 75 - ], - "action": "Click", - "next": [ - "ODR_Entr_StopPrev_Confirm", - "ODR_Entr_TryStopPrev" - ] - }, - "ODR_Entr_StopPrev_Confirm": { - "doc": "确认终止", - "recognition": "OCR", - "expected": "确认", - "roi": [ - 770, - 404, - 70, - 36 - ], - "only_rec": true, - "action": "Click", - "post_wait_freezes": 1, - "next": [ - "ODR_Entr_StopPrev_SkipSummary", - "ODR_Entr_StopPrev_Confirm" - ] - }, - "ODR_Entr_StopPrev_SkipSummary": { - "doc": "跳过“阴霾渐生”等总结文本", - "recognition": "OCR", - "expected": [ - "渐生" - ], - "roi": [ - 656, - 271, - 156, - 74 - ], - "only_rec": true, - "action": "Click", - "target": [ - 1183, - 42, - 0, - 0 - ], - "next": [ - "ODR_CheckAtEntr", - "ODR_Entr_StopPrev_SkipReview", - "ODR_Entr_StopPrev_SkipSummary" - ] - }, - "ODR_Entr_StopPrev_SkipReview": { - "doc": "跳过花絮回顾。点一次右上角的“跳过”按钮", - "action": "Click", - "target": [ - 1183, - 42, - 0, - 0 - ], - "next": [ - "ODR_Entr_StopPrev_SkipSpoils", - "ODR_Entr_StopPrev_SkipReview" - ] - }, - "ODR_Entr_StopPrev_SkipSpoils": { - "doc": "跳过战利品展示", - "action": "Click", - "target": [ - 1006, - 45, - 0, - 0 - ], - "post_delay": 750, - "next": [ - "ODR_CheckAtEntr", - "ODR_Entr_StopPrev_SkipSpoils" - ] - }, - "ODR_Entr_Dlc_EnterMenu": { - "doc": "进入资料片(DLC)选择菜单", - "recognition": "OCR", - "expected": "资料片", - "roi": [ - 396, - 88, - 63, - 27 - ], - "only_rec": true, - "action": "Click", - "next": "ODR_Entr_Dlc_Unmount" - }, - "ODR_Entr_Dlc_Unmount": { - "doc": "取消挂载DLC", - "recognition": "OCR", - "expected": "取消", - "roi": [ - 1016, - 619, - 67, - 40 - ], - "only_rec": true, - "action": "Click", - "next": [ - "BackButton", - "ODR_CheckAtEntr" - ] - }, - "ODR_Entr_TryDlcUnmount": { - "doc": "尝试取消挂载DLC", - "recognition": "TemplateMatch", - "template": "OutsideDeductionRapid/ExpectEntrance.jpg", - "roi": [ - 931, - 419, - 298, - 208 - ], - "threshold": 0.9, - "inverse": true, - "pre_wait_freezes": 1, - "next": [ - "ODR_Entr_Dlc_EnterMenu", - "ODR_Entr_TryDlcUnmount" - ] - }, "ODR_Start": { - "doc": "旋律初现", + "doc": "首层速刷,需要先手动将“刻画生长-指引之歌”点满", "recognition": "TemplateMatch", - "template": "OutsideDeductionRapid/ExpectEntrance.jpg", + "template": "OutsideDeduction/SODStart.png", "roi": [ - 931, - 419, - 298, - 208 + 947, + 559, + 246, + 113 ], - "threshold": 0.9, "action": "Click", - "target_offset": [ - 0, - 78, - 0, - 0 - ], - "post_delay": 750, "next": [ "ODR_Start_MediaSelect", "ODR_Start" ], - "interrupt": "ODR_Start_Difficulty_Confirm" + "interrupt": [ + "ODR_Start_Difficulty_Confirm", + "ODR_Start_Gift_Confirm", + "ODR_Start_Gift" + ] }, "ODR_Start_Difficulty_Confirm": { "doc": "难度确认", @@ -225,12 +32,7 @@ ], "only_rec": true, "action": "Click", - "post_wait_freezes": 1, - "next": [ - "ODR_Start_Gift", - "ODR_Start_MediaSelect", - "ODR_Start_Difficulty_Confirm" - ] + "post_wait_freezes": 1 }, "ODR_Start_Gift": { "recognition": "OCR", @@ -238,11 +40,12 @@ "镜的馈赠" ], "roi": [ - 535, - 4, - 224, - 90 + 572, + 22, + 133, + 36 ], + "only_rec": true, "next": [ "ODR_Start_GiftSelect", "ODR_Start_Gift" @@ -265,7 +68,10 @@ 57 ], "action": "Click", - "next": "ODR_Start_GiftSelect_2" + "next": [ + "ODR_Start_Gift_ConfirmFlag", + "ODR_Start_GiftSelect_2" + ] }, "ODR_Start_GiftSelect_2": { "recognition": "OCR", @@ -284,7 +90,7 @@ ], "action": "Click", "next": [ - "ODR_Start_Gift_Confirm", + "ODR_Start_Gift_ConfirmFlag", "ODR_Start_GiftSelect_2" ] }, @@ -300,11 +106,20 @@ ], "only_rec": true, "action": "Click", - "post_wait_freezes": 1, - "next": [ - "ODR_Start_MediaSelect", - "ODR_Start_Gift_Confirm" - ] + "post_wait_freezes": 1 + }, + "ODR_Start_Gift_ConfirmFlag": { + "doc": "镜的馈赠确认", + "recognition": "OCR", + "expected": "确认", + "roi": [ + 1030, + 616, + 76, + 44 + ], + "only_rec": true, + "post_wait_freezes": 1 }, "ODR_Start_MediaSelect": { "doc": "触媒选择", @@ -335,6 +150,15 @@ 44 ], "only_rec": true, + "post_wait_freezes": { + "time": 300, + "target": [ + 33, + 430, + 82, + 85 + ] + }, "action": "Click" }, "ODR_Start_TeamBuild": { @@ -406,11 +230,23 @@ 44 ], "only_rec": true, - "post_wait_freezes": 1, + "post_wait_freezes": { + "time": 300, + "target": [ + 33, + 430, + 82, + 85 + ] + }, "action": "Click", "next": [ "ODR_MainLoop", "ODR_Start_Teambuild_Confirm" + ], + "interrupt": [ + "SOD_Acquire_NoNext", + "HomeLoading" ] }, "ODR_SelectCombat": { @@ -427,7 +263,6 @@ 1080 ], "action": "Click", - "timeout": 1000, "next": "ODR_ItemSelect", "interrupt": "ODR_Move" }, @@ -445,7 +280,6 @@ 1080 ], "action": "Click", - "timeout": 1000, "next": "ODR_Event_Select_SkipText", "interrupt": "ODR_Move" }, @@ -528,14 +362,7 @@ 91 ], "action": "Click", - "post_wait_freezes": { - "target": [ - 881, - 317, - 40, - 40 - ] - } + "post_wait_freezes": 1 }, "ODR_SkipText": { "doc": "点击一下屏幕以跳过文本加载", @@ -551,7 +378,30 @@ "doc": "查询棋子位置", "recognition": "TemplateMatch", "template": "OutsideDeductionRapid/Chess.png", - "action": "StopTask" + "next": [ + "ODR_SelectDiscovery", + "ODR_SelectCombat", + "ODR_SelectImminent", + "ODR_SelectTreasure", + "ODR_SelectRestSite", + "ODR_SelectShop", + "ODR_QueryChessLocation" + ] + }, + "ODR_QueryChessLocation2": { + "doc": "查询棋子位置(棋子位于左边界被遮挡)", + "recognition": "TemplateMatch", + "template": "OutsideDeductionRapid/Chess2.png", + "order_by": "Score", + "next": [ + "ODR_SelectDiscovery", + "ODR_SelectCombat", + "ODR_SelectImminent", + "ODR_SelectTreasure", + "ODR_SelectRestSite", + "ODR_SelectShop", + "ODR_QueryChessLocation" + ] }, "ODR_Levelup": { "recognition": "OCR", @@ -565,6 +415,15 @@ 68 ], "only_rec": true, + "post_wait_freezes": { + "time": 300, + "target": [ + 33, + 430, + 82, + 85 + ] + }, "action": "Click", "next": [ "ODR_SkipAddChar", @@ -584,10 +443,10 @@ ], "only_rec": true, "next": [ - "ODR_ItemSelect_1", - "ODR_ItemSelect_2", - "ODR_ItemSelect_3", - "ODR_ItemSelect_4" + "ODR_ItemSelect_Confirm" + ], + "interrupt": [ + "ODR_ItemSelect_1" ] }, "ODR_ItemSelect_1": { @@ -598,7 +457,12 @@ 20, 20 ], - "next": "ODR_ItemSelect_Confirm" + "next": [ + "ODR_ItemSelect_ConfirmFlag" + ], + "interrupt": [ + "ODR_ItemSelect_2" + ] }, "ODR_ItemSelect_2": { "action": "Click", @@ -608,7 +472,12 @@ 20, 20 ], - "next": "ODR_ItemSelect_Confirm" + "next": [ + "ODR_ItemSelect_ConfirmFlag" + ], + "interrupt": [ + "ODR_ItemSelect_3" + ] }, "ODR_ItemSelect_3": { "action": "Click", @@ -618,7 +487,12 @@ 20, 20 ], - "next": "ODR_ItemSelect_Confirm" + "next": [ + "ODR_ItemSelect_ConfirmFlag" + ], + "interrupt": [ + "ODR_ItemSelect_4" + ] }, "ODR_ItemSelect_4": { "action": "Click", @@ -628,7 +502,10 @@ 20, 20 ], - "next": "ODR_ItemSelect_Confirm" + "timeout": 10000, + "next": [ + "ODR_ItemSelect_ConfirmFlag" + ] }, "ODR_ItemSelect_Confirm": { "recognition": "OCR", @@ -643,9 +520,31 @@ ], "only_rec": true, "action": "Click", + "post_wait_freezes": { + "time": 1000, + "target": [ + 33, + 430, + 82, + 85 + ] + }, "next": "ODR_MainLoop", "interrupt": "ODR_Levelup" }, + "ODR_ItemSelect_ConfirmFlag": { + "recognition": "OCR", + "expected": [ + "确认" + ], + "roi": [ + 606, + 628, + 74, + 40 + ], + "only_rec": true + }, "ODR_ItemLose_Confirm": { "recognition": "OCR", "expected": [ @@ -661,8 +560,8 @@ "action": "Click", "next": "ODR_MainLoop", "interrupt": [ - "ODR_SkipText", - "ODR_Levelup" + "ODR_Levelup", + "ODR_SkipText" ] }, "ODR_ItemLose": { @@ -728,24 +627,65 @@ 40, 40 ] - }, - "next": [ - "ODR_MainLoop", - "ODR_SkipAddChar_Confirm" - ] + } }, "ODR_Event_Select_SkipText": { "doc": "选中事件", - "recognition": "TemplateMatch", - "template": "OutsideDeductionRapid/EventSelect.png", - "green_mask": true, - "threshold": 0.5, - "roi": [ - 312, - 422, - 106, - 100 + "expected_doc": "来自BV197421Z7bm&灰机wiki-维也纳拾遗", + "recognition": "OCR", + "expected": [ + "休憩点", + "盛情款待", + "今日运势", + "神奇商店", + "落魄画家", + "乞食的鸟雀", + "板条箱", + "门的内侧", + "洞窟尽头", + "合法受益人", + "受害者", + "美味汽水", + "降灵", + "床位纷争", + "旧唱片", + "聒噪的箱子", + "狂热粉丝", + "何谓艺术", + "模糊的油画", + "赃物", + "魔精典当行", + "地底与星空", + "水泊精灵", + "传闻", + "星空之腹", + "交易地", + "命运之泉", + "便民服务", + "旧栈道", + "破碎的怀表", + "矫饰主义", + "非典型茶歇", + "未来", + "市场雏形", + "向导", + "失窃案", + "脱轨电车", + "城市的静脉", + "滑翔冒险", + "死胡同", + "旅者的馈赠", + "艺术的回馈", + "分享情报", + "巷角的围堵" + ], + "roi": [ + 239, + 468, + 407, + 41 ], + "only_rec": true, "action": "Click", "next": [ "ODR_Event_Select", @@ -817,10 +757,11 @@ 67, 69 ], - "next": "ODR_Entrance", + "next": "ODR_Start", "interrupt": [ - "BackButton", - "ODR_MainLoop" + "SODStop", + "HomeLoading", + "BackButton" ] }, "ODR_MainLoop": { @@ -834,14 +775,28 @@ ], "post_wait_freezes": 1, "next": [ - "ODR_SelectImminent", - "ODR_SelectTreasure", - "ODR_SelectRestSite", - "ODR_SelectShop", - "ODR_SelectDiscovery", - "ODR_SelectCombat", - "ODR_Exit" + "ODR_QueryChessLocation", + "ODR_Exit", + "ODR_QueryChessLocation2" + ], + "interrupt": [ + "SwipLeft" + ] + }, + "SwipLeft": { + "doc": "向左滑动", + "action": "Swipe", + "begin": [ + 250, + 600, + 50, + 50 ], - "interrupt": "ODR_QueryChessLocation" + "end": [ + 500, + 600, + 50, + 50 + ] } } \ No newline at end of file