diff --git a/.github/workflows/resource.yaml b/.github/workflows/resource.yaml index 578b760..d0b7583 100644 --- a/.github/workflows/resource.yaml +++ b/.github/workflows/resource.yaml @@ -30,6 +30,7 @@ jobs: python res_zip.py - name: Commit changes + if: ${{ github.repository == 'MAWHA/MWA' }} uses: EndBug/add-and-commit@v9.1.3 with: author_name: github-actions[bot] 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/base/pipeline/1_startup.json b/assets/resource/base/pipeline/1_startup.json index 341ebe1..1a1ff13 100644 --- a/assets/resource/base/pipeline/1_startup.json +++ b/assets/resource/base/pipeline/1_startup.json @@ -1,91 +1,21 @@ { - "StartUp": { + "Start": { "next": [ - "Sub_StartWuhua", - "Sub_CloseAnnouncement", - "Sub_StartGame", - "Sub_AccumulatedSignIn", - "Sub_AccumulatedSignInExit", - "convened", - "Sub_StartUp" - ] - }, - "Sub_StartUp": { - "next": [ - "StartUp" + "StartWuhua", + "update", + "CloseAnnouncement" ] }, - "Sub_StartWuhua": { - "is_sub": true, + "StartWuhua": { "action": "StartApp", "package": "com.cipaishe.wuhua.bilibili/com.cipaishe.wuhua.bilibili.activity.ONESDKSplashActivity", - "post_delay": 5000, - "timeout": 20000, - "timeout_next": [ - "advice", - "misinterpretation", - "examine", - "update", - "Sub_CloseAnnouncement", - "convened" - ], + "post_wait_freezes": 10000, "next": [ - "advice", - "misinterpretation", - "examine", "update", - "Sub_CloseAnnouncement", + "CloseAnnouncement", "convened" ] }, - "misinterpretation": { - "recognition": "OCR", - "expected": "曲解", - "action": "DoNothing", - "post_delay": 5000, - "timeout": 20000, - "timeout_next": [ - "update", - "Sub_CloseAnnouncement" - ], - "next": [ - "examine", - "update", - "Sub_CloseAnnouncement" - ] - }, - "advice": { - "recognition": "OCR", - "expected": "健康游戏忠告", - "action": "DoNothing", - "post_delay": 5000, - "timeout": 20000, - "timeout_next": [ - "update", - "Sub_CloseAnnouncement" - ], - "next": [ - "misinterpretation", - "examine", - "update", - "Sub_CloseAnnouncement" - ] - }, - "examine": { - "recognition": "OCR", - "expected": "正在检查更新", - "action": "DoNothing", - "post_delay": 5000, - "timeout": 20000, - "timeout_next": [ - "update", - "Sub_CloseAnnouncement" - ], - "next": [ - "update", - "Sub_CloseAnnouncement" - ] - }, "update": { "recognition": "OCR", "expected": "终端数据更新", @@ -100,7 +30,7 @@ "timeout": 20000, "timeout_next": [ "update", - "Sub_CloseAnnouncement" + "CloseAnnouncement" ], "target": [ 765, @@ -109,10 +39,10 @@ 0 ], "next": [ - "Sub_CloseAnnouncement" + "CloseAnnouncement" ] }, - "Sub_CloseAnnouncement": { + "CloseAnnouncement": { "recognition": "TemplateMatch", "template": "Startup/12.png", "roi": [ @@ -122,70 +52,76 @@ 157 ], "action": "Click", - "timeout": 20000, - "timeout_next": [ - "Sub_CloseAnnouncement", - "Sub_StartGame" - ], + "post_delay": 5000, "next": [ - "Sub_StartGame" + "StartGame", + "CloseAnnouncement" ] }, - "Sub_StartGame": { + "StartGame": { "recognition": "OCR", - "expected": "抵制不良游戏", + "expected": "点击", "action": "Click", - "next": [ - "Sub_AccumulatedSignIn" - ] - }, - "Sub_AccumulatedSignIn": { - "action": "Click", - "post_delay": 10000, - "timeout": 20000, - "timeout_next": [ - "Sub_AccumulatedSignIn", - "Sub_GetResource", - "Sub_AccumulatedSignInExit", - "convened" + "post_delay": 7000, + "roi": [ + 190, + 600, + 130, + 70 ], "next": [ - "Sub_GetResource", - "Sub_AccumulatedSignInExit", + "AccumulatedSignIn", + "AccumulatedSignInExit", + "GetResource", "convened" ] }, "convened": { "recognition": "TemplateMatch", "template": "Startup/11.png", + "action": "DoNothing", "roi": [ 906, 340, 170, 205 ], + "post_delay": 2000 + }, + "AccumulatedSignIn": { + "action": "Click", + "target": [ + 800, + 350, + 0, + 0 + ], "post_delay": 3000, "next": [ - "stop" + "GetResource", + "AccumulatedSignInExit", + "convened", + "AccumulatedSignIn" ] }, - "Sub_AccumulatedSignInExit": { + "AccumulatedSignInExit": { "recognition": "TemplateMatch", "template": "Startup/AccumulatedSignInExit.png", "action": "Click", "post_delay": 3000, "next": [ - "Sub_GetResource", - "Sub_AccumulatedSignInExit", - "stop" + "GetResource", + "AccumulatedSignInExit", + "convened" ] }, - "Sub_GetResource": { + "GetResource": { "recognition": "OCR", "expected": "获得物资", "action": "Click", "next": [ - "Sub_AccumulatedSignInExit" + "AccumulatedSignInExit", + "convened" ] } } \ No newline at end of file diff --git a/assets/resource_picli/base/image/2048/1024.png b/assets/resource_picli/base/image/2048/1024.png new file mode 100644 index 0000000..2802a18 Binary files /dev/null and b/assets/resource_picli/base/image/2048/1024.png differ diff --git a/assets/resource_picli/base/image/2048/128.png b/assets/resource_picli/base/image/2048/128.png new file mode 100644 index 0000000..5fe2fb7 Binary files /dev/null and b/assets/resource_picli/base/image/2048/128.png differ diff --git a/assets/resource_picli/base/image/2048/16.png b/assets/resource_picli/base/image/2048/16.png new file mode 100644 index 0000000..6350526 Binary files /dev/null and b/assets/resource_picli/base/image/2048/16.png differ diff --git a/assets/resource_picli/base/image/2048/2.png b/assets/resource_picli/base/image/2048/2.png new file mode 100644 index 0000000..c51bfbb Binary files /dev/null and b/assets/resource_picli/base/image/2048/2.png differ diff --git a/assets/resource_picli/base/image/2048/2048.png b/assets/resource_picli/base/image/2048/2048.png new file mode 100644 index 0000000..751662a Binary files /dev/null and b/assets/resource_picli/base/image/2048/2048.png differ diff --git a/assets/resource_picli/base/image/2048/256.png b/assets/resource_picli/base/image/2048/256.png new file mode 100644 index 0000000..42a5113 Binary files /dev/null and b/assets/resource_picli/base/image/2048/256.png differ diff --git a/assets/resource_picli/base/image/2048/32.png b/assets/resource_picli/base/image/2048/32.png new file mode 100644 index 0000000..7121414 Binary files /dev/null and b/assets/resource_picli/base/image/2048/32.png differ diff --git a/assets/resource_picli/base/image/2048/4.png b/assets/resource_picli/base/image/2048/4.png new file mode 100644 index 0000000..3ec5f60 Binary files /dev/null and b/assets/resource_picli/base/image/2048/4.png differ diff --git a/assets/resource_picli/base/image/2048/512.png b/assets/resource_picli/base/image/2048/512.png new file mode 100644 index 0000000..5315c0d Binary files /dev/null and b/assets/resource_picli/base/image/2048/512.png differ diff --git a/assets/resource_picli/base/image/2048/64.png b/assets/resource_picli/base/image/2048/64.png new file mode 100644 index 0000000..146f9f6 Binary files /dev/null and b/assets/resource_picli/base/image/2048/64.png differ diff --git a/assets/resource_picli/base/image/2048/8.png b/assets/resource_picli/base/image/2048/8.png new file mode 100644 index 0000000..e36da36 Binary files /dev/null and b/assets/resource_picli/base/image/2048/8.png differ diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_1.png b/assets/resource_picli/base/image/2048_cd/2048_cd_1.png new file mode 100644 index 0000000..c867986 Binary files /dev/null and b/assets/resource_picli/base/image/2048_cd/2048_cd_1.png differ diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_10.png b/assets/resource_picli/base/image/2048_cd/2048_cd_10.png new file mode 100644 index 0000000..374d9a8 Binary files /dev/null and b/assets/resource_picli/base/image/2048_cd/2048_cd_10.png differ diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_11.png b/assets/resource_picli/base/image/2048_cd/2048_cd_11.png new file mode 100644 index 0000000..bc29c70 Binary files /dev/null and b/assets/resource_picli/base/image/2048_cd/2048_cd_11.png differ diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_12.png b/assets/resource_picli/base/image/2048_cd/2048_cd_12.png new file mode 100644 index 0000000..32d90b1 Binary files /dev/null and b/assets/resource_picli/base/image/2048_cd/2048_cd_12.png differ diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_13.png b/assets/resource_picli/base/image/2048_cd/2048_cd_13.png new file mode 100644 index 0000000..4bdf259 Binary files /dev/null and b/assets/resource_picli/base/image/2048_cd/2048_cd_13.png differ diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_14.png b/assets/resource_picli/base/image/2048_cd/2048_cd_14.png new file mode 100644 index 0000000..1ba8c9f Binary files /dev/null and b/assets/resource_picli/base/image/2048_cd/2048_cd_14.png differ diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_15.png b/assets/resource_picli/base/image/2048_cd/2048_cd_15.png new file mode 100644 index 0000000..73916ab Binary files /dev/null and b/assets/resource_picli/base/image/2048_cd/2048_cd_15.png differ diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_16.png b/assets/resource_picli/base/image/2048_cd/2048_cd_16.png new file mode 100644 index 0000000..43d8a57 Binary files /dev/null and b/assets/resource_picli/base/image/2048_cd/2048_cd_16.png differ diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_2.png b/assets/resource_picli/base/image/2048_cd/2048_cd_2.png new file mode 100644 index 0000000..2b73490 Binary files /dev/null and b/assets/resource_picli/base/image/2048_cd/2048_cd_2.png differ diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_3.png b/assets/resource_picli/base/image/2048_cd/2048_cd_3.png new file mode 100644 index 0000000..5ccc9b2 Binary files /dev/null and b/assets/resource_picli/base/image/2048_cd/2048_cd_3.png differ diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_4.png b/assets/resource_picli/base/image/2048_cd/2048_cd_4.png new file mode 100644 index 0000000..d484e58 Binary files /dev/null and b/assets/resource_picli/base/image/2048_cd/2048_cd_4.png differ diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_5.png b/assets/resource_picli/base/image/2048_cd/2048_cd_5.png new file mode 100644 index 0000000..662ff52 Binary files /dev/null and b/assets/resource_picli/base/image/2048_cd/2048_cd_5.png differ diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_6.png b/assets/resource_picli/base/image/2048_cd/2048_cd_6.png new file mode 100644 index 0000000..b532652 Binary files /dev/null and b/assets/resource_picli/base/image/2048_cd/2048_cd_6.png differ diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_7.png b/assets/resource_picli/base/image/2048_cd/2048_cd_7.png new file mode 100644 index 0000000..0aff354 Binary files /dev/null and b/assets/resource_picli/base/image/2048_cd/2048_cd_7.png differ diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_8.png b/assets/resource_picli/base/image/2048_cd/2048_cd_8.png new file mode 100644 index 0000000..19a7397 Binary files /dev/null and b/assets/resource_picli/base/image/2048_cd/2048_cd_8.png differ diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_9.png b/assets/resource_picli/base/image/2048_cd/2048_cd_9.png new file mode 100644 index 0000000..e8753f7 Binary files /dev/null and b/assets/resource_picli/base/image/2048_cd/2048_cd_9.png differ diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_1.png b/assets/resource_picli/base/image/2048_hh/2048_hh_1.png new file mode 100644 index 0000000..c0f2d6c Binary files /dev/null and b/assets/resource_picli/base/image/2048_hh/2048_hh_1.png differ diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_10.png b/assets/resource_picli/base/image/2048_hh/2048_hh_10.png new file mode 100644 index 0000000..1b7bf79 Binary files /dev/null and b/assets/resource_picli/base/image/2048_hh/2048_hh_10.png differ diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_11.png b/assets/resource_picli/base/image/2048_hh/2048_hh_11.png new file mode 100644 index 0000000..1f665bc Binary files /dev/null and b/assets/resource_picli/base/image/2048_hh/2048_hh_11.png differ diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_12.png b/assets/resource_picli/base/image/2048_hh/2048_hh_12.png new file mode 100644 index 0000000..5050db7 Binary files /dev/null and b/assets/resource_picli/base/image/2048_hh/2048_hh_12.png differ diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_2.png b/assets/resource_picli/base/image/2048_hh/2048_hh_2.png new file mode 100644 index 0000000..7e16745 Binary files /dev/null and b/assets/resource_picli/base/image/2048_hh/2048_hh_2.png differ diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_3.png b/assets/resource_picli/base/image/2048_hh/2048_hh_3.png new file mode 100644 index 0000000..fc7b846 Binary files /dev/null and b/assets/resource_picli/base/image/2048_hh/2048_hh_3.png differ diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_4.png b/assets/resource_picli/base/image/2048_hh/2048_hh_4.png new file mode 100644 index 0000000..59fb5b2 Binary files /dev/null and b/assets/resource_picli/base/image/2048_hh/2048_hh_4.png differ diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_5.png b/assets/resource_picli/base/image/2048_hh/2048_hh_5.png new file mode 100644 index 0000000..90592ae Binary files /dev/null and b/assets/resource_picli/base/image/2048_hh/2048_hh_5.png differ diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_6.png b/assets/resource_picli/base/image/2048_hh/2048_hh_6.png new file mode 100644 index 0000000..34c0f37 Binary files /dev/null and b/assets/resource_picli/base/image/2048_hh/2048_hh_6.png differ diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_7.png b/assets/resource_picli/base/image/2048_hh/2048_hh_7.png new file mode 100644 index 0000000..470ea25 Binary files /dev/null and b/assets/resource_picli/base/image/2048_hh/2048_hh_7.png differ diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_8.png b/assets/resource_picli/base/image/2048_hh/2048_hh_8.png new file mode 100644 index 0000000..fc96126 Binary files /dev/null and b/assets/resource_picli/base/image/2048_hh/2048_hh_8.png differ diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_9.png b/assets/resource_picli/base/image/2048_hh/2048_hh_9.png new file mode 100644 index 0000000..a771325 Binary files /dev/null and b/assets/resource_picli/base/image/2048_hh/2048_hh_9.png differ diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_bs.png b/assets/resource_picli/base/image/2048_hh/2048_hh_bs.png new file mode 100644 index 0000000..e24c68f Binary files /dev/null and b/assets/resource_picli/base/image/2048_hh/2048_hh_bs.png differ diff --git a/assets/resource_picli/base/pipeline/1_startup.json b/assets/resource_picli/base/pipeline/1_startup.json index ab26e9c..d65a730 100644 --- a/assets/resource_picli/base/pipeline/1_startup.json +++ b/assets/resource_picli/base/pipeline/1_startup.json @@ -16,7 +16,6 @@ ] }, "Sub_StartWuhua": { - "is_sub": true, "action": "StartApp", "package": "com.cipaishe.wuhua.bilibili/com.cipaishe.wuhua.bilibili.activity.ONESDKSplashActivity", "post_delay": 5000, diff --git a/assets/resource_picli/base/pipeline/2048_1.json b/assets/resource_picli/base/pipeline/2048_1.json new file mode 100644 index 0000000..9ae58df --- /dev/null +++ b/assets/resource_picli/base/pipeline/2048_1.json @@ -0,0 +1,68 @@ +{ + "2048_1_2": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048/2.png", + "threshold": 0.95 + }, + "2048_1_4": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048/4.png", + "threshold": 0.95 + }, + "2048_1_8": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048/8.png", + "threshold": 0.95 + }, + "2048_1_16": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048/16.png", + "threshold": 0.95 + }, + "2048_1_32": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048/32.png", + "threshold": 0.95 + }, + "2048_1_64": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048/64.png", + "threshold": 0.95 + }, + "2048_1_128": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048/128.png", + "threshold": 0.95 + }, + "2048_1_256": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048/256.png", + "threshold": 0.95 + }, + "2048_1_512": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048/512.png", + "threshold": 0.95 + }, + "2048_1_1024": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048/1024.png", + "threshold": 0.95 + }, + "2048_1_2048": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048/2048.png", + "threshold": 0.95 + } +} diff --git a/assets/resource_picli/base/pipeline/2048_cd.json b/assets/resource_picli/base/pipeline/2048_cd.json new file mode 100644 index 0000000..4d26f5b --- /dev/null +++ b/assets/resource_picli/base/pipeline/2048_cd.json @@ -0,0 +1,98 @@ +{ + "2048_cd_1": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_cd/2048_cd_1.png", + "threshold": 0.95 + }, + "2048_cd_2": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_cd/2048_cd_2.png", + "threshold": 0.95 + }, + "2048_cd_3": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_cd/2048_cd_3.png", + "threshold": 0.95 + }, + "2048_cd_4": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_cd/2048_cd_4.png", + "threshold": 0.95 + }, + "2048_cd_5": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_cd/2048_cd_5.png", + "threshold": 0.95 + }, + "2048_cd_6": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_cd/2048_cd_6.png", + "threshold": 0.95 + }, + "2048_cd_7": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_cd/2048_cd_7.png", + "threshold": 0.95 + }, + "2048_cd_8": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_cd/2048_cd_8.png", + "threshold": 0.95 + }, + "2048_cd_9": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_cd/2048_cd_9.png", + "threshold": 0.95 + }, + "2048_cd_10": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_cd/2048_cd_10.png", + "threshold": 0.95 + }, + "2048_cd_11": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_cd/2048_cd_11.png", + "threshold": 0.95 + }, + "2048_cd_12": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_cd/2048_cd_12.png", + "threshold": 0.95 + }, + "2048_cd_13": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_cd/2048_cd_13.png", + "threshold": 0.60 + }, + "2048_cd_14": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_cd/2048_cd_14.png", + "threshold": 0.60 + }, + "2048_cd_15": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_cd/2048_cd_15.png", + "threshold": 0.60 + }, + "2048_cd_16": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_cd/2048_cd_16.png", + "threshold": 0.60 + } +} diff --git a/assets/resource_picli/base/pipeline/2048_hh.json b/assets/resource_picli/base/pipeline/2048_hh.json new file mode 100644 index 0000000..6cec9f4 --- /dev/null +++ b/assets/resource_picli/base/pipeline/2048_hh.json @@ -0,0 +1,80 @@ +{ + "2048_hh_1": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_hh/2048_hh_1.png", + "threshold": 0.95 + }, + "2048_hh_2": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_hh/2048_hh_2.png", + "threshold": 0.95 + }, + "2048_hh_3": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_hh/2048_hh_3.png", + "threshold": 0.95 + }, + "2048_hh_4": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_hh/2048_hh_4.png", + "threshold": 0.95 + }, + "2048_hh_5": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_hh/2048_hh_5.png", + "threshold": 0.95 + }, + "2048_hh_6": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_hh/2048_hh_6.png", + "threshold": 0.95 + }, + "2048_hh_7": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_hh/2048_hh_7.png", + "threshold": 0.95 + }, + "2048_hh_8": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_hh/2048_hh_8.png", + "threshold": 0.95 + }, + "2048_hh_9": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_hh/2048_hh_9.png", + "threshold": 0.95 + }, + "2048_hh_10": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_hh/2048_hh_10.png", + "threshold": 0.95 + }, + "2048_hh_11": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_hh/2048_hh_11.png", + "threshold": 0.95 + }, + "2048_hh_12": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_hh/2048_hh_12.png", + "threshold": 0.60 + }, + "2048_hh_bs": { + "recognition": "TemplateMatch", + "roi": [347, 100, 588, 579], + "template": "2048_hh/2048_hh_bs.png", + "threshold": 0.60 + } +} 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..cc16714 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": { @@ -52,6 +54,7 @@ 480 ], "next": [ + "click_space", "collect_induction", "donshe", "weapons", 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 diff --git a/assets/resource_picli/base/pipeline/3_(8)blueprint.json b/assets/resource_picli/base/pipeline/3_(8)blueprint.json index 61e5e0c..ddb29ab 100644 --- a/assets/resource_picli/base/pipeline/3_(8)blueprint.json +++ b/assets/resource_picli/base/pipeline/3_(8)blueprint.json @@ -49,20 +49,20 @@ }, "blueprint-Receive": { "recognition": "OCR", - "expected": "领取", + "expected": "取", "post_delay": 2000, "action": "Click", "target": [ - 1215, + 1210, 815, 0, 0 ], "roi": [ - 860, - 0, - 410, - 580 + 1160, + 130, + 120, + 275 ], "next": [ "blueprint-get", @@ -75,6 +75,7 @@ "action": "Click", "post_delay": 2000, "next": [ + "blueprint-Receive", "combine-home" ] } diff --git a/res.zip b/res.zip index 8669793..5fd9146 100644 Binary files a/res.zip and b/res.zip differ diff --git a/version.txt b/version.txt index dd1ec20..9a13717 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -132 \ No newline at end of file +169 \ No newline at end of file