From 4e06a4d890d5c00427bab74da4d4d993c3344b54 Mon Sep 17 00:00:00 2001 From: mmwuyou <3176706900@qq.com> Date: Tue, 1 Oct 2024 22:36:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0"=E5=A5=BD=E5=8F=8B=E7=82=B9?= =?UTF-8?q?=E8=B5=9E=E5=8F=8A=E5=85=B6=E9=A2=86=E5=8F=96"=EF=BC=8Cmwa?= =?UTF-8?q?=E6=A1=86=E6=9E=B6=E6=9B=B4=E6=96=B0=E5=88=B02.0.2=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/config/maa_pi_config.json | 7 +- assets/interface.json | 186 ++++---- .../base/pipeline/11_(02)_snowscape.json | 2 +- assets/resource/base/pipeline/1_startup.json | 2 +- .../resource_picli/base/image/Company/30.png | Bin 0 -> 3701 bytes assets/resource_picli/base/image/visit/01.png | Bin 0 -> 4273 bytes .../base/pipeline/11_(02)_snowscape.json | 2 +- .../base/pipeline/14_activity.json | 2 +- .../base/pipeline/15_visit.json | 408 ++++++++++++++++++ .../base/pipeline/1_startup.json | 2 +- .../base/pipeline/3_(6)_vitality.json | 34 ++ 11 files changed, 552 insertions(+), 93 deletions(-) create mode 100644 assets/resource_picli/base/image/Company/30.png create mode 100644 assets/resource_picli/base/image/visit/01.png create mode 100644 assets/resource_picli/base/pipeline/15_visit.json diff --git a/assets/config/maa_pi_config.json b/assets/config/maa_pi_config.json index 7fb9145..7eae85d 100644 --- a/assets/config/maa_pi_config.json +++ b/assets/config/maa_pi_config.json @@ -4,5 +4,10 @@ "type": "Adb" }, "resource": "B 服", - "task": [] + "task": [ + { + "name": "启动", + "option": [] + } + ] } \ No newline at end of file diff --git a/assets/interface.json b/assets/interface.json index 206b7e8..f92a091 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -67,8 +67,8 @@ "name": "演训", "entry": "kaishi", "option": [ - "选择关卡", - "打哪个", + "选择关卡-演训", + "打哪个-演训", "打几次" ] }, @@ -76,8 +76,8 @@ "name": "资源", "entry": "resource_all", "option": [ - "选择关卡", - "打哪个", + "选择关卡-资源", + "打哪个-资源", "打几次" ] }, @@ -107,110 +107,118 @@ { "name": "活动签到", "entry": "activity_attendance" + }, + { + "name": "给好友点赞(目前默认就前4个)", + "entry": "visit" } ], "option": { - "选择关卡": { + "选择关卡-演训": { "cases": [ { - "name": "冬谷币(演训用)", - "param": { + "name": "冬谷币", + "pipeline_override": { "StartTraining": { "next": "Cash" } } }, { - "name": "教材(演训用)", - "param": { + "name": "教材", + "pipeline_override": { "StartTraining": { "next": "Experience" } } }, { - "name": "装备(演训用)", - "param": { + "name": "装备", + "pipeline_override": { "StartTraining": { "next": "Weapon" } } }, { - "name": "宿卫(演训用)", - "param": { + "name": "宿卫", + "pipeline_override": { "StartTraining": { "next": "Defender" } } }, { - "name": "构术(演训用)", - "param": { + "name": "构术", + "pipeline_override": { "StartTraining": { "next": "Caster" } } }, { - "name": "远击(演训用)", - "param": { + "name": "远击", + "pipeline_override": { "StartTraining": { "next": "Ranger" } } }, { - "name": "轻锐(演训用)", - "param": { + "name": "轻锐", + "pipeline_override": { "StartTraining": { "next": "LightMelee" } } }, { - "name": "战略(演训用)", - "param": { + "name": "战略", + "pipeline_override": { "StartTraining": { "next": "Tactical" } } - }, + } + ] + }, + "选择关卡-资源": { + "cases": [ { - "name": "第一章(资源用)", - "param": { + "name": "第一章", + "pipeline_override": { "resource_all": { "next": "resource_one" } } }, { - "name": "第二章(资源用)", - "param": { + "name": "第二章", + "pipeline_override": { "resource_all": { "next": "resource_two" } } }, { - "name": "第三章(资源用)", - "param": { + "name": "第三章", + "pipeline_override": { "resource_all": { "next": "resource_three" } } }, { - "name": "第四章(资源用)", - "param": { + "name": "第四章", + "pipeline_override": { "resource_all": { "next": "resource_four" } } }, { - "name": "第五章(资源用)", - "param": { + "name": "第五章", + "pipeline_override": { "resource_all": { "next": "resource_five" } @@ -218,11 +226,11 @@ } ] }, - "打哪个": { + "打哪个-演训": { "cases": [ { "name": "第一关(子)(演训用)", - "param": { + "pipeline_override": { "xuanze": { "next": "SelectStage01" } @@ -230,7 +238,7 @@ }, { "name": "第二关(丑)(演训用)", - "param": { + "pipeline_override": { "xuanze": { "next": "SelectStage02" } @@ -238,7 +246,7 @@ }, { "name": "第三关(寅)(演训用)", - "param": { + "pipeline_override": { "xuanze": { "next": "SelectStage03" } @@ -246,7 +254,7 @@ }, { "name": "第四关(卯)(演训用)", - "param": { + "pipeline_override": { "xuanze": { "next": "SelectStage04" } @@ -254,15 +262,19 @@ }, { "name": "第五关(辰)(演训用)", - "param": { + "pipeline_override": { "xuanze": { "next": "SelectStage05" } } - }, + } + ] + }, + "打哪个-资源": { + "cases": [ { "name": "第一关(壹)(资源用)", - "param": { + "pipeline_override": { "resource": { "next": "ancient_both_sea_cantonese_often1" } @@ -270,7 +282,7 @@ }, { "name": "第二关(贰)(资源用)", - "param": { + "pipeline_override": { "resource": { "next": "ancient_both_sea_cantonese_often2" } @@ -278,7 +290,7 @@ }, { "name": "第三关(叁)(资源用)", - "param": { + "pipeline_override": { "resource": { "next": "ancient_both_sea_cantonese_often3" } @@ -286,7 +298,7 @@ }, { "name": "第四关(肆)(资源用)", - "param": { + "pipeline_override": { "resource": { "next": "ancient_both_sea_cantonese_often4" } @@ -294,7 +306,7 @@ }, { "name": "第五关(伍)(资源用)", - "param": { + "pipeline_override": { "resource": { "next": "ancient_both_sea_cantonese_often5" } @@ -306,7 +318,7 @@ "cases": [ { "name": "打一次(速通没解锁专用)", - "param": { + "pipeline_override": { "fast": { "next": "Start1" } @@ -314,7 +326,7 @@ }, { "name": "打一次(速通解锁专用)", - "param": { + "pipeline_override": { "fast": { "next": "Speedrun1x" } @@ -322,7 +334,7 @@ }, { "name": "打两次(速通解锁专用)", - "param": { + "pipeline_override": { "fast": { "next": "Speedrun2x" } @@ -330,7 +342,7 @@ }, { "name": "打四次(速通解锁专用)", - "param": { + "pipeline_override": { "fast": { "next": "Speedrun4x" } @@ -338,7 +350,7 @@ }, { "name": "打十次(速通解锁专用)", - "param": { + "pipeline_override": { "fast": { "next": "Speedrun10x" } @@ -346,7 +358,7 @@ }, { "name": "全部体力(速通解锁专用)", - "param": { + "pipeline_override": { "fast": { "next": "allin" } @@ -358,7 +370,7 @@ "cases": [ { "name": "领取奖励", - "param": { + "pipeline_override": { "entry_one": { "next": "entry_dispath_one" } @@ -366,7 +378,7 @@ }, { "name": "不领取", - "param": { + "pipeline_override": { "entry_one": { "next": [ "entry_back", @@ -381,7 +393,7 @@ "cases": [ { "name": "初级社会指南", - "param": { + "pipeline_override": { "entry_dispath_three": { "next": "dispatch_social_one" } @@ -389,7 +401,7 @@ }, { "name": "中级社会指南", - "param": { + "pipeline_override": { "entry_dispath_three": { "next": "dispatch_social_two" } @@ -397,7 +409,7 @@ }, { "name": "高级社会指南", - "param": { + "pipeline_override": { "entry_dispath_three": { "next": "dispatch_social_three" } @@ -405,7 +417,7 @@ }, { "name": "进阶社会指南", - "param": { + "pipeline_override": { "entry_dispath_three": { "next": "dispatch_social_four" } @@ -413,7 +425,7 @@ }, { "name": "不领取", - "param": { + "pipeline_override": { "entry_dispath_three": { "next": [ "dispath_back", @@ -428,7 +440,7 @@ "cases": [ { "name": "蓝色装备", - "param": { + "pipeline_override": { "entry_dispath_four": { "next": "fabricate_all_one" } @@ -436,7 +448,7 @@ }, { "name": "铜石墨条(蓝装升级)", - "param": { + "pipeline_override": { "entry_dispath_four": { "next": "fabricate_all_two" } @@ -444,7 +456,7 @@ }, { "name": "银石墨条(黄装升级)", - "param": { + "pipeline_override": { "entry_dispath_four": { "next": "fabricate_all_three" } @@ -452,7 +464,7 @@ }, { "name": "100装备经验", - "param": { + "pipeline_override": { "entry_dispath_four": { "next": "fabricate_all_four" } @@ -460,7 +472,7 @@ }, { "name": "1型钢材", - "param": { + "pipeline_override": { "entry_dispath_four": { "next": "fabricate_all_five" } @@ -468,7 +480,7 @@ }, { "name": "资质证明1", - "param": { + "pipeline_override": { "entry_dispath_four": { "next": "fabricate_all_six" } @@ -476,7 +488,7 @@ }, { "name": "资质证明2", - "param": { + "pipeline_override": { "entry_dispath_four": { "next": "fabricate_all_seven" } @@ -484,7 +496,7 @@ }, { "name": "高级制造申请", - "param": { + "pipeline_override": { "entry_dispath_four": { "next": "fabricate_all_eight" } @@ -492,7 +504,7 @@ }, { "name": "2型钢材", - "param": { + "pipeline_override": { "entry_dispath_four": { "next": "fabricate_all_nine" } @@ -500,7 +512,7 @@ }, { "name": "资质证明3", - "param": { + "pipeline_override": { "entry_dispath_four": { "next": "fabricate_all_ten" } @@ -508,7 +520,7 @@ }, { "name": "不制造", - "param": { + "pipeline_override": { "entry_dispath_four": { "next": [ "fabricate_back", @@ -523,7 +535,7 @@ "cases": [ { "name": "喝茶", - "param": { + "pipeline_override": { "tea": { "next": "entry_dispath_five" } @@ -531,7 +543,7 @@ }, { "name": "不喝茶", - "param": { + "pipeline_override": { "tea": { "next": [ "tea_back", @@ -546,7 +558,7 @@ "cases": [ { "name": "领取", - "param": { + "pipeline_override": { "vitality": { "next": "entry_dispath_six" } @@ -554,7 +566,7 @@ }, { "name": "不领取", - "param": { + "pipeline_override": { "vitality": { "next": [ "vitality_back", @@ -569,7 +581,7 @@ "cases": [ { "name": "和合·椅", - "param": { + "pipeline_override": { "combine-choose": { "next": "combine-chair" } @@ -577,7 +589,7 @@ }, { "name": "和合·朝代", - "param": { + "pipeline_override": { "combine-choose": { "next": "combine-dynasty" } @@ -585,7 +597,7 @@ }, { "name": "和合·船", - "param": { + "pipeline_override": { "combine-choose": { "next": "combine-ship" } @@ -597,7 +609,7 @@ "cases": [ { "name": "山水纪行", - "param": { + "pipeline_override": { "choose_theme": { "next": "mountain-river" } @@ -605,7 +617,7 @@ }, { "name": "金银纪行", - "param": { + "pipeline_override": { "choose_theme": { "next": "gold-silver" } @@ -617,7 +629,7 @@ "cases": [ { "name": "雪景寒林图", - "param": { + "pipeline_override": { "mountain_Research": { "next": "snowscape" } @@ -625,7 +637,7 @@ }, { "name": "千里江山图 (暂无)", - "param": { + "pipeline_override": { "mountain_Research": { "next": "landscape" } @@ -633,7 +645,7 @@ }, { "name": "溪山旅行图 (暂无)", - "param": { + "pipeline_override": { "mountain_Research": { "next": "journey" } @@ -645,7 +657,7 @@ "cases": [ { "name": "炽级", - "param": { + "pipeline_override": { "select_tier": { "next": "red" } @@ -653,7 +665,7 @@ }, { "name": "耀级", - "param": { + "pipeline_override": { "select_tier": { "next": "yellow" } @@ -661,7 +673,7 @@ }, { "name": "凌级", - "param": { + "pipeline_override": { "select_tier": { "next": "blue" } @@ -673,7 +685,7 @@ "cases": [ { "name": "征集1个", - "param": { + "pipeline_override": { "add-all": { "next": "add-one" } @@ -681,7 +693,7 @@ }, { "name": "征集2个", - "param": { + "pipeline_override": { "add-all": { "next": "add-two" } @@ -689,7 +701,7 @@ }, { "name": "征集3个", - "param": { + "pipeline_override": { "add-all": { "next": "add-three" } @@ -697,7 +709,7 @@ }, { "name": "征集4个", - "param": { + "pipeline_override": { "add-all": { "next": "add-four" } diff --git a/assets/resource/base/pipeline/11_(02)_snowscape.json b/assets/resource/base/pipeline/11_(02)_snowscape.json index 7633657..146aa3d 100644 --- a/assets/resource/base/pipeline/11_(02)_snowscape.json +++ b/assets/resource/base/pipeline/11_(02)_snowscape.json @@ -2035,7 +2035,7 @@ "expected": "代班", "post_delay": 30000, "timeout": 150000, - "timeout_next": [ + "on_error": [ "fail", "war_seven" ], diff --git a/assets/resource/base/pipeline/1_startup.json b/assets/resource/base/pipeline/1_startup.json index 5b212be..dae9fba 100644 --- a/assets/resource/base/pipeline/1_startup.json +++ b/assets/resource/base/pipeline/1_startup.json @@ -29,7 +29,7 @@ "action": "Click", "post_delay": 10000, "timeout": 20000, - "timeout_next": [ + "on_error": [ "update", "CloseAnnouncement" ], diff --git a/assets/resource_picli/base/image/Company/30.png b/assets/resource_picli/base/image/Company/30.png new file mode 100644 index 0000000000000000000000000000000000000000..b438a0f0564f27705975ca0501f099c59c548d3d GIT binary patch literal 3701 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 TYW#pM00000NkvXXu0mjf)manf literal 0 HcmV?d00001 diff --git a/assets/resource_picli/base/image/visit/01.png b/assets/resource_picli/base/image/visit/01.png new file mode 100644 index 0000000000000000000000000000000000000000..27cda32d9f508ad54cb606d5dd4c4b3932809cf5 GIT binary patch literal 4273 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 literal 0 HcmV?d00001 diff --git a/assets/resource_picli/base/pipeline/11_(02)_snowscape.json b/assets/resource_picli/base/pipeline/11_(02)_snowscape.json index 3901bac..3f4af7f 100644 --- a/assets/resource_picli/base/pipeline/11_(02)_snowscape.json +++ b/assets/resource_picli/base/pipeline/11_(02)_snowscape.json @@ -2078,7 +2078,7 @@ "expected": "代班", "post_delay": 30000, "timeout": 150000, - "timeout_next": [ + "on_error": [ "fail", "war_seven" ], diff --git a/assets/resource_picli/base/pipeline/14_activity.json b/assets/resource_picli/base/pipeline/14_activity.json index 8a981ea..f04e699 100644 --- a/assets/resource_picli/base/pipeline/14_activity.json +++ b/assets/resource_picli/base/pipeline/14_activity.json @@ -485,7 +485,7 @@ "action": "DoNothing", "post_delay": 97000, "timeout": 20000, - "timeout_next": [ + "on_error": [ "activity-bazaar-two" ], "next": [ diff --git a/assets/resource_picli/base/pipeline/15_visit.json b/assets/resource_picli/base/pipeline/15_visit.json new file mode 100644 index 0000000..da42165 --- /dev/null +++ b/assets/resource_picli/base/pipeline/15_visit.json @@ -0,0 +1,408 @@ +{ + "visit": { + "next": [ + "visit-contact", + "visit-friends-all-one", + "visit-friends-one", + "visit-quit-one" + ] + }, + "visit-contact": { + "recognition": "OCR", + "expected": "联系人", + "action": "Click", + "post_delay": 1500, + "roi": [ + 150, + 600, + 110, + 115 + ], + "next": [ + "visit-friends-all-one" + ] + }, + "visit-friends-all-one": { + "recognition": "OCR", + "expected": "好友", + "action": "Click", + "post_delay": 1500, + "roi": [ + 30, + 185, + 260, + 200 + ], + "next": [ + "visit-friends-one" + ] + }, + "visit-friends-one": { + "action": "Click", + "post_delay": 750, + "target": [ + 105, + 365, + 0, + 0 + ], + "next": [ + "visit-one", + "visit-friends-one" + ] + }, + "visit-one": { + "recognition": "OCR", + "expected": "拜访", + "action": "Click", + "post_delay": 7000, + "target_offset": [ + 0, + -30, + 0, + 0 + ], + "roi": [ + 280, + 460, + 75, + 60 + ], + "next": [ + "visit-Thumbs-up-one" + ] + }, + "visit-Thumbs-up-one": { + "recognition": "TemplateMatch", + "template": "visit\\01.png", + "action": "Click", + "post_delay": 2000, + "roi": [ + 260, + 610, + 110, + 110 + ], + "next": [ + "visit-get-one", + "visit-on-get-one" + ] + }, + "visit-get-one": { + "recognition": "OCR", + "expected": "得", + "action": "Click", + "post_delay": 2000, + "next": [ + "visit-get-one", + "visit-quit-one" + ] + }, + "visit-on-get-one": { + "recognition": "OCR", + "expected": "本周", + "action": "DoNothing", + "post_delay": 2000, + "next": [ + "visit-quit-one" + ] + }, + "visit-quit-one": { + "recognition": "TemplateMatch", + "template": "Collect\\06.png", + "action": "Click", + "post_delay": 7000, + "next": [ + "visit-friends-all-two" + ] + }, + "visit-friends-all-two": { + "recognition": "OCR", + "expected": "好友", + "action": "Click", + "post_delay": 1500, + "roi": [ + 30, + 185, + 260, + 200 + ], + "next": [ + "visit-friends-two" + ] + }, + "visit-friends-two": { + "action": "Click", + "post_delay": 750, + "target": [ + 105, + 450, + 0, + 0 + ], + "next": [ + "visit-two", + "visit-quit", + "visit-friends-two" + ] + }, + "visit-two": { + "recognition": "OCR", + "expected": "拜访", + "action": "Click", + "post_delay": 7000, + "target_offset": [ + 0, + -30, + 0, + 0 + ], + "roi": [ + 280, + 500, + 80, + 80 + ], + "next": [ + "visit-Thumbs-up-two" + ] + }, + "visit-Thumbs-up-two": { + "recognition": "TemplateMatch", + "template": "visit\\01.png", + "action": "Click", + "post_delay": 2000, + "roi": [ + 260, + 610, + 110, + 110 + ], + "next": [ + "visit-get-two", + "visit-on-get-two" + ] + }, + "visit-get-two": { + "recognition": "OCR", + "expected": "得", + "action": "Click", + "post_delay": 2000, + "next": [ + "visit-get-two", + "visit-quit-two" + ] + }, + "visit-on-get-two": { + "recognition": "OCR", + "expected": "本周", + "action": "DoNothing", + "post_delay": 2000, + "next": [ + "visit-quit-two" + ] + }, + "visit-quit-two": { + "recognition": "TemplateMatch", + "template": "Collect\\06.png", + "action": "Click", + "post_delay": 7000, + "next": [ + "visit-friends-all-three" + ] + }, + "visit-friends-all-three": { + "recognition": "OCR", + "expected": "好友", + "action": "Click", + "post_delay": 1500, + "roi": [ + 30, + 185, + 260, + 200 + ], + "next": [ + "visit-friends-three" + ] + }, + "visit-friends-three": { + "action": "Click", + "post_delay": 750, + "target": [ + 105, + 535, + 0, + 0 + ], + "next": [ + "visit-three", + "visit-quit", + "visit-friends-three" + ] + }, + "visit-three": { + "recognition": "OCR", + "expected": "拜访", + "action": "Click", + "post_delay": 7000, + "target_offset": [ + 0, + -30, + 0, + 0 + ], + "roi": [ + 280, + 600, + 75, + 60 + ], + "next": [ + "visit-Thumbs-up-three" + ] + }, + "visit-Thumbs-up-three": { + "recognition": "TemplateMatch", + "template": "visit\\01.png", + "action": "Click", + "post_delay": 2000, + "roi": [ + 260, + 610, + 110, + 110 + ], + "next": [ + "visit-get-three", + "visit-on-get-three" + ] + }, + "visit-get-three": { + "recognition": "OCR", + "expected": "得", + "action": "Click", + "post_delay": 2000, + "next": [ + "visit-get-three", + "visit-quit-three" + ] + }, + "visit-on-get-three": { + "recognition": "OCR", + "expected": "本周", + "action": "DoNothing", + "post_delay": 2000, + "next": [ + "visit-quit-three" + ] + }, + "visit-quit-three": { + "recognition": "TemplateMatch", + "template": "Collect\\06.png", + "action": "Click", + "post_delay": 7000, + "next": [ + "visit-friends-all-four" + ] + }, + "visit-friends-all-four": { + "recognition": "OCR", + "expected": "好友", + "action": "Click", + "post_delay": 1500, + "roi": [ + 30, + 185, + 260, + 200 + ], + "next": [ + "visit-friends-four" + ] + }, + "visit-friends-four": { + "action": "Click", + "post_delay": 750, + "target": [ + 105, + 620, + 0, + 0 + ], + "next": [ + "visit-four", + "visit-friends-four" + ] + }, + "visit-four": { + "action": "Click", + "post_delay": 7000, + "target": [ + 318, + 708, + 0, + 0 + ], + "roi": [ + 280, + 460, + 75, + 60 + ], + "next": [ + "visit-Thumbs-up-four", + "visit-quit" + ] + }, + "visit-Thumbs-up-four": { + "recognition": "TemplateMatch", + "template": "visit\\01.png", + "action": "Click", + "post_delay": 2000, + "roi": [ + 260, + 610, + 110, + 110 + ], + "next": [ + "visit-get-four", + "visit-on-get-four" + ] + }, + "visit-get-four": { + "recognition": "OCR", + "expected": "得", + "action": "Click", + "post_delay": 2000, + "next": [ + "visit-get-four", + "visit-quit-four" + ] + }, + "visit-on-get-four": { + "recognition": "OCR", + "expected": "本周", + "action": "DoNothing", + "post_delay": 2000, + "next": [ + "visit-quit-four" + ] + }, + "visit-quit-four": { + "recognition": "TemplateMatch", + "template": "Collect\\06.png", + "action": "Click", + "post_delay": 7000, + "next": [ + "visit-quit" + ] + }, + "visit-quit": { + "recognition": "TemplateMatch", + "template": "Collect\\06.png", + "action": "Click", + "post_delay": 2000 + } +} \ No newline at end of file diff --git a/assets/resource_picli/base/pipeline/1_startup.json b/assets/resource_picli/base/pipeline/1_startup.json index c67757b..943e131 100644 --- a/assets/resource_picli/base/pipeline/1_startup.json +++ b/assets/resource_picli/base/pipeline/1_startup.json @@ -29,7 +29,7 @@ "action": "Click", "post_delay": 10000, "timeout": 20000, - "timeout_next": [ + "on_error": [ "update", "CloseAnnouncement" ], diff --git a/assets/resource_picli/base/pipeline/3_(6)_vitality.json b/assets/resource_picli/base/pipeline/3_(6)_vitality.json index 08e4320..ec0ae82 100644 --- a/assets/resource_picli/base/pipeline/3_(6)_vitality.json +++ b/assets/resource_picli/base/pipeline/3_(6)_vitality.json @@ -45,10 +45,43 @@ "post_delay": 5000, "next": [ "vitality_three", + "vitality-visitor", "vitality_home", "vitality_two" ] }, + "vitality-visitor": { + "recognition": "OCR", + "expected": "访客", + "action": "Click", + "post_delay": 5000, + "next": [ + "vitality-get", + "vitality-visitor-quit", + "vitality-visitor" + ] + }, + "vitality-get": { + "recognition": "OCR", + "expected": "得", + "action": "Click", + "post_delay": 3000, + "next": [ + "vitality-get", + "vitality-visitor-quit" + ] + }, + "vitality-visitor-quit": { + "recognition": "TemplateMatch", + "template": "Company\\30.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "vitality-visitor-quit", + "vitality_home", + "vitality_back" + ] + }, "vitality_three": { "recognition": "OCR", "expected": "只能", @@ -64,6 +97,7 @@ "action": "Click", "post_delay": 2000, "next": [ + "vitality-visitor", "vitality_home" ] },