diff --git a/assets/interface.json b/assets/interface.json index a28f138..bc09ab2 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -93,7 +93,8 @@ "name": "博物研学", "entry": "museum_Research", "option": [ - "选择哪个" + "选择研学主题", + "选择地图(仅老研学)" ] }, { @@ -593,57 +594,49 @@ } ] }, - "选择哪个": { + "选择研学主题": { "cases": [ { - "name": "雪景寒林图", + "name": "山水纪行", "param": { - "Research": { - "next": "snowscape" + "choose_theme": { + "next": "mountain-river" } } }, { - "name": "千里江山图 (暂无)", + "name": "金银纪行", "param": { - "Research": { - "next": "landscape" - } - } - }, - { - "name": "溪山旅行图 (暂无)", - "param": { - "Research": { - "next": "journey" + "choose_theme": { + "next": "gold-silver" } } } ] }, - "初始buff": { + "选择地图(仅老研学)": { "cases": [ { - "name": "神射", + "name": "雪景寒林图", "param": { - "snowscape": { - "next": "Marksmanship" + "mountain_Research": { + "next": "snowscape" } } }, { - "name": "炽刀", + "name": "千里江山图 (暂无)", "param": { - "snowscape": { - "next": "Blazing_Knife" + "mountain_Research": { + "next": "landscape" } } }, { - "name": "术法精通", + "name": "溪山旅行图 (暂无)", "param": { - "snowscape": { - "next": "Spells" + "mountain_Research": { + "next": "journey" } } } diff --git a/assets/resource_picli/base/image/Research/mountain_research.png b/assets/resource_picli/base/image/Research/mountain_research.png new file mode 100644 index 0000000..01d5cec Binary files /dev/null and b/assets/resource_picli/base/image/Research/mountain_research.png differ diff --git a/assets/resource_picli/base/image/Research2/begin_research.png b/assets/resource_picli/base/image/Research2/begin_research.png new file mode 100644 index 0000000..73e5278 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/begin_research.png differ diff --git a/assets/resource_picli/base/image/Research2/choose_role.png b/assets/resource_picli/base/image/Research2/choose_role.png new file mode 100644 index 0000000..193060c Binary files /dev/null and b/assets/resource_picli/base/image/Research2/choose_role.png differ diff --git a/assets/resource_picli/base/image/Research2/ensure_1.png b/assets/resource_picli/base/image/Research2/ensure_1.png new file mode 100644 index 0000000..9e697e5 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/ensure_1.png differ diff --git a/assets/resource_picli/base/image/Research2/enter_research.png b/assets/resource_picli/base/image/Research2/enter_research.png new file mode 100644 index 0000000..f43c524 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/enter_research.png differ diff --git a/assets/resource_picli/base/image/Research2/filter.png b/assets/resource_picli/base/image/Research2/filter.png new file mode 100644 index 0000000..2ff3c75 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/filter.png differ diff --git a/assets/resource_picli/base/image/Research2/golden_research.png b/assets/resource_picli/base/image/Research2/golden_research.png new file mode 100644 index 0000000..92454d9 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/golden_research.png differ diff --git a/assets/resource_picli/base/image/Research2/quit.png b/assets/resource_picli/base/image/Research2/quit.png new file mode 100644 index 0000000..5f28d3c Binary files /dev/null and b/assets/resource_picli/base/image/Research2/quit.png differ diff --git a/assets/resource_picli/base/image/Research2/rest.png b/assets/resource_picli/base/image/Research2/rest.png new file mode 100644 index 0000000..a9675ba Binary files /dev/null and b/assets/resource_picli/base/image/Research2/rest.png differ diff --git a/assets/resource_picli/base/image/Research2/start_point.png b/assets/resource_picli/base/image/Research2/start_point.png new file mode 100644 index 0000000..ec4a927 Binary files /dev/null and b/assets/resource_picli/base/image/Research2/start_point.png differ diff --git a/assets/resource_picli/base/pipeline/11_(02)_snowscape.json b/assets/resource_picli/base/pipeline/11_(02)_snowscape.json index c690412..af37177 100644 --- a/assets/resource_picli/base/pipeline/11_(02)_snowscape.json +++ b/assets/resource_picli/base/pipeline/11_(02)_snowscape.json @@ -21,7 +21,7 @@ "Blazing_Knife", "Spells", "snowscape", - "Research", + "mountain_Research", "museum", "buff-one" ] @@ -41,7 +41,7 @@ "Blazing_Knife", "Spells", "snowscape", - "Research", + "mountain_Research", "museum", "advance_four" ] diff --git a/assets/resource_picli/base/pipeline/11_(03)_landscape.json b/assets/resource_picli/base/pipeline/11_(03)_landscape.json index 0d610c8..807f98d 100644 --- a/assets/resource_picli/base/pipeline/11_(03)_landscape.json +++ b/assets/resource_picli/base/pipeline/11_(03)_landscape.json @@ -1,44 +1,49 @@ { - "landscape": { - "recognition": "TemplateMatch", - "template": "Research/r1.png", - "roi": [494, 386, 90, 84], - "action": "Click", - "target_offset": [ - 60, - 150, - 0, - 0 - ], - "post_wait_freezes": 3000, - "next": [ - "Marksmanship", - "Blazing_Knife", - "Spells", - "landscape", - "Research", - "museum", - "landscape-buff-one" - ] - }, - "landscape-buff-one": { - "action": "Click", - "target": [ - 360, - 340, - 0, - 0 - ], - "post_delay": 3000, - "next": [ - "agree", - "Marksmanship", - "Blazing_Knife", - "Spells", - "landscape", - "Research", - "museum", - "advance_four" - ] - } -} + "landscape": { + "recognition": "TemplateMatch", + "template": "Research/r1.png", + "roi": [ + 494, + 386, + 90, + 84 + ], + "action": "Click", + "target_offset": [ + 60, + 150, + 0, + 0 + ], + "post_wait_freezes": 3000, + "next": [ + "Marksmanship", + "Blazing_Knife", + "Spells", + "landscape", + "mountain_Research", + "museum", + "landscape-buff-one" + ] + }, + "landscape-buff-one": { + "action": "Click", + "target": [ + 360, + 340, + 0, + 0 + ], + "post_delay": 3000, + "next": [ + "agree", + "Marksmanship", + "Blazing_Knife", + "Spells", + "landscape", + "mountain_Research", + "museum", + "advance_four" + ] + } +} \ No newline at end of file diff --git a/assets/resource_picli/base/pipeline/11_(04)_journey.json b/assets/resource_picli/base/pipeline/11_(04)_journey.json index 835fecf..9668160 100644 --- a/assets/resource_picli/base/pipeline/11_(04)_journey.json +++ b/assets/resource_picli/base/pipeline/11_(04)_journey.json @@ -2,23 +2,38 @@ "journey": { "recognition": "TemplateMatch", "template": "Research/r2.png", - "roi": [878, 385, 92, 90], + "roi": [ + 878, + 385, + 92, + 90 + ], "action": "Click", - "target_offset": [60, 150, 0, 0], + "target_offset": [ + 60, + 150, + 0, + 0 + ], "post_wait_freezes": 3000, "next": [ "Marksmanship", "Blazing_Knife", "Spells", "journey", - "Research", + "mountain_Research", "museum", "journey-buff-one" ] }, "journey-buff-one": { "action": "Click", - "target": [360, 340, 0, 0], + "target": [ + 360, + 340, + 0, + 0 + ], "post_delay": 3000, "next": [ "agree", @@ -26,9 +41,9 @@ "Blazing_Knife", "Spells", "journey", - "Research", + "mountain_Research", "museum", "advance_four" ] } -} +} \ 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 new file mode 100644 index 0000000..67d4421 --- /dev/null +++ b/assets/resource_picli/base/pipeline/11_2_goldresearch.json @@ -0,0 +1,300 @@ +{ + "gold_research": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/begin_research.png", + "action": "Click", + "roi": [ + 830, + 570, + 450, + 150 + ], + "next": [ + "choose_boss", + "sub_choose_boss" + ] + }, + "sub_choose_boss": { + "is_sub": true + }, + "choose_boss": { + "pre_wait_freezes": 500, + "recognition": "OCR", + "expected": "骨刻", + "roi": [ + 165, + 493, + 974, + 41 + ], + "action": "Click", + "next": [ + "choose_role", + "choose_boss" + ] + }, + "choose_role": { + "recognition": "TemplateMatch", + "template": "Research2/choose_role.png", + "action": "Click", + "next": [ + "change_filter" + ] + }, + "change_filter": { + "recognition": "TemplateMatch", + "template": "Research2/filter.png", + "roi": [ + 1197, + 10, + 61, + 42 + ], + "action": "Click", + "next": [ + "choose_tag" + ] + }, + "choose_tag": { + "recognition": "OCR", + "expected": "轻锐", + "roi": [ + 469, + 207, + 501, + 60 + ], + "action": "Click", + "next": [ + "ensure_tag" + ] + }, + "ensure_tag": { + "recognition": "OCR", + "expected": "确定", + "action": "Click", + "next": [ + "find_shangyang", + "swipe_page" + ] + }, + "swipe_page": { + "is_sub": true, + "action": "Swipe", + "begin": [ + 780, + 362, + 0, + 0 + ], + "end": [ + 475, + 362, + 0, + 0 + ], + "duration": 1000, + "post_delay": 500 + }, + "find_shangyang": { + "recognition": "OCR", + "expected": "商鞅方升", + "action": "Click", + "next": [ + "change_tag" + ] + }, + "change_tag": { + "recognition": "TemplateMatch", + "template": "Research2/filter.png", + "roi": [ + 1197, + 10, + 61, + 42 + ], + "action": "Click", + "next": [ + "choose_tag_2" + ] + }, + "choose_tag_2": { + "recognition": "OCR", + "expected": "全部", + "roi": [ + 469, + 207, + 501, + 60 + ], + "action": "Click", + "next": [ + "ensure_tag_1" + ] + }, + "ensure_tag_1": { + "recognition": "OCR", + "expected": "确定", + "action": "Click", + "next": [ + "choose_role_1" + ] + }, + "choose_role_1": { + "action": "Click", + "target": [ + 554, + 511, + 1, + 1 + ], + "next": "choose_role_2" + }, + "choose_role_2": { + "action": "Click", + "target": [ + 693, + 191, + 1, + 1 + ], + "next": "choose_role_3" + }, + "choose_role_3": { + "action": "Click", + "target": [ + 699, + 516, + 1, + 1 + ], + "next": "ensure_1" + }, + "ensure_1": { + "recognition": "TemplateMatch", + "template": "Research2/ensure_1.png", + "roi": [ + 1167, + 672, + 54, + 36 + ], + "action": "Click", + "next": [ + "choose_strategy" + ] + }, + "choose_strategy": { + "recognition": "OCR", + "expected": "奇策类型", + "action": "Click", + "next": [ + "start_research" + ] + }, + "start_research": { + "recognition": "OCR", + "expected": "进入研学", + "action": "Click", + "post_delay": 2000, + "next": [ + "loading_wait", + "action_1" + ] + }, + "loading_wait": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Research2/start_point.png", + "inverse": true + }, + "action_1": { + "pre_wait_freezes": 1000, + "recognition": "TemplateMatch", + "template": "Research2/rest.png", + "index": 0, + "post_delay": 1000, + "action": "Click", + "next": [ + "ensure_2", + "action_2" + ] + }, + "action_2": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/rest.png", + "index": 2, + "action": "Click", + "post_delay": 1000, + "next": [ + "ensure_2", + "action_3" + ] + }, + "action_3": { + "next": "quit_research_2" + }, + "ensure_2": { + "pre_wait_freezes": 500, + "is_sub": true, + "recognition": "OCR", + "expected": "休息", + "roi": [ + 991, + 493, + 114, + 46 + ], + "action": "Click", + "next": [ + "ensure_3" + ] + }, + "ensure_3": { + "pre_wait_freezes": 500, + "recognition": "OCR", + "expected": "确认", + "roi": [ + 839, + 619, + 116, + 50 + ], + "action": "Click" + }, + "quit_research_2": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/quit.png", + "action": "Click", + "next": [ + "ensure_quit" + ] + }, + "ensure_quit": { + "recognition": "TemplateMatch", + "template": "Research2/ensure_1.png", + "action": "Click", + "next": [ + "finish_research" + ] + }, + "finish_research": { + "pre_wait_freezes": 500, + "recognition": "OCR", + "expected": "结束", + "roi": [ + 1021, + 565, + 246, + 88 + ], + "action": "Click", + "next": [ + "gold_research", + "finish_research" + ] + } +} \ No newline at end of file diff --git a/assets/resource_picli/base/pipeline/11_Research.json b/assets/resource_picli/base/pipeline/11_Research.json index ffe196f..2dffbbd 100644 --- a/assets/resource_picli/base/pipeline/11_Research.json +++ b/assets/resource_picli/base/pipeline/11_Research.json @@ -2,20 +2,44 @@ "museum_Research": { "next": [ "museum", - "Research", - "Research_two", - "advance_one_man", - "advance_one_women", - "war_one", - "keyword", - "upgrade_one", - "descending_one", - "front_one", - "war_new_state", - "negative" + "research_home", + "research_return" + ] + }, + "research_return": { + "recognition": "TemplateMatch", + "template": "Research/115.png", + "action": "Click", + "roi": [ + 0, + 0, + 264, + 100 + ], + "post_wait_freezes": 500, + "next": [ + "research_home", + "research_return", + "museum" + ] + }, + "research_home": { + "recognition": "TemplateMatch", + "template": "Company/social_back_home.png", + "action": "Click", + "roi": [ + 0, + 0, + 300, + 100 + ], + "post_wait_freezes": 500, + "next": [ + "museum" ] }, "museum": { + "pre_wait_freezes": 500, "recognition": "OCR", "expected": "博物", "roi": [ @@ -25,10 +49,8 @@ 167 ], "action": "Click", - "post_wait_freezes": 2000, "next": [ - "Research-topic", - "Research", + "choose_theme", "Research-week", "museum" ] @@ -51,15 +73,51 @@ ], "post_delay": 2000, "next": [ - "Research-topic", + "choose_theme", "Research-week" ] }, - "Research-topic": { + "choose_theme": { + "next": [ + "gold-silver", + "mountain-river" + ] + }, + "mountain-river": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research/mountain_research.png", + "roi": [ + 13, + 98, + 249, + 123 + ], + "action": "Click", + "next": [ + "enter_theme_1" + ] + }, + "gold-silver": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/golden_research.png", + "roi": [ + 12, + 253, + 253, + 128 + ], + "action": "Click", + "next": [ + "enter_theme_2" + ] + }, + "enter_theme_1": { + "pre_wait_freezes": 500, "recognition": "OCR", "expected": "主题", "action": "Click", - "post_delay": 2000, "roi": [ 830, 570, @@ -67,11 +125,12 @@ 150 ], "next": [ - "Research", - "Research_two" + "mountain_Research", + "mountain_Research_2", + "enter_theme_1" ] }, - "Research": { + "mountain_Research": { "recognition": "OCR", "expected": "启程", "roi": [ @@ -88,10 +147,10 @@ "journey", "advance_one_man", "advance_one_women", - "Research" + "mountain_Research" ] }, - "Research_two": { + "mountain_Research_2": { "recognition": "OCR", "expected": "继续", "action": "Click", @@ -111,5 +170,21 @@ "agree", "new_state" ] + }, + "enter_theme_2": { + "pre_wait_freezes": 500, + "recognition": "OCR", + "expected": "主题", + "action": "Click", + "roi": [ + 830, + 570, + 450, + 150 + ], + "next": [ + "gold_research", + "enter_theme_2" + ] } } \ No newline at end of file diff --git a/res.zip b/res.zip index 1f89a3a..fa55bee 100644 Binary files a/res.zip and b/res.zip differ diff --git a/version.txt b/version.txt index 1bda760..d800886 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -117 \ No newline at end of file +123 \ No newline at end of file