From 20632ddb8d14890d6cfbf4e13ed2520fedbe3ec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E5=BF=A7=E6=97=A0=E8=99=91=E5=95=A6?= <3176706900@qq.com> Date: Mon, 12 Aug 2024 00:33:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=8D=E4=BD=8E"=E5=8D=9A=E7=89=A9=E7=A0=94?= =?UTF-8?q?=E5=AD=A6=E8=AF=86=E5=88=AB=E9=98=88=E5=80=BC"=EF=BC=8C?= =?UTF-8?q?=E8=A1=A5=E5=85=85"=E5=96=9D=E8=8C=B6"=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/pipeline/11_(02)_snowscape.json | 46 +++++++++++++------ .../base/pipeline/3_(5)_tea.json | 19 +++++++- 2 files changed, 49 insertions(+), 16 deletions(-) diff --git a/assets/resource_picli/base/pipeline/11_(02)_snowscape.json b/assets/resource_picli/base/pipeline/11_(02)_snowscape.json index 7640a2d..c94dd73 100644 --- a/assets/resource_picli/base/pipeline/11_(02)_snowscape.json +++ b/assets/resource_picli/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" ] @@ -2036,8 +2054,7 @@ 280, 120 ], - "pre_wait_freezes": 5000, - "post_wait_freezes": 3000, + "post_delay": 5000, "next": [ "upgrade_three", "descending_three", @@ -2057,8 +2074,7 @@ 0, 0 ], - "pre_wait_freezes": 5000, - "post_wait_freezes": 3000, + "post_delay": 5000, "next": [ "war_seven" ] diff --git a/assets/resource_picli/base/pipeline/3_(5)_tea.json b/assets/resource_picli/base/pipeline/3_(5)_tea.json index c04d27f..9c0fa01 100644 --- a/assets/resource_picli/base/pipeline/3_(5)_tea.json +++ b/assets/resource_picli/base/pipeline/3_(5)_tea.json @@ -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" ]