diff --git a/.gitignore b/.gitignore index 87aaf0b..13eecbb 100644 --- a/.gitignore +++ b/.gitignore @@ -454,3 +454,7 @@ debug # MWA MWA .nicegui + +# ai +.agents +.codex \ No newline at end of file diff --git a/assets/interface.json b/assets/interface.json index e975309..73ae585 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -89,6 +89,22 @@ "name": "邮箱", "entry": "Mail" }, + { + "name": "外勤", + "entry": "waiqin" + }, + { + "name": "行会", + "entry": "xinghui" + }, + { + "name": "活动打关", + "entry": "activity_fit" + }, + { + "name": "每周研学", + "entry": "weekly_to_do" + }, { "name": "博物研学", "entry": "museum_Research", @@ -423,6 +439,17 @@ }, "社教模拟仪": { "cases": [ + { + "name": "不领取", + "pipeline_override": { + "entry_dispath_three": { + "next": [ + "dispath_back", + "dispath_convened" + ] + } + } + }, { "name": "初级社会指南", "pipeline_override": { @@ -454,22 +481,22 @@ "next": "dispatch_social_four" } } - }, + } + ] + }, + "制造物品": { + "cases": [ { - "name": "不领取", + "name": "不制造", "pipeline_override": { - "entry_dispath_three": { + "entry_dispath_four": { "next": [ - "dispath_back", - "dispath_convened" + "fabricate_back", + "fabricate_convened" ] } } - } - ] - }, - "制造物品": { - "cases": [ + }, { "name": "蓝色装备", "pipeline_override": { @@ -549,38 +576,27 @@ "next": "fabricate_all_ten" } } - }, - { - "name": "不制造", - "pipeline_override": { - "entry_dispath_four": { - "next": [ - "fabricate_back", - "fabricate_convened" - ] - } - } } ] }, "是否喝茶": { "cases": [ { - "name": "喝茶", + "name": "不喝茶", "pipeline_override": { "tea": { - "next": "entry_dispath_five" + "next": [ + "tea_back", + "tea_convened" + ] } } }, { - "name": "不喝茶", + "name": "喝茶", "pipeline_override": { "tea": { - "next": [ - "tea_back", - "tea_convened" - ] + "next": "entry_dispath_five" } } } @@ -589,21 +605,21 @@ "是否领取活力值": { "cases": [ { - "name": "领取", + "name": "不领取", "pipeline_override": { "vitality": { - "next": "entry_dispath_six" + "next": [ + "vitality_back", + "vitality-convened" + ] } } }, { - "name": "不领取", + "name": "领取", "pipeline_override": { "vitality": { - "next": [ - "vitality_back", - "vitality-convened" - ] + "next": "entry_dispath_six" } } } @@ -712,7 +728,6 @@ "gold_research": { "next": [ "choose_boss", - "sub_choose_boss", "action_1" ] } @@ -751,34 +766,34 @@ "征集几个": { "cases": [ { - "name": "征集1个", + "name": "征集4个", "pipeline_override": { "Collect-add-all": { - "next": "Collect-add-one" + "next": "Collect-add-four" } } }, { - "name": "征集2个", + "name": "征集1个", "pipeline_override": { "Collect-add-all": { - "next": "Collect-add-two" + "next": "Collect-add-one" } } }, { - "name": "征集3个", + "name": "征集2个", "pipeline_override": { "Collect-add-all": { - "next": "Collect-add-three" + "next": "Collect-add-two" } } }, { - "name": "征集4个", + "name": "征集3个", "pipeline_override": { "Collect-add-all": { - "next": "Collect-add-four" + "next": "Collect-add-three" } } } diff --git a/assets/resource_picli/base/image/Collect/07.png b/assets/resource_picli/base/image/Collect/07.png new file mode 100644 index 0000000..2b9e86f Binary files /dev/null and b/assets/resource_picli/base/image/Collect/07.png differ diff --git a/assets/resource_picli/base/image/Mainpage/hanghui.png b/assets/resource_picli/base/image/Mainpage/hanghui.png new file mode 100644 index 0000000..5ea9c69 Binary files /dev/null and b/assets/resource_picli/base/image/Mainpage/hanghui.png differ diff --git a/assets/resource_picli/base/image/Mainpage/mail2.png b/assets/resource_picli/base/image/Mainpage/mail2.png new file mode 100644 index 0000000..de3786c Binary files /dev/null and b/assets/resource_picli/base/image/Mainpage/mail2.png differ diff --git a/assets/resource_picli/base/image/Research2/arest.png b/assets/resource_picli/base/image/Research2/arest.png new file mode 100644 index 0000000..6656227 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/arest.png differ diff --git a/assets/resource_picli/base/image/Research2/end.png b/assets/resource_picli/base/image/Research2/end.png new file mode 100644 index 0000000..7855a5a Binary files /dev/null and b/assets/resource_picli/base/image/Research2/end.png differ diff --git a/assets/resource_picli/base/image/Research2/fangqi.png b/assets/resource_picli/base/image/Research2/fangqi.png new file mode 100644 index 0000000..95c6e4e Binary files /dev/null and b/assets/resource_picli/base/image/Research2/fangqi.png differ diff --git a/assets/resource_picli/base/image/Research2/fight_2.png b/assets/resource_picli/base/image/Research2/fight_2.png index 772dcff..20cf3e5 100644 Binary files a/assets/resource_picli/base/image/Research2/fight_2.png and b/assets/resource_picli/base/image/Research2/fight_2.png differ diff --git a/assets/resource_picli/base/image/Research2/jiaohuan.png b/assets/resource_picli/base/image/Research2/jiaohuan.png new file mode 100644 index 0000000..04598a8 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/jiaohuan.png differ diff --git a/assets/resource_picli/base/image/Research2/kaishi.png b/assets/resource_picli/base/image/Research2/kaishi.png new file mode 100644 index 0000000..1821792 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/kaishi.png differ diff --git a/assets/resource_picli/base/image/Research2/kaishizhan.png b/assets/resource_picli/base/image/Research2/kaishizhan.png new file mode 100644 index 0000000..f77c4f1 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/kaishizhan.png differ diff --git a/assets/resource_picli/base/image/Research2/node1.png b/assets/resource_picli/base/image/Research2/node1.png new file mode 100644 index 0000000..e57ec2b Binary files /dev/null and b/assets/resource_picli/base/image/Research2/node1.png differ diff --git a/assets/resource_picli/base/image/Research2/node2.png b/assets/resource_picli/base/image/Research2/node2.png new file mode 100644 index 0000000..e96fbcf Binary files /dev/null and b/assets/resource_picli/base/image/Research2/node2.png differ diff --git a/assets/resource_picli/base/image/Research2/node3.png b/assets/resource_picli/base/image/Research2/node3.png new file mode 100644 index 0000000..07453d1 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/node3.png differ diff --git a/assets/resource_picli/base/image/Research2/node4.png b/assets/resource_picli/base/image/Research2/node4.png new file mode 100644 index 0000000..6d54f1f Binary files /dev/null and b/assets/resource_picli/base/image/Research2/node4.png differ diff --git a/assets/resource_picli/base/image/Research2/node5.png b/assets/resource_picli/base/image/Research2/node5.png new file mode 100644 index 0000000..8fdd9ed Binary files /dev/null and b/assets/resource_picli/base/image/Research2/node5.png differ diff --git a/assets/resource_picli/base/image/Research2/ok.png b/assets/resource_picli/base/image/Research2/ok.png new file mode 100644 index 0000000..e2c5882 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/ok.png differ diff --git a/assets/resource_picli/base/image/Research2/qren.png b/assets/resource_picli/base/image/Research2/qren.png new file mode 100644 index 0000000..354ac6a Binary files /dev/null and b/assets/resource_picli/base/image/Research2/qren.png differ diff --git a/assets/resource_picli/base/image/Research2/quedin.png b/assets/resource_picli/base/image/Research2/quedin.png new file mode 100644 index 0000000..40c96cc Binary files /dev/null and b/assets/resource_picli/base/image/Research2/quedin.png differ diff --git a/assets/resource_picli/base/image/Research2/scj.png b/assets/resource_picli/base/image/Research2/scj.png new file mode 100644 index 0000000..45a66cd Binary files /dev/null and b/assets/resource_picli/base/image/Research2/scj.png differ diff --git a/assets/resource_picli/base/image/Research2/zhandou.png b/assets/resource_picli/base/image/Research2/zhandou.png new file mode 100644 index 0000000..0ca0ce4 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/zhandou.png differ diff --git a/assets/resource_picli/base/image/activity/X.png b/assets/resource_picli/base/image/activity/X.png new file mode 100644 index 0000000..4923876 Binary files /dev/null and b/assets/resource_picli/base/image/activity/X.png differ diff --git a/assets/resource_picli/base/image/activity/cmwl.png b/assets/resource_picli/base/image/activity/cmwl.png new file mode 100644 index 0000000..ea1ce8c Binary files /dev/null and b/assets/resource_picli/base/image/activity/cmwl.png differ diff --git a/assets/resource_picli/base/image/activity/dz05.png b/assets/resource_picli/base/image/activity/dz05.png new file mode 100644 index 0000000..440d537 Binary files /dev/null and b/assets/resource_picli/base/image/activity/dz05.png differ diff --git a/assets/resource_picli/base/image/activity/ft09.png b/assets/resource_picli/base/image/activity/ft09.png new file mode 100644 index 0000000..f9354cf Binary files /dev/null and b/assets/resource_picli/base/image/activity/ft09.png differ diff --git a/assets/resource_picli/base/image/activity/fx09.png b/assets/resource_picli/base/image/activity/fx09.png new file mode 100644 index 0000000..7f18144 Binary files /dev/null and b/assets/resource_picli/base/image/activity/fx09.png differ diff --git a/assets/resource_picli/base/image/activity/jhft.png b/assets/resource_picli/base/image/activity/jhft.png new file mode 100644 index 0000000..110b21e Binary files /dev/null and b/assets/resource_picli/base/image/activity/jhft.png differ diff --git a/assets/resource_picli/base/image/activity/jycs.png b/assets/resource_picli/base/image/activity/jycs.png new file mode 100644 index 0000000..9c21391 Binary files /dev/null and b/assets/resource_picli/base/image/activity/jycs.png differ diff --git a/assets/resource_picli/base/image/activity/no_auto.png b/assets/resource_picli/base/image/activity/no_auto.png new file mode 100644 index 0000000..8cdd96d Binary files /dev/null and b/assets/resource_picli/base/image/activity/no_auto.png differ diff --git a/assets/resource_picli/base/image/activity/shla.png b/assets/resource_picli/base/image/activity/shla.png new file mode 100644 index 0000000..16de1a0 Binary files /dev/null and b/assets/resource_picli/base/image/activity/shla.png differ diff --git a/assets/resource_picli/base/image/activity/wanchen.png b/assets/resource_picli/base/image/activity/wanchen.png new file mode 100644 index 0000000..9e2a103 Binary files /dev/null and b/assets/resource_picli/base/image/activity/wanchen.png differ diff --git a/assets/resource_picli/base/image/activity/wjwy.png b/assets/resource_picli/base/image/activity/wjwy.png new file mode 100644 index 0000000..a748214 Binary files /dev/null and b/assets/resource_picli/base/image/activity/wjwy.png differ diff --git a/assets/resource_picli/base/image/activity/zswz.png b/assets/resource_picli/base/image/activity/zswz.png new file mode 100644 index 0000000..8777e7a Binary files /dev/null and b/assets/resource_picli/base/image/activity/zswz.png differ diff --git a/assets/resource_picli/base/image/maa-image-1786615793580.png b/assets/resource_picli/base/image/maa-image-1786615793580.png new file mode 100644 index 0000000..9ec2f00 Binary files /dev/null and b/assets/resource_picli/base/image/maa-image-1786615793580.png differ diff --git a/assets/resource_picli/base/image/syfs.png b/assets/resource_picli/base/image/syfs.png new file mode 100644 index 0000000..2143b33 Binary files /dev/null and b/assets/resource_picli/base/image/syfs.png differ diff --git a/assets/resource_picli/base/image/xinghui/xinhuidm.png b/assets/resource_picli/base/image/xinghui/xinhuidm.png new file mode 100644 index 0000000..e8f13f7 Binary files /dev/null and b/assets/resource_picli/base/image/xinghui/xinhuidm.png differ diff --git a/assets/resource_picli/base/pipeline/10receivemail.json b/assets/resource_picli/base/pipeline/10receivemail.json index 7d4aec7..930f8ce 100644 --- a/assets/resource_picli/base/pipeline/10receivemail.json +++ b/assets/resource_picli/base/pipeline/10receivemail.json @@ -1,25 +1,30 @@ { "Mail": { "next": [ - "EnterMail" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "EnterMail", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "EnterMail": { - "recognition": "TemplateMatch", - "template": "Mainpage/mail.png", - "action": "Click", - "next": [ - "ReceiveMail", - "Quit" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" - ] + "recognition": { + "type": "TemplateMatch", + "param": { + "template": [ + "Mainpage/mail.png", + "Mainpage/mail2.png" + ] + } + }, + "action": { + "type": "Click" + }, + "next": [ + "ReceiveMail", + "Quit", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" + ] }, "ReceiveMail": { "recognition": "OCR", @@ -41,4 +46,4 @@ "Mail-get" ] } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/11-research and lenrning gold and silver repeat.json b/assets/resource_picli/base/pipeline/11-research and lenrning gold and silver repeat.json index c6a434b..e9cfc40 100644 --- a/assets/resource_picli/base/pipeline/11-research and lenrning gold and silver repeat.json +++ b/assets/resource_picli/base/pipeline/11-research and lenrning gold and silver repeat.json @@ -6,7 +6,7 @@ ], "action": "Click", "post_delay": 2000, - "next": "choose-difficulty" + "next": ["choose-difficulty"] }, "choose-difficulty": { "action": "Click", @@ -39,7 +39,7 @@ 1 ], "post_delay": 1000, - "next": "rlgr-choose-role-2" + "next": ["rlgr-choose-role-2"] }, "rlgr-choose-role-2": { "action": "Click", @@ -50,7 +50,7 @@ 1 ], "post_delay": 1000, - "next": "rlgr-choose-role-3" + "next": ["rlgr-choose-role-3"] }, "rlgr-choose-role-3": { "action": "Click", @@ -61,7 +61,7 @@ 1 ], "post_delay": 1000, - "next": "rlgr-choose-role-4" + "next": ["rlgr-choose-role-4"] }, "rlgr-choose-role-4": { "action": "Click", @@ -190,7 +190,7 @@ "rlgr-not-full": { "pre_delay": 500, "recognition": "TemplateMatch", - "template": "Research2\\ensure_2.png", + "template": "Research2/ensure_2.png", "roi": [ 686, 396, @@ -206,7 +206,7 @@ }, "rlgr-auto": { "recognition": "TemplateMatch", - "template": "Research2\\auto.png", + "template": "Research2/auto.png", "roi": [ 1196, 123, @@ -222,7 +222,7 @@ }, "rlgr-fight-begin-2": { "recognition": "TemplateMatch", - "template": "Research2//begin_fight.png", + "template": "Research2/begin_fight.png", "action": "Click", "next": [ "rlgr-sure-fightwait", @@ -231,16 +231,14 @@ }, "rlgr-sure-fightwait": { "next": [ - "rlgr-sure-fightwait-1" - ], - "interrupt": [ - "rlgr-auto-fightwait" + "rlgr-sure-fightwait-1", + "[JumpBack]rlgr-auto-fightwait" ] }, "rlgr-auto-fightwait": { "pre_delay": 10000, "recognition": "TemplateMatch", - "template": "research and lenrning gold and silver\\stop.png", + "template": "research and lenrning gold and silver/stop.png", "action": "DoNothing" }, "rlgr-sure-fightwait-1": { @@ -262,7 +260,7 @@ }, "rlgr-buff-recognition-afterfight": { "recognition": "TemplateMatch", - "template": "research and lenrning gold and silver\\new-buff.png", + "template": "research and lenrning gold and silver/new-buff.png", "pre_wait_freezes": 300, "next": [ "rlgr-buff-afterfight-click-mid" @@ -348,4 +346,4 @@ "expected": "等级", "action": "DoNothing" } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/11_2_goldresearch.json b/assets/resource_picli/base/pipeline/11_2_goldresearch.json index 755b3b6..f32b6dd 100644 --- a/assets/resource_picli/base/pipeline/11_2_goldresearch.json +++ b/assets/resource_picli/base/pipeline/11_2_goldresearch.json @@ -12,13 +12,9 @@ ], "next": [ "choose_boss", - "sub_choose_boss", "action_1" ] }, - "sub_choose_boss": { - "is_sub": true - }, "choose_boss": { "pre_wait_freezes": 500, "recognition": "OCR", @@ -78,11 +74,10 @@ "action": "Click", "next": [ "find_shangyang", - "swipe_page" + "[JumpBack]swipe_page" ] }, "swipe_page": { - "is_sub": true, "action": "Swipe", "begin": [ 780, @@ -151,7 +146,9 @@ 1, 1 ], - "next": "choose_role_2" + "next": [ + "choose_role_2" + ] }, "choose_role_2": { "action": "Click", @@ -161,7 +158,9 @@ 1, 1 ], - "next": "choose_role_3" + "next": [ + "choose_role_3" + ] }, "choose_role_3": { "action": "Click", @@ -171,7 +170,9 @@ 1, 1 ], - "next": "ensure_1" + "next": [ + "ensure_1" + ] }, "ensure_1": { "recognition": "TemplateMatch", @@ -201,12 +202,11 @@ "action": "Click", "post_delay": 2000, "next": [ - "loading_wait", + "[JumpBack]loading_wait", "action_1" ] }, "loading_wait": { - "is_sub": true, "recognition": "TemplateMatch", "template": "Research2/start_point.png", "inverse": true @@ -220,7 +220,7 @@ "post_wait_freezes": 500, "action": "Click", "next": [ - "ensure_2", + "[JumpBack]ensure_2", "action_2" ] }, @@ -232,7 +232,7 @@ "action": "Click", "post_wait_freezes": 500, "next": [ - "ensure_2", + "[JumpBack]ensure_2", "action_3" ] }, @@ -244,7 +244,7 @@ "action": "Click", "post_wait_freezes": 500, "next": [ - "fight", + "[JumpBack]fight", "swipe_map" ] }, @@ -292,7 +292,7 @@ "action": "Click", "post_wait_freezes": 500, "next": [ - "ensure_2", + "[JumpBack]ensure_2", "action_5" ] }, @@ -304,19 +304,19 @@ "action": "Click", "post_wait_freezes": 500, "next": [ - "fight", + "[JumpBack]fight", "action_6" ] }, "action_6": { "recognition": "TemplateMatch", - "template": "Research2\\fight_2.png", + "template": "Research2/fight_2.png", "green_mask": true, "action": "Click", "index": 0, "post_wait_freezes": 500, "next": [ - "fight", + "[JumpBack]fight", "swipe_map_2" ] }, @@ -338,7 +338,7 @@ }, "enter_research_2": { "recognition": "TemplateMatch", - "template": "Research2\\continue.png", + "template": "Research2/continue.png", "roi": [ 891, 611, @@ -352,37 +352,35 @@ }, "action_7": { "recognition": "TemplateMatch", - "template": "Research2\\add_people.png", + "template": "Research2/add_people.png", "green_mask": true, "action": "Click", "index": 0, "post_wait_freezes": 500, "next": [ - "import_1", + "[JumpBack]import_1", "action_8" ] }, "action_8": { "recognition": "TemplateMatch", - "template": "Research2\\fight.png", + "template": "Research2/fight.png", "green_mask": true, "action": "Click", "index": 1, "post_wait_freezes": 500, "next": [ - "fight", + "[JumpBack]fight", "action_9" ] }, "action_9": { "recognition": "TemplateMatch", - "template": "Research2\\fight_2.png", - "green_mask": true, + "template": "Research2/fight_2.png", "action": "Click", - "index": 1, "post_wait_freezes": 500, "next": [ - "fight", + "[JumpBack]fight", "swipe_map_3" ] }, @@ -406,21 +404,21 @@ }, "action_10": { "recognition": "TemplateMatch", - "template": "Research2\\add_people.png", + "template": "Research2/add_people.png", "green_mask": true, "action": "Click", "index": 0, "post_wait_freezes": 500, "next": [ - "import_1", + "[JumpBack]import_1", "action_11" ] }, "action_11": { "recognition": "TemplateMatch", "template": [ - "Research2\\rest.png", - "Research2\\rest2.png" + "Research2/rest.png", + "Research2/rest2.png" ], "green_mask": true, "order_by": "Vertical", @@ -428,24 +426,23 @@ "post_wait_freezes": 500, "action": "Click", "next": [ - "ensure_2", + "[JumpBack]ensure_2", "action_12" ] }, "action_12": { "recognition": "TemplateMatch", - "template": "Research2\\boss.png", + "template": "Research2/boss.png", "green_mask": true, "action": "Click", "post_wait_freezes": 500, "next": [ - "fight", + "[JumpBack]fight", "finish_research" ] }, "ensure_2": { "pre_wait_freezes": 700, - "is_sub": true, "recognition": "OCR", "expected": "休息", "roi": [ @@ -457,7 +454,7 @@ "action": "Click", "next": [ "ensure_3", - "ensure_2" + "[JumpBack]ensure_2" ] }, "ensure_3": { @@ -473,7 +470,6 @@ "action": "Click" }, "fight": { - "is_sub": true, "recognition": "OCR", "expected": "战斗", "roi": [ @@ -502,13 +498,13 @@ "not_full", "auto", "fight_begin2", - "time_sleep_1" + "[JumpBack]time_sleep_1" ] }, "not_full": { "pre_delay": 500, "recognition": "TemplateMatch", - "template": "Research2\\ensure_2.png", + "template": "Research2/ensure_2.png", "roi": [ 686, 396, @@ -519,12 +515,12 @@ "next": [ "auto", "fight_begin2", - "time_sleep" + "[JumpBack]time_sleep" ] }, "auto": { "recognition": "TemplateMatch", - "template": "Research2\\auto.png", + "template": "Research2/auto.png", "roi": [ 1196, 123, @@ -539,7 +535,7 @@ }, "fight_begin2": { "recognition": "TemplateMatch", - "template": "Research2\\begin_fight.png", + "template": "Research2/begin_fight.png", "roi": [ 1012, 621, @@ -549,7 +545,7 @@ "action": "Click", "next": [ "ensure_4", - "time_sleep" + "[JumpBack]time_sleep" ] }, "ensure_4": { @@ -571,16 +567,14 @@ }, "empty": {}, "time_sleep": { - "is_sub": true, - "post_delay": 2000 + "post_delay": 10000 }, "time_sleep_1": { - "is_sub": true, "post_delay": 500 }, "choose_buff": { "recognition": "TemplateMatch", - "template": "Research2\\buff.png", + "template": "Research2/buff.png", "pre_wait_freezes": 300, "next": [ "regular_buff", @@ -660,7 +654,6 @@ ] }, "import_1": { - "is_sub": true, "recognition": "OCR", "expected": "导入", "roi": [ @@ -677,7 +670,7 @@ }, "immport_2": { "recognition": "TemplateMatch", - "template": "Research2\\import.png", + "template": "Research2/import.png", "action": "Click", "post_wait_freezes": 500, "next": [ diff --git a/assets/resource_picli/base/pipeline/11_Research.json b/assets/resource_picli/base/pipeline/11_Research.json index 25147ff..d4ebd78 100644 --- a/assets/resource_picli/base/pipeline/11_Research.json +++ b/assets/resource_picli/base/pipeline/11_Research.json @@ -4,11 +4,9 @@ "museum", "research_home", "research_return", - "research_quit" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "research_quit", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "research_quit": { @@ -26,11 +24,9 @@ "research_home", "research_return", "research_quit", - "museum" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "museum", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "research_return": { @@ -47,11 +43,9 @@ "next": [ "research_home", "research_return", - "museum" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "museum", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "research_home": { @@ -66,11 +60,9 @@ ], "post_delay": 1000, "next": [ - "museum" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "museum", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "museum": { @@ -88,11 +80,9 @@ "next": [ "Research-week", "choose_theme", - "museum" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "museum", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "Research-week": { @@ -227,4 +217,4 @@ "enter_theme_2" ] } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/11_research and lenrning gold and silver.json b/assets/resource_picli/base/pipeline/11_research and lenrning gold and silver.json index bd8aa11..6236611 100644 --- a/assets/resource_picli/base/pipeline/11_research and lenrning gold and silver.json +++ b/assets/resource_picli/base/pipeline/11_research and lenrning gold and silver.json @@ -27,7 +27,7 @@ ], "action": "Click", "post_delay": 2000, - "next": "choose-difficulty" + "next": ["choose-difficulty"] }, "nightmare": { "recognition": "OCR", @@ -36,7 +36,7 @@ ], "action": "Click", "post_delay": 2000, - "next": "choose-role" + "next": ["choose-role"] }, "firechild": { "recognition": "OCR", @@ -45,7 +45,7 @@ ], "action": "Click", "post_delay": 2000, - "next": "choose-role" + "next": ["choose-role"] }, "choose-role": { "pre_wait_freezes": 500, @@ -89,10 +89,9 @@ "expected": "确定", "action": "Click", "next": [ - "find-shangyang" - ], - "interrupt": [ - "swipe-page" + "find-shangyang_by_pic", + "find-shangyang", + "[JumpBack]swipe-page" ] }, "swipe-page": { @@ -112,6 +111,14 @@ "duration": 1000, "post_delay": 500 }, + "find-shangyang_by_pic":{ + "recognition": "TemplateMatch", + "template": "Research2/filter.png", + "action": "Click", + "next":[ + "change_tag" + ] + }, "find-shangyang": { "recognition": "OCR", "expected": "商鞅方升", @@ -164,7 +171,7 @@ 1, 1 ], - "next": "choose-role-2" + "next": ["choose-role-2"] }, "choose-role-2": { "action": "Click", @@ -174,7 +181,7 @@ 1, 1 ], - "next": "choose-role-3" + "next": ["choose-role-3"] }, "choose-role-3": { "action": "Click", @@ -184,7 +191,7 @@ 1, 1 ], - "next": "ensure-1" + "next": ["ensure-1"] }, "ensure-1": { "recognition": "TemplateMatch", @@ -215,4 +222,4 @@ "post_delay": 20000, "next": [] } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/12_dissect_weapon.json b/assets/resource_picli/base/pipeline/12_dissect_weapon.json index 931d925..c3278a1 100644 --- a/assets/resource_picli/base/pipeline/12_dissect_weapon.json +++ b/assets/resource_picli/base/pipeline/12_dissect_weapon.json @@ -9,11 +9,9 @@ 50 ], "next": [ - "dissect_button" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "dissect_button", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "dissect_button": { @@ -114,4 +112,4 @@ "template": "receive_reward/02.png", "action": "Click" } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/13_activity_attendance.json b/assets/resource_picli/base/pipeline/13_activity_attendance.json index afce2a5..29b5406 100644 --- a/assets/resource_picli/base/pipeline/13_activity_attendance.json +++ b/assets/resource_picli/base/pipeline/13_activity_attendance.json @@ -2,11 +2,9 @@ "activity_attendance": { "next": [ "activity", - "attendance" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "attendance", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "activity": { @@ -128,4 +126,4 @@ "Quit" ] } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/15_visit.json b/assets/resource_picli/base/pipeline/15_visit.json index 938d235..bd01574 100644 --- a/assets/resource_picli/base/pipeline/15_visit.json +++ b/assets/resource_picli/base/pipeline/15_visit.json @@ -4,11 +4,9 @@ "visit-contact", "visit-friends-all-one", "visit-friends-one", - "visit-quit-one" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "visit-quit-one", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "visit-contact": { @@ -78,7 +76,7 @@ }, "visit-Thumbs-up-one": { "recognition": "TemplateMatch", - "template": "visit\\01.png", + "template": "visit/01.png", "action": "Click", "post_delay": 2000, "roi": [ @@ -113,7 +111,7 @@ }, "visit-quit-one": { "recognition": "TemplateMatch", - "template": "Collect\\06.png", + "template": "Collect/06.png", "action": "Click", "post_delay": 7000, "next": [ @@ -173,7 +171,7 @@ }, "visit-Thumbs-up-two": { "recognition": "TemplateMatch", - "template": "visit\\01.png", + "template": "visit/01.png", "action": "Click", "post_delay": 2000, "roi": [ @@ -208,7 +206,7 @@ }, "visit-quit-two": { "recognition": "TemplateMatch", - "template": "Collect\\06.png", + "template": "Collect/06.png", "action": "Click", "post_delay": 7000, "next": [ @@ -268,7 +266,7 @@ }, "visit-Thumbs-up-three": { "recognition": "TemplateMatch", - "template": "visit\\01.png", + "template": "visit/01.png", "action": "Click", "post_delay": 2000, "roi": [ @@ -303,7 +301,7 @@ }, "visit-quit-three": { "recognition": "TemplateMatch", - "template": "Collect\\06.png", + "template": "Collect/06.png", "action": "Click", "post_delay": 7000, "next": [ @@ -361,7 +359,7 @@ }, "visit-Thumbs-up-four": { "recognition": "TemplateMatch", - "template": "visit\\01.png", + "template": "visit/01.png", "action": "Click", "post_delay": 2000, "roi": [ @@ -396,7 +394,7 @@ }, "visit-quit-four": { "recognition": "TemplateMatch", - "template": "Collect\\06.png", + "template": "Collect/06.png", "action": "Click", "post_delay": 7000, "next": [ @@ -405,8 +403,8 @@ }, "visit-quit": { "recognition": "TemplateMatch", - "template": "Collect\\06.png", + "template": "Collect/06.png", "action": "Click", "post_delay": 2000 } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/16_waiqin.json b/assets/resource_picli/base/pipeline/16_waiqin.json new file mode 100644 index 0000000..71117bb --- /dev/null +++ b/assets/resource_picli/base/pipeline/16_waiqin.json @@ -0,0 +1,146 @@ +{ + "waiqin": { + "next": [ + "EnterTraining2", + "[JumpBack]tohome" + ] + }, + "EnterTraining2": { + "recognition": "TemplateMatch", + "template": "Mainpage/training.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "Enterwaiqin" + ] + }, + "Enterwaiqin": { + "recognition": "OCR", + "expected": "外勤", + "action": "Click", + "post_delay": 3000, + "next": [ + "recieve_waiqin", + "chuqin", + "chuqined" + ] + }, + "recieve_waiqin": { + "recognition": "OCR", + "expected": "一键领取", + "action": "Click", + "post_delay": 3000, + "next": [ + "linqu" + ] + }, + "linqu": { + "recognition": "OCR", + "expected": "领取", + "action": "Click", + "post_delay": 3000, + "next": [ + "material1" + ] + }, + "chuqin": { + "recognition": "OCR", + "expected": "统一外勤", + "action": "Click", + "post_delay": 3000, + "next": [ + "comfirm" + ] + }, + "chuqined": { + "recognition": "OCR", + "expected": "统一召回", + "action": "DoNothing", + "post_delay": 3000, + "next": [ + "BackHome" + ] + }, + "comfirm": { + "recognition": "OCR", + "expected": "确认", + "action": "Click", + "post_delay": 3000, + "next": [ + "BackHome" + ] + }, + "BackHome": { + "recognition": "TemplateMatch", + "template": "Startup/10.png", + "roi": [ + 0, + 0, + 295, + 80 + ], + "action": "Click", + "post_delay": 3000 + }, + "Back": { + "recognition": "TemplateMatch", + "template": "Company/return.png", + "roi": [ + 0, + 0, + 295, + 80 + ], + "action": "Click", + "post_delay": 3000 + }, + "gou": { + "recognition": "TemplateMatch", + "template": "Research2/ok.png", + "action": "Click", + "post_delay": 3000 + }, + "jiesuan": { + "recognition": "TemplateMatch", + "template": "activity/wanchen.png", + "action": "Click", + "post_delay": 3000 + }, + "retry": { + "recognition": "OCR", + "expected": "重试", + "action": "Click", + "post_delay": 3000 + }, + "tohome": { + "next": [ + "[JumpBack]Back", + "[JumpBack]BackHome", + "[JumpBack]gou", + "[JumpBack]jiesuan", + "[JumpBack]retry", + "athome" + ] + }, + "athome": { + "recognition": "And", + "all_of": [ + { + "recognition": "OCR", + "expected": "游历" + }, + { + "recognition": "OCR", + "expected": "商亭" + }, + { + "recognition": "OCR", + "expected": "物资库" + }, + { + "recognition": "OCR", + "expected": "任务" + } + ] + } +} \ No newline at end of file diff --git a/assets/resource_picli/base/pipeline/17_xinghui.json b/assets/resource_picli/base/pipeline/17_xinghui.json new file mode 100644 index 0000000..0efc55b --- /dev/null +++ b/assets/resource_picli/base/pipeline/17_xinghui.json @@ -0,0 +1,40 @@ +{ + "xinghui": { + "next": [ + "Enterxinghui", + "[JumpBack]tohome" + ] + }, + "Enterxinghui": { + "recognition": "TemplateMatch", + "template": "Mainpage/hanghui.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "recieve_xinhui_daily", + "recieved_xinhui_daily" + ] + }, + "recieve_xinhui_daily":{ + "recognition": "OCR", + "expected": "获得物资", + "action": "Click", + "post_delay": 3000, + "next":[ + "Quit" + ] + }, + "recieved_xinhui_daily":{ + "recognition": "TemplateMatch", + "template": "xinghui/xinhuidm.png", + "post_delay": 3000, + "next":[ + "Quit" + ] + } + + + + + +} \ No newline at end of file diff --git a/assets/resource_picli/base/pipeline/18_activity_fit.json b/assets/resource_picli/base/pipeline/18_activity_fit.json new file mode 100644 index 0000000..c0fa069 --- /dev/null +++ b/assets/resource_picli/base/pipeline/18_activity_fit.json @@ -0,0 +1,72 @@ +{ + "activity_fit": { + "next": [ + "Enter_activity", + "[JumpBack]tohome" + ] + }, + "Enter_activity": { + "recognition": "TemplateMatch", + "template": "activity/wjwy.png", + "action": "Click", + "post_delay": 7000, + "next": [ + "select_gate", + "To_Fight" + ] + }, + "To_Fight": { + "recognition": "TemplateMatch", + "template": "activity/jhft.png", + "action": "Click", + "post_delay": 7000, + "next": [ + "select_gate" + ] + }, + "select_gate": { + "recognition": "TemplateMatch", + "template": "activity/ft09.png", + "action": "Click", + "post_delay": 7000, + "next": [ + "sutong" + ] + }, + "sutong": { + "recognition": "OCR", + "expected": "速通", + "action": "Click", + "post_delay": 7000, + "next": [ + "allin", + "max_favor", + "X" + ] + }, + "max_favor": { + "recognition": "OCR", + "expected": "好感已满", + "action": "Click", + "post_delay": 7000, + "target": [ + 798, + 403, + 112, + 34 + ], + "next": [ + "allin", + "X" + ] + }, + "X": { + "recognition": "TemplateMatch", + "template": "activity/X.png", + "action": "Click", + "post_delay": 7000, + "next": [ + "tohome" + ] + } +} \ No newline at end of file diff --git a/assets/resource_picli/base/pipeline/19_weekly_to_do.json b/assets/resource_picli/base/pipeline/19_weekly_to_do.json new file mode 100644 index 0000000..051b1a5 --- /dev/null +++ b/assets/resource_picli/base/pipeline/19_weekly_to_do.json @@ -0,0 +1,371 @@ +{ + "weekly_to_do": { + "anchor": "WeeklyEntry", + "next": [ + "Enter_bwyx", + "weekly_back" + ] + }, + "weekly_back": { + "max_hit": 3, + "next": [ + "[JumpBack]Back", + "[JumpBack]BackHome", + "[JumpBack]gou", + "[JumpBack]jiesuan", + "[Anchor]WeeklyEntry" + ] + }, + "Enter_bwyx": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research/01.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "weekly_reward", + "Select_theme2" + ] + }, + "weekly_reward": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "research and lenrning gold and silver/points.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "Select_theme2" + ] + }, + "Select_theme2": { + "pre_wait_freezes": 500, + "recognition": "OCR", + "expected": "金银纪行", + "action": "Click", + "post_delay": 3000, + "next": [ + "Enter_theme2" + ] + }, + "Enter_theme2": { + "pre_wait_freezes": 500, + "recognition": "OCR", + "expected": "进入主题", + "action": "Click", + "post_delay": 3000, + "next": [ + "research_start", + "research_resume" + ] + }, + "research_start": { + "pre_wait_freezes": 500, + "recognition": "OCR", + "expected": "研学启程", + "action": "Click", + "post_delay": 3000, + "next": [ + "select_boss" + ] + }, + "research_resume": { + "pre_wait_freezes": 500, + "recognition": "OCR", + "expected": "继续研学", + "action": "Click", + "post_delay": 3000, + "next": [ + "node" + ] + }, + "select_boss": { + "pre_wait_freezes": 500, + "recognition": "OCR", + "expected": "火婴", + "action": "Click", + "post_delay": 3000, + "next": [ + "select_lv" + ] + }, + "select_lv": { + "pre_wait_freezes": 500, + "recognition": "OCR", + "expected": "普通", + "action": "Click", + "post_delay": 3000, + "next": [ + "select_role" + ] + }, + "select_role": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/choose_role.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "select_xiaohai" + ] + }, + "select_xiaohai": { + "pre_wait_freezes": 500, + "recognition": "OCR", + "expected": "小孩", + "action": "Click", + "post_delay": 3000, + "next": [ + "ensure_role" + ] + }, + "ensure_role": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/ensure_1.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "select_strategy" + ] + }, + "select_strategy": { + "pre_wait_freezes": 500, + "recognition": "OCR", + "expected": "辅助", + "action": "Click", + "post_delay": 3000, + "next": [ + "ensure_strategy" + ] + }, + "ensure_strategy": { + "pre_wait_freezes": 500, + "recognition": "OCR", + "expected": "进入研学", + "action": "Click", + "post_delay": 3000, + "next": [ + "node" + ] + }, + "node": { + "anchor": "ResearchMap", + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/scj.png", + "threshold": 0.89, + "next": [ + "node1", + "node2", + "node3", + "node4", + "node5", + "[JumpBack]qianjin" + ] + }, + "qianjin": { + "action": "Swipe", + "begin": [ + 820, + 260, + 42, + 43 + ], + "end": [ + 560, + 270, + 42, + 43 + ], + "duration": 1000, + "end_hold": 500, + "post_delay": 2000, + "max_hit": 13 + }, + "node1": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "threshold": 0.89, + "template": "Research2/node1.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "arest" + ] + }, + "arest": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/arest.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "qren", + "node" + ] + }, + "qren": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/qren.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "get_strategy", + "node" + ] + }, + "node2": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "threshold": 0.89, + "template": "Research2/node2.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "theme_fight" + ] + }, + "theme_fight": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/zhandou.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "start_fight" + ] + }, + "start_fight": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/kaishi.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "ok" + ] + }, + "ok": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/ok.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "start_fight_again", + "node" + ] + }, + "start_fight_again": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/kaishizhan.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "end_fight", + "[JumpBack]no_auto", + "[JumpBack]time_sleep" + ] + }, + "no_auto": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "activity/no_auto.png", + "action": "Click", + "post_delay": 3000 + }, + "end_fight": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/quedin.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "get_strategy", + "weekend" + ] + }, + "get_strategy": { + "pre_wait_freezes": 500, + "recognition": "OCR", + "expected": "奇策", + "action": "Click", + "target": [ + 242, + 178, + 176, + 354 + ], + "post_delay": 3000, + "next": [ + "qren", + "node" + ] + }, + "node3": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "threshold": 0.89, + "template": "Research2/node3.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "theme_fight" + ] + }, + "node4": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "threshold": 0.89, + "template": "Research2/node4.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "exchange" + ] + }, + "exchange": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/jiaohuan.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "giveup" + ] + }, + "giveup": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/fangqi.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "ok", + "node" + ] + }, + "node5": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "threshold": 0.89, + "template": "Research2/node5.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "theme_fight" + ] + }, + "weekend": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/end.png", + "action": "Click", + "post_delay": 3000, + "next": [ + "tohome" + ] + } +} \ 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 943546c..60315da 100644 --- a/assets/resource_picli/base/pipeline/1_startup.json +++ b/assets/resource_picli/base/pipeline/1_startup.json @@ -20,11 +20,9 @@ "start-healthy", "start-serve", "start-update", - "start-announcement" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "start-announcement", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "StopApp": { @@ -153,11 +151,9 @@ "start-attendance", "start-accessing", "start-GetResource", - "start-convened" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "start-convened", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "start-handling-remind": { @@ -260,4 +256,4 @@ 205 ] } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/2_collect_operators.json b/assets/resource_picli/base/pipeline/2_collect_operators.json index 473303b..8d1c783 100644 --- a/assets/resource_picli/base/pipeline/2_collect_operators.json +++ b/assets/resource_picli/base/pipeline/2_collect_operators.json @@ -3,15 +3,13 @@ "post_delay": 5000, "next": [ "Collecting-operators", - "Collect-ReceiveOperators" - ], - "interrupt": [ - "Exception-handling-convened", - "Exception-handling-quit", - "Exception-handling-home", - "Exception-handling-Network reconnection", - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "Collect-ReceiveOperators", + "[JumpBack]Exception-handling-convened", + "[JumpBack]Exception-handling-quit", + "[JumpBack]Exception-handling-home", + "[JumpBack]Exception-handling-Network reconnection", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "Collecting-operators": { @@ -22,15 +20,13 @@ "next": [ "Collect-ReceiveOperators", "Collect-ReceiveCollect", - "Collecting-operators" - ], - "interrupt": [ - "Exception-handling-convened", - "Exception-handling-quit", - "Exception-handling-home", - "Exception-handling-Network reconnection", - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "Collecting-operators", + "[JumpBack]Exception-handling-convened", + "[JumpBack]Exception-handling-quit", + "[JumpBack]Exception-handling-home", + "[JumpBack]Exception-handling-Network reconnection", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "Collect-ReceiveOperators": { @@ -40,10 +36,8 @@ "post_delay": 2000, "next": [ "Collect-ReceiveCollect", - "Collect-ReceiveOperators" - ], - "interrupt": [ - "Exception-handling-Network reconnection" + "Collect-ReceiveOperators", + "[JumpBack]Exception-handling-Network reconnection" ] }, "Collect-ReceiveCollect": { @@ -53,10 +47,8 @@ "post_delay": 1000, "next": [ "Collect-changan", - "Collect-quit2" - ], - "interrupt": [ - "Exception-handling-Network reconnection" + "Collect-quit2", + "[JumpBack]Exception-handling-Network reconnection" ] }, "Collect-changan": { @@ -64,16 +56,16 @@ "expected": "长按", "action": "Swipe", "begin": [ - 645, - 635, - 0, - 0 + 628, + 605, + 35, + 35 ], "end": [ - 645, - 635, - 0, - 0 + 628, + 605, + 35, + 35 ], "duration": 3000, "post_delay": 3000, @@ -127,10 +119,10 @@ "action": "Click", "post_delay": 2000, "target": [ - 645, - 625, - 0, - 0 + 628, + 605, + 35, + 35 ], "next": [ "Collect-get", @@ -159,10 +151,10 @@ "Collect-back": { "action": "Click", "target": [ - 330, - 360, - 0, - 0 + 323, + 357, + 9, + 9 ], "next": [ "Collect-Collecting2" @@ -185,11 +177,9 @@ "Collect-add-one", "Collect-add-two", "Collect-add-three", - "Collect-add-four" - ], - "interrupt": [ - "Exception-handling-Network reconnection", - "Collect-Collecting2" + "Collect-add-four", + "[JumpBack]Exception-handling-Network reconnection", + "[JumpBack]Collect-Collecting2" ] }, "Collect-full": { @@ -214,10 +204,10 @@ "template": "Collect/03.png", "action": "DoNothing", "target": [ - 770, - 350, - 0, - 0 + 755, + 335, + 28, + 28 ], "next": [ "Collect-gou", @@ -231,10 +221,10 @@ "action": "Click", "post_delay": 2000, "target": [ - 770, - 350, - 0, - 0 + 755, + 335, + 28, + 28 ], "next": [ "Collect-gou", @@ -247,10 +237,10 @@ "template": "Collect/03.png", "action": "Click", "target": [ - 770, - 350, - 0, - 0 + 755, + 335, + 28, + 28 ], "next": [ "Collect-jia4", @@ -263,10 +253,10 @@ "template": "Collect/03.png", "action": "Click", "target": [ - 770, - 350, - 0, - 0 + 755, + 335, + 28, + 28 ], "next": [ "Collect-jia3", @@ -277,10 +267,10 @@ "Collect-jia3": { "action": "Click", "target": [ - 770, - 350, - 0, - 0 + 755, + 335, + 28, + 28 ], "next": [ "Collect-jia4" @@ -289,10 +279,10 @@ "Collect-jia4": { "action": "Click", "target": [ - 770, - 350, - 0, - 0 + 755, + 335, + 28, + 28 ], "next": [ "Collect-gou" @@ -312,4 +302,4 @@ "template": "Collect/06.png", "action": "Click" } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/3-(2)_vending_machine.json b/assets/resource_picli/base/pipeline/3-(2)_vending_machine.json index 413046e..e59b142 100644 --- a/assets/resource_picli/base/pipeline/3-(2)_vending_machine.json +++ b/assets/resource_picli/base/pipeline/3-(2)_vending_machine.json @@ -5,11 +5,9 @@ "vending_machine_reward", "entry_dispath_two", "vending_home", - "entry_back" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "entry_back", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "entry_dispath_two": { @@ -42,7 +40,7 @@ }, "vending_home": { "recognition": "TemplateMatch", - "template": "Startup\\10.png", + "template": "Startup/10.png", "action": "Click", "post_delay": 5000, "next": [ @@ -125,4 +123,4 @@ "dispath_company_collect" ] } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/3_(1)resources_induction.json b/assets/resource_picli/base/pipeline/3_(1)resources_induction.json index ed863c0..cc00b53 100644 --- a/assets/resource_picli/base/pipeline/3_(1)resources_induction.json +++ b/assets/resource_picli/base/pipeline/3_(1)resources_induction.json @@ -4,11 +4,9 @@ "entry_dispath_one", "dispath_resources", "entry_back", - "entry_convened" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "entry_convened", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "entry_dispath_one": { @@ -21,11 +19,9 @@ "click_space", "donshe", "weapons", - "entry_two" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "entry_two", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "dispath_resources": { @@ -202,4 +198,4 @@ "entry_two" ] } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/3_(3)_dispatch_social.json b/assets/resource_picli/base/pipeline/3_(3)_dispatch_social.json index dad9190..6938f64 100644 --- a/assets/resource_picli/base/pipeline/3_(3)_dispatch_social.json +++ b/assets/resource_picli/base/pipeline/3_(3)_dispatch_social.json @@ -3,11 +3,9 @@ "next": [ "entry_dispath_three", "dispath_back", - "dispath_convened" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "dispath_convened", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "entry_dispath_three": { @@ -20,11 +18,9 @@ "dispatch_social_two", "dispatch_social_three", "dispatch_social_four", - "dispath_back" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "dispath_back", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "dispatch_social_one": { @@ -235,4 +231,4 @@ "entry_dispath_four" ] } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/3_(4)_fabricate.json b/assets/resource_picli/base/pipeline/3_(4)_fabricate.json index 8a72a65..7bd6bc1 100644 --- a/assets/resource_picli/base/pipeline/3_(4)_fabricate.json +++ b/assets/resource_picli/base/pipeline/3_(4)_fabricate.json @@ -2,11 +2,9 @@ "fabricate": { "next": [ "entry_dispath_four", - "dc_back" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "dc_back", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "entry_dispath_four": { @@ -27,11 +25,9 @@ "fabricate_all_ten", "entry_dispath_four", "fabricate_back", - "fabricate_convened" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "fabricate_convened", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "fabricate_all_one": { @@ -559,4 +555,4 @@ "tea" ] } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/3_(5)_tea.json b/assets/resource_picli/base/pipeline/3_(5)_tea.json index 290bbeb..de505ac 100644 --- a/assets/resource_picli/base/pipeline/3_(5)_tea.json +++ b/assets/resource_picli/base/pipeline/3_(5)_tea.json @@ -6,11 +6,9 @@ "tea_two", "Instrument", "tea_back", - "tea_convened" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "tea_convened", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "entry_dispath_five": { @@ -24,11 +22,9 @@ "Instrument", "entry_dispath_five", "tea_back", - "tea_convened" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "tea_convened", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "tearoom": { @@ -60,13 +56,22 @@ 140 ], "next": [ + "teaed", "drink_tea", "tea_two" ] }, + "teaed":{ + "recognition": "OCR", + "expected": "今日次数已用完", + "post_delay": 2000, + "next":[ + "BackHome" + ] + }, "drink_tea": { "recognition": "TemplateMatch", - "template": "Company\\tea_load.png", + "template": "Company/tea_load.png", "action": "Click", "post_delay": 1000, "target": [ @@ -148,9 +153,9 @@ "Instrument": { "recognition": "TemplateMatch", "template": [ - "Company\\24.png", - "Company\\25.png", - "Company\\26.png" + "Company/24.png", + "Company/25.png", + "Company/26.png" ], "action": "Click", "target_offset": [ @@ -221,7 +226,7 @@ }, "tea_click_two": { "recognition": "TemplateMatch", - "template": "Company\\27.png", + "template": "Company/27.png", "action": "Click", "green_mask": true, "index": -1, @@ -286,7 +291,7 @@ }, "tea_home": { "recognition": "TemplateMatch", - "template": "Startup\\10.png", + "template": "Startup/10.png", "action": "Click", "post_delay": 5000, "next": [ @@ -316,4 +321,4 @@ "vitality" ] } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/3_(6)_vitality.json b/assets/resource_picli/base/pipeline/3_(6)_vitality.json index 99956b6..1761599 100644 --- a/assets/resource_picli/base/pipeline/3_(6)_vitality.json +++ b/assets/resource_picli/base/pipeline/3_(6)_vitality.json @@ -4,11 +4,9 @@ "entry_dispath_six", "vitality_one", "vitality_back", - "vitality-convened" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "vitality-convened", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "entry_dispath_six": { @@ -18,11 +16,9 @@ "post_delay": 7000, "next": [ "vitality_one", - "vitality_back" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "vitality_back", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "vitality_one": { @@ -130,4 +126,4 @@ ], "post_delay": 1000 } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/3_(7)combine.json b/assets/resource_picli/base/pipeline/3_(7)combine.json index fb73292..5f0315d 100644 --- a/assets/resource_picli/base/pipeline/3_(7)combine.json +++ b/assets/resource_picli/base/pipeline/3_(7)combine.json @@ -5,11 +5,9 @@ "tearoom-combine", "combine-one", "combine-choose", - "combine-game" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "combine-game", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "entry_dispath_seven": { @@ -20,11 +18,9 @@ "next": [ "tearoom-combine", "combine-one", - "combine-game" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "combine-game", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "tearoom-combine": { @@ -340,4 +336,4 @@ "template": "Startup\\10.png", "action": "Click" } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/3_(8)blueprint.json b/assets/resource_picli/base/pipeline/3_(8)blueprint.json index d4d9cd1..5ea6ad8 100644 --- a/assets/resource_picli/base/pipeline/3_(8)blueprint.json +++ b/assets/resource_picli/base/pipeline/3_(8)blueprint.json @@ -3,11 +3,9 @@ "next": [ "entry_dispath_eight", "blueprint-tearoom", - "blueprint-one" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "blueprint-one", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "entry_dispath_eight": { @@ -17,11 +15,9 @@ "post_delay": 7000, "next": [ "blueprint-tearoom", - "blueprint-one" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "blueprint-one", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "blueprint-tearoom": { @@ -87,4 +83,4 @@ "combine-home" ] } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/3_(9)_weapons_fabricate.json b/assets/resource_picli/base/pipeline/3_(9)_weapons_fabricate.json index ca355f7..69d2ff6 100644 --- a/assets/resource_picli/base/pipeline/3_(9)_weapons_fabricate.json +++ b/assets/resource_picli/base/pipeline/3_(9)_weapons_fabricate.json @@ -268,13 +268,11 @@ }, "weapons-fabricate-quit-two-add": { "next": [ - "weapons-fabricate-add-2" - ], - "interrupt": [ - "weapons-fabricate-quit-Image-add", - "weapons-fabricate-determine-three-add", - "signed-contract-two-add", - "weapons-fabricate-quit-two-add" + "weapons-fabricate-add-2", + "[JumpBack]weapons-fabricate-quit-Image-add", + "[JumpBack]weapons-fabricate-determine-three-add", + "[JumpBack]signed-contract-two-add", + "[JumpBack]weapons-fabricate-quit-two-add" ] }, "weapons-fabricate-add-1": { @@ -374,4 +372,4 @@ "template": "Startup/10.png", "action": "Click" } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/4_dailybonus.json b/assets/resource_picli/base/pipeline/4_dailybonus.json index 6677a41..1ac59b9 100644 --- a/assets/resource_picli/base/pipeline/4_dailybonus.json +++ b/assets/resource_picli/base/pipeline/4_dailybonus.json @@ -5,11 +5,10 @@ "libao", "richang", "donggu", - "Quit" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "Quit", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one", + "[JumpBack]tohome" ] }, "shangting": { @@ -84,4 +83,4 @@ "obtain1" ] } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/5_Barter.json b/assets/resource_picli/base/pipeline/5_Barter.json index cbeb440..c2cefa1 100644 --- a/assets/resource_picli/base/pipeline/5_Barter.json +++ b/assets/resource_picli/base/pipeline/5_Barter.json @@ -6,11 +6,9 @@ "random_two", "random_three", "random_four", - "Quit" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "Quit", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "Barter": { @@ -144,4 +142,4 @@ "Quit" ] } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/6_drink_a_2day_water.json b/assets/resource_picli/base/pipeline/6_drink_a_2day_water.json index 0ca7719..f871429 100644 --- a/assets/resource_picli/base/pipeline/6_drink_a_2day_water.json +++ b/assets/resource_picli/base/pipeline/6_drink_a_2day_water.json @@ -13,11 +13,9 @@ "next": [ "max_water", "Swipe_drink", - "drink" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "drink", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "Swipe_drink": { @@ -38,4 +36,4 @@ "drink" ] } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/7_(03)allin.json b/assets/resource_picli/base/pipeline/7_(03)allin.json index 4e9b2a3..6bf6940 100644 --- a/assets/resource_picli/base/pipeline/7_(03)allin.json +++ b/assets/resource_picli/base/pipeline/7_(03)allin.json @@ -15,12 +15,12 @@ "expected": "速通", "action": "Click", "target": [ - 1030, - 660, - 0, - 0 + 1004, + 645, + 48, + 24 ], - "pre_delay": 2000, + "pre_delay": 5000, "post_delay": 3000, "next": [ "Speedrun1x", @@ -98,6 +98,7 @@ "recognition": "TemplateMatch", "template": "Speedrun/12.png", "action": "Click", + "post_delay": 7000, "next": [ "allin-goodwill", "allin-settlement" @@ -150,7 +151,7 @@ 0, 0 ], - "pre_delay": 2000, + "pre_delay": 5000, "post_delay": 2000, "next": [ "allin", @@ -312,7 +313,18 @@ 0 ], "next": [ - "exit" + "complete", + "exit", + "home" + ] + }, + "complete": { + "recognition": "TemplateMatch", + "template": "Collect/07.png", + "action": "Click", + "pre_wait_freezes": 1000, + "next": [ + "home" ] }, "exit": { @@ -321,7 +333,8 @@ "action": "Click", "pre_wait_freezes": 1000, "next": [ - "home" + "home", + "tohome" ] }, "home": { diff --git a/assets/resource_picli/base/pipeline/7_training.json b/assets/resource_picli/base/pipeline/7_training.json index ddfb98e..9b4fda3 100644 --- a/assets/resource_picli/base/pipeline/7_training.json +++ b/assets/resource_picli/base/pipeline/7_training.json @@ -2,11 +2,9 @@ "kaishi": { "next": [ "EnterTraining", - "StartTraining" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "StartTraining", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "EnterTraining": { @@ -15,11 +13,9 @@ "action": "Click", "post_delay": 3000, "next": [ - "StartTraining" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "StartTraining", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "StartTraining": { @@ -41,11 +37,9 @@ "Caster", "Ranger", "LightMelee", - "Tactical" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "Tactical", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "Cash": { @@ -152,4 +146,4 @@ "xuanze" ] } -} \ No newline at end of file +} diff --git a/assets/resource_picli/base/pipeline/8_resource.json b/assets/resource_picli/base/pipeline/8_resource.json index 317800a..6f30c07 100644 --- a/assets/resource_picli/base/pipeline/8_resource.json +++ b/assets/resource_picli/base/pipeline/8_resource.json @@ -5,11 +5,9 @@ "resource_two", "resource_three", "resource_four", - "resource_five" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "resource_five", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "resource_one": { @@ -17,11 +15,9 @@ "execute_one", "come_ancient", "big_map_one", - "ancient" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "ancient", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "execute_one": { @@ -32,11 +28,9 @@ "next": [ "come_ancient", "big_map_one", - "ancient" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "ancient", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "come_ancient": { @@ -143,11 +137,9 @@ "execute_two", "Biandu", "big_map_two", - "both" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "both", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "execute_two": { @@ -158,11 +150,9 @@ "next": [ "Biandu", "big_map_two", - "both" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "both", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "Biandu": { @@ -234,11 +224,9 @@ "execute_three", "deut_sea", "big_map_three", - "sea" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "sea", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "execute_three": { @@ -249,11 +237,9 @@ "next": [ "deut_sea", "big_map_three", - "sea" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "sea", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "deut_sea": { @@ -345,11 +331,9 @@ "execute_four", "cantonese_prefecture", "big_map_four", - "cantonese" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "cantonese", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "execute_four": { @@ -360,11 +344,9 @@ "next": [ "cantonese_prefecture", "big_map_four", - "cantonese" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "cantonese", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "cantonese_prefecture": { @@ -435,11 +417,9 @@ "execute_five", "often_quiet", "big_map_five", - "often" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "often", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "execute_five": { @@ -450,11 +430,9 @@ "next": [ "often_quiet", "big_map_five", - "often" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "often", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "often_quiet": { @@ -572,4 +550,4 @@ "fast" ] } -} \ 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 96e7ccd..d4dcdc6 100644 --- a/assets/resource_picli/base/pipeline/9receive_reward.json +++ b/assets/resource_picli/base/pipeline/9receive_reward.json @@ -4,11 +4,9 @@ "daily1", "weekly1", "travel1", - "mission1" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "mission1", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] }, "daily1": { @@ -53,6 +51,7 @@ "action": "Click", "post_delay": 3000, "next": [ + "chuqin", "all1", "weekly1", "mission1", @@ -141,15 +140,13 @@ }, "Quit1": { "recognition": "TemplateMatch", - "template": "receive_reward\\01.png", + "template": "receive_reward/01.png", "action": "Click", "post_delay": 5000, "next": [ - "travel1" - ], - "interrupt": [ - "Exception-handling-remind", - "Exception-handling-nurturance-one" + "travel1", + "[JumpBack]Exception-handling-remind", + "[JumpBack]Exception-handling-nurturance-one" ] } -} \ No newline at end of file +}