diff --git a/assets/resource/base/pipeline/11_(02)_snowscape.json b/assets/resource/base/pipeline/11_(02)_snowscape.json index 872a537..7633657 100644 --- a/assets/resource/base/pipeline/11_(02)_snowscape.json +++ b/assets/resource/base/pipeline/11_(02)_snowscape.json @@ -104,6 +104,7 @@ "advance_one_women": { "recognition": "TemplateMatch", "template": "Research/85.png", + "threshold": 0.6, "green_mask": true, "post_delay": 3000, "action": "Click", @@ -121,6 +122,7 @@ "advance_one_man": { "recognition": "TemplateMatch", "template": "Research/84.png", + "threshold": 0.6, "green_mask": true, "post_delay": 3000, "action": "Click", @@ -146,12 +148,11 @@ ] }, "advance_two": { - "recognition": "TemplateMatch", - "template": "Research/09.png", + "recognition": "OCR", + "expected": "前往", "action": "Click", "post_delay": 5000, "next": [ - "advance_three", "mist", "Snow", "mountain_snow", @@ -170,7 +171,8 @@ "without_one", "abandon_one", "advance_one_man", - "advance_one_women" + "advance_one_women", + "advance_three" ] }, "advance_three": { @@ -202,8 +204,6 @@ }, "advance_four": { "next": [ - "advance_two", - "advance_three", "mist", "Snow", "mountain_snow", @@ -225,7 +225,9 @@ "advance_one_women", "war_five", "upgrade_one", - "descending_one" + "descending_one", + "advance_two", + "advance_three" ] }, "abandon_one": { @@ -840,6 +842,7 @@ "advance_two_women": { "recognition": "TemplateMatch", "template": "Research/85.png", + "threshold": 0.6, "green_mask": true, "post_delay": 3000, "action": "Click", @@ -857,6 +860,7 @@ "advance_two_man": { "recognition": "TemplateMatch", "template": "Research/84.png", + "threshold": 0.6, "green_mask": true, "post_delay": 3000, "action": "Click", @@ -874,6 +878,7 @@ "advance_three_women": { "recognition": "TemplateMatch", "template": "Research/85.png", + "threshold": 0.6, "green_mask": true, "post_delay": 3000, "action": "Click", @@ -891,6 +896,7 @@ "advance_three_man": { "recognition": "TemplateMatch", "template": "Research/84.png", + "threshold": 0.6, "green_mask": true, "post_delay": 3000, "action": "Click", @@ -908,6 +914,7 @@ "advance_four_women": { "recognition": "TemplateMatch", "template": "Research/85.png", + "threshold": 0.6, "green_mask": true, "post_delay": 3000, "action": "Click", @@ -925,6 +932,7 @@ "advance_four_man": { "recognition": "TemplateMatch", "template": "Research/84.png", + "threshold": 0.6, "green_mask": true, "post_delay": 3000, "action": "Click", @@ -942,6 +950,7 @@ "advance_five_women": { "recognition": "TemplateMatch", "template": "Research/85.png", + "threshold": 0.6, "green_mask": true, "post_delay": 3000, "action": "Click", @@ -959,6 +968,7 @@ "advance_five_man": { "recognition": "TemplateMatch", "template": "Research/84.png", + "threshold": 0.6, "green_mask": true, "post_delay": 3000, "action": "Click", @@ -976,6 +986,7 @@ "advance_six_women": { "recognition": "TemplateMatch", "template": "Research/85.png", + "threshold": 0.6, "green_mask": true, "post_delay": 3000, "action": "Click", @@ -993,6 +1004,7 @@ "advance_six_man": { "recognition": "TemplateMatch", "template": "Research/84.png", + "threshold": 0.6, "green_mask": true, "post_delay": 3000, "action": "Click", @@ -1010,6 +1022,7 @@ "advance_seven_women": { "recognition": "TemplateMatch", "template": "Research/85.png", + "threshold": 0.6, "green_mask": true, "post_delay": 3000, "action": "Click", @@ -1027,6 +1040,7 @@ "advance_seven_man": { "recognition": "TemplateMatch", "template": "Research/84.png", + "threshold": 0.6, "green_mask": true, "post_delay": 3000, "action": "Click", @@ -1044,6 +1058,7 @@ "advance_eight_women": { "recognition": "TemplateMatch", "template": "Research/85.png", + "threshold": 0.6, "green_mask": true, "post_delay": 3000, "action": "Click", @@ -1061,6 +1076,7 @@ "advance_eight_man": { "recognition": "TemplateMatch", "template": "Research/84.png", + "threshold": 0.6, "green_mask": true, "post_delay": 3000, "action": "Click", @@ -1078,6 +1094,7 @@ "advance_nine_women": { "recognition": "TemplateMatch", "template": "Research/85.png", + "threshold": 0.6, "green_mask": true, "post_delay": 3000, "action": "Click", @@ -1095,6 +1112,7 @@ "advance_nine_man": { "recognition": "TemplateMatch", "template": "Research/84.png", + "threshold": 0.6, "green_mask": true, "post_delay": 3000, "action": "Click", @@ -1173,8 +1191,8 @@ ] }, "Snow": { - "recognition": "TemplateMatch", - "template": "Research/21.png", + "recognition": "OCR", + "expected": "风雪之途", "action": "Click", "roi": [ 529, @@ -1915,7 +1933,7 @@ 108 ], "action": "Click", - "post_wait_freezes": 2000, + "post_delay": 5000, "next": [ "war_five" ] @@ -1930,7 +1948,7 @@ 670, 186 ], - "post_wait_freezes": 2000, + "post_delay": 5000, "next": [ "war_five" ] @@ -1963,7 +1981,8 @@ "post_delay": 7000, "next": [ "remind_one", - "remind_all" + "remind_all", + "automatic" ] }, "remind_one": { @@ -1991,6 +2010,20 @@ "recognition": "TemplateMatch", "template": "Research/77.png", "action": "Click", + "post_delay": 5000, + "next": [ + "remind_all", + "automatic" + ] + }, + "automatic": { + "action": "Click", + "target": [ + 1235, + 160, + 0, + 0 + ], "post_delay": 3000, "next": [ "remind_all" @@ -2021,8 +2054,7 @@ 280, 120 ], - "pre_wait_freezes": 5000, - "post_wait_freezes": 3000, + "post_delay": 5000, "next": [ "upgrade_three", "descending_three", @@ -2042,8 +2074,7 @@ 0, 0 ], - "pre_wait_freezes": 5000, - "post_wait_freezes": 3000, + "post_delay": 5000, "next": [ "war_seven" ] diff --git a/assets/resource/base/pipeline/3_(5)_tea.json b/assets/resource/base/pipeline/3_(5)_tea.json index b614c69..9c0fa01 100644 --- a/assets/resource/base/pipeline/3_(5)_tea.json +++ b/assets/resource/base/pipeline/3_(5)_tea.json @@ -11,12 +11,12 @@ "recognition": "TemplateMatch", "template": "Company/d_company.png", "action": "Click", - "post_wait_freezes": 1000, + "post_delay": 5000, "next": [ - "entry_dispath_five", "tearoom", "tea_two", - "Instrument" + "Instrument", + "entry_dispath_five" ] }, "tearoom": { @@ -31,7 +31,7 @@ 295 ], "next": [ - "tea", + "tea_two", "Instrument" ] }, @@ -85,13 +85,30 @@ "recognition": "OCR", "expected": "确认", "action": "Click", - "post_delay": 15000, + "post_delay": 2000, "roi": [ 90, 520, 625, 200 ], + "next": [ + "lack", + "company_confirm_two_await" + ] + }, + "lack": { + "recognition": "OCR", + "expected": "缺少", + "action": "DoNothing", + "post_delay": 3000, + "next": [ + "tea_home" + ] + }, + "company_confirm_two_await": { + "action": "DoNothing", + "post_delay": 13000, "next": [ "company_confirm_two" ] @@ -258,6 +275,10 @@ "tea_home": { "recognition": "TemplateMatch", "template": "Startup\\10.png", - "action": "Click" + "action": "Click", + "post_delay": 5000, + "next": [ + "vitality" + ] } } \ No newline at end of file diff --git a/assets/resource/base/pipeline/9receive_reward.json b/assets/resource/base/pipeline/9receive_reward.json index 23d1035..652aee8 100644 --- a/assets/resource/base/pipeline/9receive_reward.json +++ b/assets/resource/base/pipeline/9receive_reward.json @@ -20,7 +20,7 @@ "next": [ "all1", "weekly1", - "Quti1" + "Quit1" ] }, "all1": { @@ -28,11 +28,18 @@ "expected": "全部领取", "action": "Click", "post_delay": 5000, + "roi": [ + 0, + 575, + 1280, + 150 + ], "next": [ "material1", "weekly1", - "reward1", - "Quti1" + "mission1", + "challenge", + "reward1" ] }, "material1": { @@ -40,8 +47,11 @@ "expected": "获得物资", "action": "Click", "next": [ + "all1", "weekly1", - "Quti1" + "mission1", + "reward1", + "Quit" ] }, "weekly1": { @@ -57,7 +67,7 @@ "next": [ "all1", "material1", - "Quti1" + "Quit1" ] }, "travel1": { @@ -72,8 +82,7 @@ "action": "Click", "next": [ "mission1", - "all1", - "Quti1" + "all1" ] }, "mission1": { @@ -99,8 +108,7 @@ "action": "Click", "next": [ "all1", - "reward1", - "Quti1" + "reward1" ] }, "reward1": { @@ -118,14 +126,13 @@ "Quit" ] }, - "Quti1": { + "Quit1": { "recognition": "TemplateMatch", - "template": "receive_reward/02.png", + "template": "receive_reward\\01.png", "action": "Click", + "post_delay": 2000, "next": [ - "travel1", - "mission1", - "challenge" + "travel1" ] } } \ No newline at end of file diff --git a/assets/resource_picli/base/pipeline/9receive_reward.json b/assets/resource_picli/base/pipeline/9receive_reward.json index 23d1035..652aee8 100644 --- a/assets/resource_picli/base/pipeline/9receive_reward.json +++ b/assets/resource_picli/base/pipeline/9receive_reward.json @@ -20,7 +20,7 @@ "next": [ "all1", "weekly1", - "Quti1" + "Quit1" ] }, "all1": { @@ -28,11 +28,18 @@ "expected": "全部领取", "action": "Click", "post_delay": 5000, + "roi": [ + 0, + 575, + 1280, + 150 + ], "next": [ "material1", "weekly1", - "reward1", - "Quti1" + "mission1", + "challenge", + "reward1" ] }, "material1": { @@ -40,8 +47,11 @@ "expected": "获得物资", "action": "Click", "next": [ + "all1", "weekly1", - "Quti1" + "mission1", + "reward1", + "Quit" ] }, "weekly1": { @@ -57,7 +67,7 @@ "next": [ "all1", "material1", - "Quti1" + "Quit1" ] }, "travel1": { @@ -72,8 +82,7 @@ "action": "Click", "next": [ "mission1", - "all1", - "Quti1" + "all1" ] }, "mission1": { @@ -99,8 +108,7 @@ "action": "Click", "next": [ "all1", - "reward1", - "Quti1" + "reward1" ] }, "reward1": { @@ -118,14 +126,13 @@ "Quit" ] }, - "Quti1": { + "Quit1": { "recognition": "TemplateMatch", - "template": "receive_reward/02.png", + "template": "receive_reward\\01.png", "action": "Click", + "post_delay": 2000, "next": [ - "travel1", - "mission1", - "challenge" + "travel1" ] } } \ No newline at end of file