diff --git a/assets/interface.json b/assets/interface.json index cf3065c..4d9c0b6 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -363,6 +363,17 @@ "next": "entry_dispath_one" } } + }, + { + "name": "不领取", + "param": { + "entry_one": { + "next": [ + "entry_back", + "entry_convened" + ] + } + } } ] }, @@ -401,10 +412,13 @@ } }, { - "name": "不领取(暂不推荐使用，会导致下面选项任务失效，甚至可能最终导致下面所有任务失败)", + "name": "不领取", "param": { "entry_dispath_three": { - "next": [] + "next": [ + "dispath_back", + "dispath_convened" + ] } } } @@ -493,10 +507,13 @@ } }, { - "name": "不制造(暂不推荐使用，会导致下面选项任务失效，甚至可能最终导致下面所有任务失败)", + "name": "不制造", "param": { "entry_dispath_four": { - "next": [] + "next": [ + "fabricate_back", + "fabricate_convened" + ] } } } @@ -513,10 +530,13 @@ } }, { - "name": "不喝茶(暂不推荐使用，会导致下面选项任务失效，甚至可能最终导致下面所有任务失败)", + "name": "不喝茶", "param": { - "dispatch_company_all": { - "next": [] + "tea": { + "next": [ + "tea_back", + "tea_convened" + ] } } } @@ -533,10 +553,13 @@ } }, { - "name": "不领取【反正是派遣公司的最后一个任务（暂时），无所谓，这个可以用】", + "name": "不领取", "param": { - "dispatch_company_all": { - "next": [] + "vitality": { + "next": [ + "vitality_back", + "vitality-convened" + ] } } } 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 120dc4d..2c04f3d 100644 --- a/assets/resource_picli/base/pipeline/3-(2)_vending_machine.json +++ b/assets/resource_picli/base/pipeline/3-(2)_vending_machine.json @@ -93,5 +93,27 @@ "next": [ "vending_home" ] + }, + "entry_back": { + "recognition": "TemplateMatch", + "template": "Collect/06.png", + "action": "Click", + "next": [ + "dispath_company_collect" + ] + }, + "entry_convened": { + "recognition": "TemplateMatch", + "template": "Startup/11.png", + "roi": [ + 906, + 340, + 170, + 205 + ], + "post_delay": 3000, + "next": [ + "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 56009d4..f31db8e 100644 --- a/assets/resource_picli/base/pipeline/3_(1)resources_induction.json +++ b/assets/resource_picli/base/pipeline/3_(1)resources_induction.json @@ -5,7 +5,9 @@ "dispath_resources", "collect_induction", "donshe", - "weapons" + "weapons", + "entry_back", + "entry_convened" ] }, "entry_dispath_one": { 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 edd26da..6150ad6 100644 --- a/assets/resource_picli/base/pipeline/3_(3)_dispatch_social.json +++ b/assets/resource_picli/base/pipeline/3_(3)_dispatch_social.json @@ -6,7 +6,8 @@ "dispatch_social_two", "dispatch_social_three", "dispatch_social_four", - "dc_back" + "dispath_back", + "dispath_convened" ] }, "entry_dispath_three": { @@ -186,9 +187,30 @@ "action": "Click", "post_delay": 5000, "next": [ - "entry_dispath_four", - "tea", - "vitality" + "entry_dispath_four" + ] + }, + "dispath_back": { + "recognition": "TemplateMatch", + "template": "Collect/06.png", + "action": "Click", + "post_delay": 7000, + "next": [ + "entry_dispath_four" + ] + }, + "dispath_convened": { + "recognition": "TemplateMatch", + "template": "Startup/11.png", + "roi": [ + 906, + 340, + 170, + 205 + ], + "post_delay": 3000, + "next": [ + "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 8868f09..ee339a0 100644 --- a/assets/resource_picli/base/pipeline/3_(4)_fabricate.json +++ b/assets/resource_picli/base/pipeline/3_(4)_fabricate.json @@ -22,7 +22,8 @@ "fabricate_all_nine", "fabricate_all_ten", "entry_dispath_four", - "dc_back" + "fabricate_back", + "fabricate_convened" ] }, "fabricate_all_one": { @@ -504,9 +505,30 @@ "action": "Click", "post_delay": 5000, "next": [ - "tea", - "vitality", - "fabricate_home" + "tea" + ] + }, + "fabricate_back": { + "recognition": "TemplateMatch", + "template": "Collect/06.png", + "action": "Click", + "post_delay": 7000, + "next": [ + "tea" + ] + }, + "fabricate_convened": { + "recognition": "TemplateMatch", + "template": "Startup/11.png", + "roi": [ + 906, + 340, + 170, + 205 + ], + "post_delay": 3000, + "next": [ + "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 98c6ea3..dd2521b 100644 --- a/assets/resource_picli/base/pipeline/3_(5)_tea.json +++ b/assets/resource_picli/base/pipeline/3_(5)_tea.json @@ -4,7 +4,9 @@ "entry_dispath_five", "tearoom", "tea_two", - "Instrument" + "Instrument", + "tea_back", + "tea_convened" ] }, "entry_dispath_five": { @@ -276,5 +278,28 @@ "next": [ "vitality" ] + }, + "tea_back": { + "recognition": "TemplateMatch", + "template": "Collect/06.png", + "action": "Click", + "post_delay": 7000, + "next": [ + "vitality" + ] + }, + "tea_convened": { + "recognition": "TemplateMatch", + "template": "Startup/11.png", + "roi": [ + 906, + 340, + 170, + 205 + ], + "post_delay": 3000, + "next": [ + "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 231de21..98b9199 100644 --- a/assets/resource_picli/base/pipeline/3_(6)_vitality.json +++ b/assets/resource_picli/base/pipeline/3_(6)_vitality.json @@ -2,7 +2,9 @@ "vitality": { "next": [ "entry_dispath_six", - "vitality_one" + "vitality_one", + "vitality_back", + "vitality-convened" ] }, "entry_dispath_six": { @@ -69,5 +71,21 @@ "recognition": "TemplateMatch", "template": "Startup\\10.png", "action": "Click" + }, + "vitality_back": { + "recognition": "TemplateMatch", + "template": "Collect/06.png", + "action": "Click" + }, + "vitality-convened": { + "recognition": "TemplateMatch", + "template": "Startup/11.png", + "roi": [ + 906, + 340, + 170, + 205 + ], + "post_delay": 1000 } } \ No newline at end of file