diff --git a/assets/resource/base/image/OutsideDeduction/SODStart_Media_MagicLamp.png b/assets/resource/base/image/OutsideDeduction/SODStart_Media_MagicLamp.png new file mode 100644 index 0000000..fc75102 Binary files /dev/null and b/assets/resource/base/image/OutsideDeduction/SODStart_Media_MagicLamp.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SODStart_MediaSelect1.png b/assets/resource/base/image/OutsideDeduction/SODStart_Media_PomegranateHeartBleeding.png similarity index 100% rename from assets/resource/base/image/OutsideDeduction/SODStart_MediaSelect1.png rename to assets/resource/base/image/OutsideDeduction/SODStart_Media_PomegranateHeartBleeding.png diff --git a/assets/resource/base/image/OutsideDeduction/SODStart_MediaSelect3.png b/assets/resource/base/image/OutsideDeduction/SODStart_Media_RitualDagger.png similarity index 100% rename from assets/resource/base/image/OutsideDeduction/SODStart_MediaSelect3.png rename to assets/resource/base/image/OutsideDeduction/SODStart_Media_RitualDagger.png diff --git a/assets/resource/base/image/OutsideDeductionRapid/OptionBorder.png b/assets/resource/base/image/OutsideDeductionRapid/OptionBorder.png new file mode 100644 index 0000000..ea83560 Binary files /dev/null and b/assets/resource/base/image/OutsideDeductionRapid/OptionBorder.png differ diff --git a/assets/resource/base/image/OutsideDeductionRapid/OptionBorder1.png b/assets/resource/base/image/OutsideDeductionRapid/OptionBorder1.png new file mode 100644 index 0000000..bcd046e Binary files /dev/null and b/assets/resource/base/image/OutsideDeductionRapid/OptionBorder1.png differ diff --git a/assets/resource/base/image/OutsideDeductionRapid/WindowsCompleted.png b/assets/resource/base/image/OutsideDeductionRapid/WindowsCompleted.png new file mode 100644 index 0000000..603515a Binary files /dev/null and b/assets/resource/base/image/OutsideDeductionRapid/WindowsCompleted.png differ diff --git a/assets/resource/base/pipeline/activity/outside_deduction.json b/assets/resource/base/pipeline/activity/outside_deduction.json index 3094af1..5fec8cf 100644 --- a/assets/resource/base/pipeline/activity/outside_deduction.json +++ b/assets/resource/base/pipeline/activity/outside_deduction.json @@ -332,6 +332,9 @@ "SODStart_MediaSelect", "SOD_ArcanistAdd", "SODStart_Confirm" + ], + "interrupt": [ + "SOD_SwipeLeft" ] }, "SODStart_GoodsSelect": { @@ -351,6 +354,9 @@ "SOD_ItemSelect_1", "SODStart_MediaSelect", "SOD_ArcanistAdd" + ], + "interrupt": [ + "SOD_SwipeLeft" ] }, "Sub_SODStart_GoodsSelect": { @@ -393,7 +399,7 @@ }, "SODStart_MediaSelect": { "recognition": "TemplateMatch", - "template": "OutsideDeduction/SODStart_MediaSelect3.png", + "template": "OutsideDeduction/SODStart_Media_RitualDagger.png", "roi": [ 0, 81, @@ -406,6 +412,34 @@ "SODStart_MediaSelect" ] }, + "SOD_SwipeLeft": { + "action": "Swipe", + "begin": [ + 1020, + 630, + 100, + 55 + ], + "end": [ + 450, + 630, + 100, + 55 + ], + "post_delay": 0, + "next": [ + "SOD_Click" + ] + }, + "SOD_Click": { + "action": "Click", + "target": [ + 500, + 630, + 100, + 55 + ] + }, "SOD_ArcanistAdd": { "recognition": "TemplateMatch", "template": "OutsideDeduction/SOD_ArcanistAdd.png", @@ -2481,7 +2515,8 @@ 642, 20, 20 - ] + ], + "post_wait_freezes": 500 }, "SOD_Main": { "recognition": "TemplateMatch", diff --git a/assets/resource/base/pipeline/activity/outside_deduction_rapid.json b/assets/resource/base/pipeline/activity/outside_deduction_rapid.json index 470aa07..78bd1f2 100644 --- a/assets/resource/base/pipeline/activity/outside_deduction_rapid.json +++ b/assets/resource/base/pipeline/activity/outside_deduction_rapid.json @@ -17,7 +17,8 @@ "interrupt": [ "ODR_Start_Difficulty_Confirm", "ODR_Start_Gift_Confirm", - "ODR_Start_Gift" + "ODR_Start_Gift", + "SOD_SwipeLeft" ] }, "ODR_Start_Difficulty_Confirm": { @@ -47,15 +48,13 @@ ], "only_rec": true, "next": [ - "ODR_Start_GiftSelect", - "ODR_Start_Gift" + "ODR_Start_Gift_ConfirmFlag", + "ODR_Start_GiftSelect" ] }, "ODR_Start_GiftSelect": { - "is_sub": true, "recognition": "OCR", "expected": [ - "软盘", "造物", "发条", "金雀" @@ -76,7 +75,6 @@ "ODR_Start_GiftSelect_2": { "recognition": "OCR", "expected": [ - "软盘", "造物", "发条", "金雀" @@ -124,7 +122,7 @@ "ODR_Start_MediaSelect": { "doc": "触媒选择", "recognition": "TemplateMatch", - "template": "OutsideDeduction/SODStart_MediaSelect3.png", + "template": "OutsideDeduction/SODStart_Media_MagicLamp.png", "roi": [ 0, 81, @@ -137,7 +135,9 @@ "ODR_Start_TeamBuild", "ODR_Start_MediaSelect" ], - "interrupt": "ODR_Start_MediaSelect_Confirm" + "interrupt": [ + "ODR_Start_MediaSelect_Confirm" + ] }, "ODR_Start_MediaSelect_Confirm": { "doc": "触媒确认", @@ -280,7 +280,12 @@ 1080 ], "action": "Click", - "next": "ODR_Event_Select_SkipText", + "next": [ + "ODR_Event_Select_SkipText", + "ODR_Event_Select_SkipText_First", + "ODR_Event_Select_SkipText_Second", + "ODR_Event_Select_SkipText_Second2Last" + ], "interrupt": "ODR_Move" }, "ODR_SelectTreasure": { @@ -379,11 +384,11 @@ "recognition": "TemplateMatch", "template": "OutsideDeductionRapid/Chess.png", "next": [ + "ODR_SelectRestSite", + "ODR_SelectTreasure", "ODR_SelectDiscovery", "ODR_SelectCombat", "ODR_SelectImminent", - "ODR_SelectTreasure", - "ODR_SelectRestSite", "ODR_SelectShop", "ODR_QueryChessLocation" ] @@ -394,13 +399,14 @@ "template": "OutsideDeductionRapid/Chess2.png", "order_by": "Score", "next": [ + "ODR_SelectRestSite", + "ODR_SelectTreasure", "ODR_SelectDiscovery", "ODR_SelectCombat", "ODR_SelectImminent", - "ODR_SelectTreasure", - "ODR_SelectRestSite", "ODR_SelectShop", - "ODR_QueryChessLocation" + "ODR_QueryChessLocation", + "ODR_QueryChessLocation2" ] }, "ODR_Levelup": { @@ -428,6 +434,9 @@ "next": [ "ODR_SkipAddChar", "ODR_Levelup" + ], + "interrupt": [ + "SOD_Acquire_NoNext" ] }, "ODR_ItemSelect": { @@ -446,7 +455,26 @@ "ODR_ItemSelect_Confirm" ], "interrupt": [ - "ODR_ItemSelect_1" + "ODR_ItemSelect_2" + ] + }, + "ODR_ItemSelect_NoNext": { + "recognition": "OCR", + "expected": [ + "造物选择" + ], + "roi": [ + 570, + 20, + 142, + 44 + ], + "only_rec": true, + "next": [ + "ODR_ItemSelect_Confirm_NoNext" + ], + "interrupt": [ + "ODR_ItemSelect_2" ] }, "ODR_ItemSelect_1": { @@ -459,9 +487,6 @@ ], "next": [ "ODR_ItemSelect_ConfirmFlag" - ], - "interrupt": [ - "ODR_ItemSelect_2" ] }, "ODR_ItemSelect_2": { @@ -505,6 +530,9 @@ "timeout": 10000, "next": [ "ODR_ItemSelect_ConfirmFlag" + ], + "interrupt": [ + "ODR_ItemSelect_1" ] }, "ODR_ItemSelect_Confirm": { @@ -521,7 +549,7 @@ "only_rec": true, "action": "Click", "post_wait_freezes": { - "time": 1000, + "time": 700, "target": [ 33, 430, @@ -530,7 +558,33 @@ ] }, "next": "ODR_MainLoop", - "interrupt": "ODR_Levelup" + "interrupt": [ + "ODR_Levelup", + "SOD_Acquire_NoNext" + ] + }, + "ODR_ItemSelect_Confirm_NoNext": { + "recognition": "OCR", + "expected": [ + "确认" + ], + "roi": [ + 606, + 628, + 74, + 40 + ], + "only_rec": true, + "action": "Click", + "post_wait_freezes": { + "time": 700, + "target": [ + 33, + 430, + 82, + 85 + ] + } }, "ODR_ItemSelect_ConfirmFlag": { "recognition": "OCR", @@ -558,17 +612,14 @@ ], "only_rec": true, "action": "Click", - "next": "ODR_MainLoop", - "interrupt": [ - "ODR_Levelup", - "ODR_SkipText" - ] + "post_wait_freezes": 700 }, "ODR_ItemLose": { "recognition": "OCR", "expected": [ "交付造物", - "失去造物" + "失去造物", + "失声天平" ], "roi": [ 535, @@ -630,42 +681,28 @@ } }, "ODR_Event_Select_SkipText": { - "doc": "选中事件", + "doc": "事件——默认最后一个选项", "expected_doc": "来自BV197421Z7bm&灰机wiki-维也纳拾遗", "recognition": "OCR", "expected": [ "休憩点", - "盛情款待", - "今日运势", "神奇商店", - "落魄画家", "乞食的鸟雀", - "板条箱", "门的内侧", - "洞窟尽头", "合法受益人", "受害者", "美味汽水", - "降灵", "床位纷争", - "旧唱片", "聒噪的箱子", - "狂热粉丝", - "何谓艺术", "模糊的油画", "赃物", "魔精典当行", - "地底与星空", "水泊精灵", "传闻", "星空之腹", "交易地", "命运之泉", "便民服务", - "旧栈道", - "破碎的怀表", - "矫饰主义", - "非典型茶歇", "未来", "市场雏形", "向导", @@ -673,7 +710,6 @@ "脱轨电车", "城市的静脉", "滑翔冒险", - "死胡同", "旅者的馈赠", "艺术的回馈", "分享情报", @@ -688,12 +724,351 @@ "only_rec": true, "action": "Click", "next": [ + "ODR_MainLoop" + ], + "interrupt": [ "ODR_Event_Select", - "ODR_Event_Select_SkipText" + "ODR_ItemSelect_NoNext", + "ODR_Levelup", + "ODR_ItemLose", + "SOD_Acquire_NoNext", + "ODR_SkipText" + ] + }, + "ODR_Event_Select_SkipText_First": { + "doc": "事件——选择第一个选项", + "expected_doc": "来自BV197421Z7bm&灰机wiki-维也纳拾遗", + "recognition": "OCR", + "expected": [ + "盛情款待", + "今日运势", + "落魄画家", + "板条箱", + "降灵", + "何谓艺术", + "地底与星空", + "旧栈道", + "非典型茶歇", + "死胡同" + ], + "roi": [ + 239, + 468, + 407, + 41 + ], + "only_rec": true, + "action": "Click", + "next": [ + "ODR_MainLoop" + ], + "interrupt": [ + "ODR_Event_Select_First", + "ODR_ItemSelect_NoNext", + "ODR_Levelup", + "ODR_ItemLose", + "SOD_Acquire_NoNext", + "ODR_SkipText" + ] + }, + "ODR_Event_Select_SkipText_Second": { + "doc": "事件——选择第二个选项", + "expected_doc": "来自BV197421Z7bm&灰机wiki-维也纳拾遗", + "recognition": "OCR", + "expected": [ + "破碎的怀表", + "狂热粉丝", + "矫饰主义" + ], + "roi": [ + 239, + 468, + 407, + 41 + ], + "only_rec": true, + "action": "Click", + "next": [ + "ODR_MainLoop" + ], + "interrupt": [ + "ODR_Event_Select_Second", + "ODR_ItemSelect_NoNext", + "ODR_Levelup", + "ODR_ItemLose", + "SOD_Acquire_NoNext", + "ODR_SkipText" + ] + }, + "ODR_Event_Select_SkipText_Second2Last": { + "doc": "事件——选择倒数第二个选项", + "expected_doc": "来自BV197421Z7bm&灰机wiki-维也纳拾遗", + "recognition": "OCR", + "expected": [ + "洞窟尽头", + "旧唱片" + ], + "roi": [ + 239, + 468, + 407, + 41 + ], + "only_rec": true, + "action": "Click", + "next": [ + "ODR_MainLoop" + ], + "interrupt": [ + "ODR_Event_Select_Second2Last", + "ODR_ItemSelect_NoNext", + "ODR_Levelup", + "ODR_ItemLose", + "SOD_Acquire_NoNext", + "ODR_SkipText" + ] + }, + "ODR_Event_Select_SkipText_Windows&Doors": { + "doc": "选中事件——窗与扉", + "expected_doc": "来自BV197421Z7bm&灰机wiki-维也纳拾遗", + "recognition": "OCR", + "expected": [ + "窗与扉" + ], + "roi": [ + 239, + 468, + 407, + 41 + ], + "only_rec": true, + "action": "Click", + "next": [ + "ODR_Event_Windows&Doors_Completed" + ], + "interrupt": [ + "ODR_Windows&Doors_Exchange", + "ODR_Windows&Doors_CreationContract", + "SOD_Acquire_NoNext", + "ODR_ItemLose", + "ODR_SkipText" + ] + }, + "ODR_Windows&Doors_Merge": { + "doc": "奇巧置换", + "recognition": "TemplateMatch", + "template": "OutsideDeductionRapid/Event.png", + "roi": [ + 760, + 70, + 520, + 640 + ], + "order_by": "Vertical", + "index": 0, + "action": "Click", + "next": [ + "ODR_KitKatReplacement" + ], + "interrupt": [ + "ODR_Event_Confirm", + "ODR_Windows&Doors_Merge", + "ODR_SkipText" + ] + }, + "ODR_KitKatReplacement": { + "doc": "奇巧置换页面", + "recognition": "OCR", + "expected": [ + "奇巧置换" + ], + "roi": [ + 570, + 20, + 142, + 44 + ], + "only_rec": true, + "next": [ + "ODR_KitKatReplacement_Completed" + ], + "interrupt": [ + "ODR_KitKatReplacement_First" + ] + }, + "ODR_KitKatReplacement_Completed": { + "recognition": "OCR", + "expected": [ + "0" + ], + "roi": [ + 950, + 516, + 35, + 19 + ], + "only_rec": true, + "next": [ + "ODR_Windows&Doors_CreationContract" + ], + "interrupt": [ + "BackButton" + ] + }, + "ODR_KitKatReplacement_CompletedFlag": { + "recognition": "OCR", + "expected": [ + "0" + ], + "roi": [ + 950, + 516, + 35, + 19 + ], + "only_rec": true, + "post_delay": 1 + }, + "ODR_KitKatReplacement_First": { + "recognition": "OCR", + "expected": [ + "1/1" + ], + "roi": [ + 950, + 516, + 35, + 19 + ], + "only_rec": true, + "target": [ + 831, + 580, + 64, + 35 + ], + "action": "Click", + "next": [ + "ODR_KitKatReplacement_CompletedFlag" + ], + "interrupt": [ + "ODR_KitKatReplacement_Second", + "ODR_Confirm", + "ODR_KitKatReplacement_Switch_2" + ] + }, + "ODR_Confirm": { + "recognition": "TemplateMatch", + "template": "OutsideDeduction/SOD_ArcanistAdd_Confirm_1.png", + "roi": [ + 754, + 396, + 106, + 54 + ], + "action": "Click" + }, + "ODR_KitKatReplacement_Second": { + "recognition": "OCR", + "expected": [ + "1/1" + ], + "roi": [ + 950, + 516, + 35, + 19 + ], + "only_rec": true, + "target": [ + 831, + 580, + 64, + 35 + ], + "action": "Click", + "next": [ + "ODR_KitKatReplacement_CompletedFlag" + ], + "interrupt": [ + "ODR_KitKatReplacement_Third", + "ODR_Confirm", + "ODR_KitKatReplacement_Switch_3" + ] + }, + "ODR_KitKatReplacement_Third": { + "recognition": "OCR", + "expected": [ + "1/1" + ], + "roi": [ + 950, + 516, + 35, + 19 + ], + "only_rec": true, + "target": [ + 831, + 580, + 64, + 35 + ], + "action": "Click", + "next": [ + "ODR_KitKatReplacement_CompletedFlag" + ], + "interrupt": [ + "ODR_KitKatReplacement_Third", + "ODR_Confirm", + "ODR_KitKatReplacement_Switch_3" + ] + }, + "ODR_KitKatReplacement_Switch_2": { + "action": "Click", + "target": [ + 349, + 196, + 64, + 60 + ] + }, + "ODR_KitKatReplacement_Switch_3": { + "action": "Click", + "target": [ + 230, + 314, + 52, + 51 + ] + }, + "ODR_Windows&Doors_Exchange": { + "doc": "失声天平", + "recognition": "OCR", + "expected": "[12]", + "roi": [ + 941, + 505, + 142, + 19 + ], + "only_rec": true, + "target_offset": [ + 0, + 0, + 0, + -35 + ], + "action": "Click", + "next": [ + "ODR_ItemLose" + ], + "interrupt": [ + "ODR_Event_Confirm" ] }, "ODR_Event_Select": { - "doc": "选中事件", + "doc": "选择选项（最后）", "recognition": "TemplateMatch", "template": "OutsideDeductionRapid/Event.png", "roi": [ @@ -711,6 +1086,128 @@ ], "interrupt": "ODR_SkipText" }, + "ODR_Event_Select_First": { + "doc": "选择选项（第一）", + "recognition": "TemplateMatch", + "template": "OutsideDeductionRapid/Event.png", + "roi": [ + 760, + 70, + 520, + 640 + ], + "order_by": "Vertical", + "index": 0, + "action": "Click", + "next": [ + "ODR_Event_Confirm", + "ODR_Event_Select_First" + ], + "interrupt": "ODR_SkipText" + }, + "ODR_Event_Select_Second2Last": { + "doc": "选择选项（倒数第二）", + "recognition": "TemplateMatch", + "template": "OutsideDeductionRapid/Event.png", + "roi": [ + 760, + 70, + 520, + 640 + ], + "order_by": "Vertical", + "index": -2, + "action": "Click", + "next": [ + "ODR_Event_Confirm", + "ODR_Event_Select_Second2Last" + ], + "interrupt": "ODR_SkipText" + }, + "ODR_Event_Select_Second": { + "doc": "选择选项（第二）", + "recognition": "TemplateMatch", + "template": "OutsideDeductionRapid/Event.png", + "roi": [ + 760, + 70, + 520, + 640 + ], + "order_by": "Vertical", + "index": 1, + "action": "Click", + "next": [ + "ODR_Event_Confirm", + "ODR_Event_Select_Second" + ], + "interrupt": "ODR_SkipText" + }, + "ODR_Windows&Doors_CreationContract": { + "doc": "造物典契", + "recognition": "TemplateMatch", + "template": "OutsideDeductionRapid/Event.png", + "roi": [ + 694, + 84, + 586, + 596 + ], + "order_by": "Vertical", + "index": 1, + "post_wait_freezes": 1, + "action": "Click", + "next": [ + "ODR_Event_Windows&Doors_Completed" + ], + "interrupt": [ + "ODR_Event_Confirm", + "ODR_OptionSelectAll", + "ODR_Windows&Doors_CreationContract_ChangeRound", + "BackButton" + ] + }, + "ODR_Event_Windows&Doors_Completed": { + "recognition": "TemplateMatch", + "template": "./OutsideDeductionRapid/WindowsCompleted.png", + "roi": [ + 441, + 418, + 150, + 172 + ] + }, + "ODR_Windows&Doors_CreationContract_ChangeRound": { + "doc": "换一批", + "recognition": "OCR", + "expected": [ + "1/1" + ], + "roi": [ + 803, + 610, + 55, + 28 + ], + "only_rec": true, + "action": "Click" + }, + "ODR_OptionSelectAll": { + "doc": "选择选项（所有）", + "recognition": "TemplateMatch", + "template": [ + "OutsideDeductionRapid/OptionBorder.png", + "OutsideDeductionRapid/OptionBorder1.png" + ], + "roi": [ + 721, + 125, + 559, + 441 + ], + "action": "Click", + "threshold": 0.75 + }, "ODR_Event_Confirm": { "doc": "确认选项", "recognition": "TemplateMatch", @@ -722,15 +1219,7 @@ 600 ], "post_wait_freezes": 1, - "action": "Click", - "next": [ - "ODR_MainLoop", - "ODR_Event_Confirm" - ], - "interrupt": [ - "ODR_ItemLose", - "ODR_SkipText" - ] + "action": "Click" }, "ODR_QuitShop": { "recognition": "TemplateMatch", @@ -757,9 +1246,22 @@ 67, 69 ], - "next": "ODR_Start", + "post_wait_freezes": { + "time": 200, + "target": [ + 33, + 430, + 82, + 85 + ] + }, + "action": "Click", + "next": [ + "ODR_Start" + ], "interrupt": [ "SODStop", + "ODR_Event_Select_SkipText_Windows&Doors", "HomeLoading", "BackButton" ] @@ -780,23 +1282,11 @@ "ODR_QueryChessLocation2" ], "interrupt": [ - "SwipLeft" - ] - }, - "SwipLeft": { - "doc": "向左滑动", - "action": "Swipe", - "begin": [ - 250, - 600, - 50, - 50 - ], - "end": [ - 500, - 600, - 50, - 50 + "ODR_ItemSelect_NoNext", + "ODR_Levelup", + "ODR_ItemLose", + "SOD_Acquire_NoNext", + "ODR_SkipText" ] } } \ No newline at end of file