diff --git a/assets/resource_picli/base/image/Research2/add_people.png b/assets/resource_picli/base/image/Research2/add_people.png new file mode 100644 index 0000000..6d0d943 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/add_people.png differ diff --git a/assets/resource_picli/base/image/Research2/auto.png b/assets/resource_picli/base/image/Research2/auto.png new file mode 100644 index 0000000..7e884d7 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/auto.png differ diff --git a/assets/resource_picli/base/image/Research2/begin_fight.png b/assets/resource_picli/base/image/Research2/begin_fight.png new file mode 100644 index 0000000..5df16e3 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/begin_fight.png differ diff --git a/assets/resource_picli/base/image/Research2/boss.png b/assets/resource_picli/base/image/Research2/boss.png new file mode 100644 index 0000000..e00e550 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/boss.png differ diff --git a/assets/resource_picli/base/image/Research2/buff.png b/assets/resource_picli/base/image/Research2/buff.png new file mode 100644 index 0000000..f35bbbd Binary files /dev/null and b/assets/resource_picli/base/image/Research2/buff.png differ diff --git a/assets/resource_picli/base/image/Research2/continue.png b/assets/resource_picli/base/image/Research2/continue.png new file mode 100644 index 0000000..3e03f61 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/continue.png differ diff --git a/assets/resource_picli/base/image/Research2/ensure_2.png b/assets/resource_picli/base/image/Research2/ensure_2.png new file mode 100644 index 0000000..ee66ca4 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/ensure_2.png differ diff --git a/assets/resource_picli/base/image/Research2/fight.png b/assets/resource_picli/base/image/Research2/fight.png new file mode 100644 index 0000000..f7f3fc8 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/fight.png differ diff --git a/assets/resource_picli/base/image/Research2/fight_2.png b/assets/resource_picli/base/image/Research2/fight_2.png new file mode 100644 index 0000000..772dcff Binary files /dev/null and b/assets/resource_picli/base/image/Research2/fight_2.png differ diff --git a/assets/resource_picli/base/image/Research2/import.png b/assets/resource_picli/base/image/Research2/import.png new file mode 100644 index 0000000..1ff2201 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/import.png differ diff --git a/assets/resource_picli/base/image/Research2/new_buff.png b/assets/resource_picli/base/image/Research2/new_buff.png new file mode 100644 index 0000000..d6a6a07 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/new_buff.png differ diff --git a/assets/resource_picli/base/image/Research2/rest.png b/assets/resource_picli/base/image/Research2/rest.png index a9675ba..104b585 100644 Binary files a/assets/resource_picli/base/image/Research2/rest.png and b/assets/resource_picli/base/image/Research2/rest.png differ diff --git a/assets/resource_picli/base/pipeline/11_2_goldresearch.json b/assets/resource_picli/base/pipeline/11_2_goldresearch.json index 646953c..ad52bbe 100644 --- a/assets/resource_picli/base/pipeline/11_2_goldresearch.json +++ b/assets/resource_picli/base/pipeline/11_2_goldresearch.json @@ -214,8 +214,9 @@ "pre_wait_freezes": 1000, "recognition": "TemplateMatch", "template": "Research2/rest.png", + "green_mask": true, "index": 0, - "post_delay": 1000, + "post_wait_freezes": 500, "action": "Click", "next": [ "ensure_2", @@ -223,22 +224,223 @@ ] }, "action_2": { - "pre_wait_freezes": 500, "recognition": "TemplateMatch", "template": "Research2/rest.png", + "green_mask": true, "index": 2, "action": "Click", - "post_delay": 1000, + "post_wait_freezes": 500, "next": [ "ensure_2", "action_3" ] }, "action_3": { - "next": "quit_research_2" + "recognition": "TemplateMatch", + "template": "Research2/fight.png", + "index": 1, + "green_mask": true, + "action": "Click", + "post_wait_freezes": 500, + "next": [ + "fight", + "swipe_map" + ] }, - "ensure_2": { + "swipe_map": { "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research/115.png", + "action": "Click", + "roi": [ + 0, + 0, + 264, + 100 + ], + "post_wait_freezes": 500, + "next": [ + "enter_research" + ] + }, + "enter_research": { + "recognition": "TemplateMatch", + "template": "Research2/continue.png", + "roi": [ + 891, + 611, + 377, + 100 + ], + "action": "Click", + "next": [ + "action_4" + ] + }, + "action_4": { + "recognition": "TemplateMatch", + "template": "Research2/rest.png", + "green_mask": true, + "index": 0, + "roi": [ + 166, + 2, + 917, + 717 + ], + "action": "Click", + "post_wait_freezes": 500, + "next": [ + "ensure_2", + "action_5" + ] + }, + "action_5": { + "recognition": "TemplateMatch", + "template": "Research2\\fight.png", + "index": 2, + "green_mask": true, + "action": "Click", + "post_wait_freezes": 500, + "next": [ + "fight", + "action_6" + ] + }, + "action_6": { + "recognition": "TemplateMatch", + "template": "Research2\\fight_2.png", + "green_mask": true, + "action": "Click", + "index": 0, + "post_wait_freezes": 500, + "next": [ + "fight", + "swipe_map_2" + ] + }, + "swipe_map_2": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research/115.png", + "action": "Click", + "roi": [ + 0, + 0, + 264, + 100 + ], + "post_wait_freezes": 500, + "next": [ + "enter_research_2" + ] + }, + "enter_research_2": { + "recognition": "TemplateMatch", + "template": "Research2\\continue.png", + "roi": [ + 891, + 611, + 377, + 100 + ], + "action": "Click", + "next": [ + "action_7" + ] + }, + "action_7": { + "recognition": "TemplateMatch", + "template": "Research2\\add_people.png", + "green_mask": true, + "action": "Click", + "index": 0, + "post_wait_freezes": 500, + "next": [ + "import_1", + "action_8" + ] + }, + "action_8": { + "recognition": "TemplateMatch", + "template": "Research2\\fight.png", + "green_mask": true, + "action": "Click", + "index": 1, + "post_wait_freezes": 500, + "next": [ + "fight", + "action_9" + ] + }, + "action_9": { + "recognition": "TemplateMatch", + "template": "Research2\\fight_2.png", + "green_mask": true, + "action": "Click", + "index": 1, + "post_wait_freezes": 500, + "next": [ + "fight", + "swipe_map_3" + ] + }, + "swipe_map_3": { + "action": "Swipe", + "begin": [ + 934, + 153, + 1, + 1 + ], + "end": [ + 540, + 150, + 1, + 1 + ], + "next": [ + "action_10" + ] + }, + "action_10": { + "recognition": "TemplateMatch", + "template": "Research2\\add_people.png", + "green_mask": true, + "action": "Click", + "index": 0, + "post_wait_freezes": 500, + "next": [ + "import_1", + "action_11" + ] + }, + "action_11": { + "recognition": "TemplateMatch", + "template": "Research2/rest.png", + "green_mask": true, + "order_by": "Vertical", + "index": 0, + "post_wait_freezes": 500, + "action": "Click", + "next": [ + "ensure_2", + "action_12" + ] + }, + "action_12": { + "recognition": "TemplateMatch", + "template": "Research2\\boss.png", + "green_mask": true, + "action": "Click", + "post_wait_freezes": 500, + "next": [ + "fight", + "finish_research" + ] + }, + "ensure_2": { + "pre_wait_freezes": 700, "is_sub": true, "recognition": "OCR", "expected": "休息", @@ -250,11 +452,12 @@ ], "action": "Click", "next": [ - "ensure_3" + "ensure_3", + "ensure_2" ] }, "ensure_3": { - "pre_wait_freezes": 500, + "pre_wait_freezes": 300, "recognition": "OCR", "expected": "确认", "roi": [ @@ -265,6 +468,257 @@ ], "action": "Click" }, + "fight": { + "is_sub": true, + "recognition": "OCR", + "expected": "战斗", + "roi": [ + 858, + 474, + 389, + 80 + ], + "action": "Click", + "post_wait_freezes": 500, + "next": [ + "fight_begin" + ] + }, + "fight_begin": { + "recognition": "OCR", + "expected": "开始", + "roi": [ + 1030, + 617, + 200, + 74 + ], + "action": "Click", + "next": [ + "not_full", + "auto", + "fight_begin2", + "time_sleep_1" + ] + }, + "not_full": { + "pre_delay": 500, + "recognition": "TemplateMatch", + "template": "Research2\\ensure_2.png", + "roi": [ + 686, + 396, + 169, + 62 + ], + "action": "Click", + "next": [ + "auto", + "fight_begin2", + "time_sleep" + ] + }, + "auto": { + "recognition": "TemplateMatch", + "template": "Research2\\auto.png", + "roi": [ + 1196, + 123, + 78, + 67 + ], + "action": "Click", + "post_wait_freezes": 500, + "next": [ + "fight_begin2" + ] + }, + "fight_begin2": { + "recognition": "TemplateMatch", + "template": "Research2\\begin_fight.png", + "roi": [ + 1012, + 621, + 268, + 99 + ], + "action": "Click", + "next": [ + "ensure_4", + "time_sleep" + ] + }, + "ensure_4": { + "pre_delay": 1000, + "recognition": "OCR", + "expected": "确定", + "roi": [ + 913, + 626, + 125, + 53 + ], + "action": "Click", + "post_wait_freezes": 500, + "next": [ + "choose_buff", + "quit_research_2" + ] + }, + "empty": {}, + "time_sleep": { + "is_sub": true, + "post_delay": 2000 + }, + "time_sleep_1": { + "is_sub": true, + "post_delay": 500 + }, + "choose_buff": { + "recognition": "TemplateMatch", + "template": "Research2\\buff.png", + "pre_wait_freezes": 300, + "next": [ + "regular_buff", + "random_buff" + ] + }, + "regular_buff": { + "recognition": "OCR", + "expected": "破军", + "roi": [ + 210, + 327, + 860, + 37 + ], + "action": "Click", + "next": [ + "ensure_5" + ] + }, + "ensure_5": { + "pre_delay": 500, + "recognition": "OCR", + "expected": "确认", + "roi": [ + 768, + 610, + 253, + 62 + ], + "action": "Click", + "post_delay": 1000, + "next": [ + "choose_buff", + "new_buff", + "empty" + ] + }, + "new_buff": { + "recognition": "TemplateMatch", + "template": "Research2/new_buff.png", + "roi": [ + 449, + 7, + 366, + 83 + ], + "next": [ + "ensure_6" + ] + }, + "ensure_6": { + "pre_delay": 500, + "recognition": "OCR", + "expected": "确认", + "roi": [ + 768, + 610, + 253, + 62 + ], + "action": "Click", + "next": [ + "empty" + ] + }, + "random_buff": { + "action": "Click", + "target": [ + 335, + 370, + 1, + 1 + ], + "next": [ + "ensure_5" + ] + }, + "import_1": { + "is_sub": true, + "recognition": "OCR", + "expected": "导入", + "roi": [ + 993, + 489, + 108, + 54 + ], + "action": "Click", + "post_wait_freezes": 300, + "next": [ + "immport_2" + ] + }, + "immport_2": { + "recognition": "TemplateMatch", + "template": "Research2\\import.png", + "action": "Click", + "post_wait_freezes": 500, + "next": [ + "choose_first" + ] + }, + "choose_first": { + "action": "Click", + "target": [ + 550, + 190, + 1, + 1 + ], + "next": [ + "ensure_7" + ] + }, + "ensure_7": { + "recognition": "TemplateMatch", + "template": "Research2/ensure_1.png", + "roi": [ + 1167, + 672, + 54, + 36 + ], + "action": "Click", + "post_wait_freezes": 500, + "next": [ + "ensure_8" + ] + }, + "ensure_8": { + "recognition": "OCR", + "expected": "确认", + "roi": [ + 971, + 537, + 122, + 56 + ], + "action": "Click", + "post_wait_freezes": 500 + }, "quit_research_2": { "pre_wait_freezes": 500, "recognition": "TemplateMatch", @@ -294,8 +748,8 @@ ], "action": "Click", "next": [ - "gold_research", - "finish_research" + "finish_research", + "empty" ] } } \ No newline at end of file diff --git a/res.zip b/res.zip index 5fd9146..4e50209 100644 Binary files a/res.zip and b/res.zip differ diff --git a/version.txt b/version.txt index 9a13717..12e2555 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -169 \ No newline at end of file +177 \ No newline at end of file