diff --git a/assets/config/maa_pi_config.json b/assets/config/maa_pi_config.json index 9654f11..4cf07f6 100644 --- a/assets/config/maa_pi_config.json +++ b/assets/config/maa_pi_config.json @@ -4,10 +4,15 @@ "type": "Adb" }, "adb": { - "adb_path": "D:/雷电/LDPlayer9/adb.exe", + "adb_path": "D:/leidian/LDPlayer9/adb.exe", "address": "emulator-5554", "config": {} }, "resource": "B 服", - "task": [] + "task": [ + { + "name": "启动", + "option": [] + } + ] } \ No newline at end of file diff --git a/assets/resource/base/pipeline/1_startup.json b/assets/resource/base/pipeline/1_startup.json index 1a1ff13..5b212be 100644 --- a/assets/resource/base/pipeline/1_startup.json +++ b/assets/resource/base/pipeline/1_startup.json @@ -10,6 +10,7 @@ "action": "StartApp", "package": "com.cipaishe.wuhua.bilibili/com.cipaishe.wuhua.bilibili.activity.ONESDKSplashActivity", "post_wait_freezes": 10000, + "timeout": 20000, "next": [ "update", "CloseAnnouncement", @@ -60,14 +61,20 @@ }, "StartGame": { "recognition": "OCR", - "expected": "点击", + "expected": "提示", "action": "Click", "post_delay": 7000, + "target": [ + 1060, + 80, + 0, + 0 + ], "roi": [ - 190, - 600, - 130, - 70 + 1170, + 580, + 100, + 135 ], "next": [ "AccumulatedSignIn", diff --git a/assets/resource_picli/base/pipeline/1_startup.json b/assets/resource_picli/base/pipeline/1_startup.json index d65a730..c67757b 100644 --- a/assets/resource_picli/base/pipeline/1_startup.json +++ b/assets/resource_picli/base/pipeline/1_startup.json @@ -1,90 +1,22 @@ { - "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": { + "StartWuhua": { "action": "StartApp", "package": "com.cipaishe.wuhua.bilibili/com.cipaishe.wuhua.bilibili.activity.ONESDKSplashActivity", - "post_delay": 5000, + "post_wait_freezes": 10000, "timeout": 20000, - "timeout_next": [ - "advice", - "misinterpretation", - "examine", - "update", - "Sub_CloseAnnouncement", - "convened" - ], "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": "终端数据更新", @@ -99,7 +31,7 @@ "timeout": 20000, "timeout_next": [ "update", - "Sub_CloseAnnouncement" + "CloseAnnouncement" ], "target": [ 765, @@ -108,10 +40,10 @@ 0 ], "next": [ - "Sub_CloseAnnouncement" + "CloseAnnouncement" ] }, - "Sub_CloseAnnouncement": { + "CloseAnnouncement": { "recognition": "TemplateMatch", "template": "Startup/12.png", "roi": [ @@ -121,70 +53,82 @@ 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, + "target": [ + 1060, + 80, + 0, + 0 + ], + "roi": [ + 1170, + 580, + 100, + 135 ], "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/pipeline/2_collect_operators.json b/assets/resource_picli/base/pipeline/2_collect_operators.json index d65a6ef..e5b4db2 100644 --- a/assets/resource_picli/base/pipeline/2_collect_operators.json +++ b/assets/resource_picli/base/pipeline/2_collect_operators.json @@ -2,7 +2,7 @@ "Collect_operators": { "next": [ "Collecting", - "Sub_ReceiveOperators" + "ReceiveOperators" ] }, "Collecting": { @@ -11,17 +11,18 @@ "action": "Click", "post_delay": 2000, "next": [ - "Sub_ReceiveOperators", + "ReceiveOperators", "ReceiveCollect" ] }, - "Sub_ReceiveOperators": { + "ReceiveOperators": { "recognition": "TemplateMatch", "template": "Collect/02.png", "action": "Click", "post_delay": 2000, "next": [ - "ReceiveCollect" + "ReceiveCollect", + "ReceiveOperators" ] }, "ReceiveCollect": { 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 e0cf8b3..7fceae0 100644 --- a/assets/resource_picli/base/pipeline/3-(2)_vending_machine.json +++ b/assets/resource_picli/base/pipeline/3-(2)_vending_machine.json @@ -3,7 +3,9 @@ "next": [ "vending_machine", "vending_machine_reward", - "entry_dispath_two" + "entry_dispath_two", + "vending_home", + "entry_back" ] }, "entry_dispath_two": { @@ -31,7 +33,7 @@ "next": [ "vending_machine_reward", "vending_home", - "dc_back" + "entry_back" ] }, "vending_home": { @@ -61,7 +63,8 @@ 34 ], "next": [ - "coin_flip" + "coin_flip", + "vending_machine_reward" ] }, "coin_flip": { @@ -76,7 +79,8 @@ 232 ], "next": [ - "coin_flip_click_space" + "coin_flip_click_space", + "coin_flip" ] }, "coin_flip_click_space": { @@ -91,6 +95,7 @@ 480 ], "next": [ + "coin_flip_click_space", "vending_home" ] }, 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 cc16714..f39bcf8 100644 --- a/assets/resource_picli/base/pipeline/3_(1)resources_induction.json +++ b/assets/resource_picli/base/pipeline/3_(1)resources_induction.json @@ -3,9 +3,6 @@ "next": [ "entry_dispath_one", "dispath_resources", - "collect_induction", - "donshe", - "weapons", "entry_back", "entry_convened" ] @@ -37,10 +34,7 @@ "next": [ "no_collect_induction", "click_space", - "collect_induction", - "donshe", - "weapons", - "entry_two" + "dispath_resources" ] }, "click_space": { @@ -55,10 +49,7 @@ ], "next": [ "click_space", - "collect_induction", - "donshe", - "weapons", - "entry_two" + "collect_induction" ] }, "collect_induction": { @@ -75,9 +66,7 @@ "next": [ "no_collect_induction", "collect_induction_click", - "donshe", - "weapons", - "entry_two" + "collect_induction" ] }, "no_collect_induction": { @@ -87,7 +76,7 @@ "next": [ "donshe", "weapons", - "entry_two" + "no_collect_induction" ] }, "collect_induction_click": { @@ -104,7 +93,7 @@ "next": [ "collect_induction_click", "donshe", - "entry_two" + "weapons" ] }, "donshe": { @@ -121,7 +110,7 @@ "next": [ "donshe_click_space", "weapons", - "entry_two" + "donshe" ] }, "donshe_click_space": { 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 6150ad6..5b3c2e3 100644 --- a/assets/resource_picli/base/pipeline/3_(3)_dispatch_social.json +++ b/assets/resource_picli/base/pipeline/3_(3)_dispatch_social.json @@ -2,10 +2,6 @@ "dispath_company_collect": { "next": [ "entry_dispath_three", - "dispatch_social_one", - "dispatch_social_two", - "dispatch_social_three", - "dispatch_social_four", "dispath_back", "dispath_convened" ] @@ -20,7 +16,7 @@ "dispatch_social_two", "dispatch_social_three", "dispatch_social_four", - "dc_back" + "dispath_back" ] }, "dispatch_social_one": { @@ -35,7 +31,8 @@ 196 ], "next": [ - "Beginner_Social_Guide" + "Beginner_Social_Guide", + "dispatch_social_one" ] }, "dispatch_social_two": { @@ -50,7 +47,8 @@ 196 ], "next": [ - "Intermediate_Social_Guide" + "Intermediate_Social_Guide", + "dispatch_social_two" ] }, "dispatch_social_three": { @@ -65,7 +63,8 @@ 196 ], "next": [ - "Advanced_Social_Guide" + "Advanced_Social_Guide", + "dispatch_social_three" ] }, "dispatch_social_four": { @@ -80,7 +79,8 @@ 196 ], "next": [ - "Advanced_Sociology" + "Advanced_Sociology", + "dispatch_social_four" ] }, "Beginner_Social_Guide": { @@ -94,7 +94,8 @@ 134 ], "next": [ - "fabricate_max" + "fabricate_max", + "Beginner_Social_Guide" ] }, "Intermediate_Social_Guide": { @@ -108,7 +109,8 @@ 124 ], "next": [ - "fabricate_max" + "fabricate_max", + "Intermediate_Social_Guide" ] }, "Advanced_Social_Guide": { @@ -122,7 +124,8 @@ 132 ], "next": [ - "fabricate_max" + "fabricate_max", + "Advanced_Social_Guide" ] }, "Advanced_Sociology": { @@ -136,7 +139,8 @@ 131 ], "next": [ - "fabricate_max" + "fabricate_max", + "Advanced_Sociology" ] }, "fabricate_max": { @@ -150,7 +154,8 @@ 71 ], "next": [ - "fabricate_social_book" + "fabricate_social_book", + "fabricate_max" ] }, "fabricate_social_book": { @@ -164,7 +169,8 @@ 73 ], "next": [ - "verify_fabricate" + "verify_fabricate", + "fabricate_social_book" ] }, "verify_fabricate": { @@ -178,7 +184,8 @@ 76 ], "next": [ - "dispath_home" + "dispath_home", + "verify_fabricate" ] }, "dispath_home": { diff --git a/assets/resource_picli/base/pipeline/3_(4)_fabricate.json b/assets/resource_picli/base/pipeline/3_(4)_fabricate.json index ee339a0..c3df165 100644 --- a/assets/resource_picli/base/pipeline/3_(4)_fabricate.json +++ b/assets/resource_picli/base/pipeline/3_(4)_fabricate.json @@ -38,7 +38,8 @@ 137 ], "next": [ - "fabricate_one" + "fabricate_one", + "fabricate_all_one" ] }, "fabricate_one": { @@ -61,7 +62,8 @@ 137 ], "next": [ - "fabricate_two" + "fabricate_two", + "fabricate_all_two" ] }, "fabricate_two": { @@ -84,7 +86,8 @@ 137 ], "next": [ - "fabricate_three" + "fabricate_three", + "fabricate_all_three" ] }, "fabricate_three": { @@ -107,7 +110,8 @@ 137 ], "next": [ - "fabricate_four" + "fabricate_four", + "fabricate_all_four" ] }, "fabricate_four": { @@ -149,7 +153,8 @@ 0 ], "next": [ - "fabricate_five" + "fabricate_five", + "fabricate_all_five" ] }, "fabricate_five": { @@ -197,7 +202,8 @@ 0 ], "next": [ - "fabricate_six" + "fabricate_six", + "fabricate_all_six" ] }, "fabricate_six": { @@ -245,7 +251,8 @@ 0 ], "next": [ - "fabricate_seven" + "fabricate_seven", + "fabricate_all_seven" ] }, "fabricate_seven": { @@ -311,7 +318,8 @@ 0 ], "next": [ - "fabricate_eight" + "fabricate_eight", + "fabricate_all_eight" ] }, "fabricate_eight": { @@ -371,7 +379,8 @@ 0 ], "next": [ - "fabricate_nine" + "fabricate_nine", + "fabricate_all_nine" ] }, "fabricate_nine": { @@ -437,7 +446,8 @@ 0 ], "next": [ - "fabricate_ten" + "fabricate_ten", + "fabricate_all_ten" ] }, "fabricate_ten": { @@ -496,6 +506,7 @@ 76 ], "next": [ + "fabricate_social_book_2", "fabricate_home" ] }, diff --git a/assets/resource_picli/base/pipeline/3_(5)_tea.json b/assets/resource_picli/base/pipeline/3_(5)_tea.json index dd2521b..3d29290 100644 --- a/assets/resource_picli/base/pipeline/3_(5)_tea.json +++ b/assets/resource_picli/base/pipeline/3_(5)_tea.json @@ -18,7 +18,9 @@ "tearoom", "tea_two", "Instrument", - "entry_dispath_five" + "entry_dispath_five", + "tea_back", + "tea_convened" ] }, "tearoom": { @@ -34,7 +36,8 @@ ], "next": [ "tea_two", - "Instrument" + "Instrument", + "tearoom" ] }, "tea_two": { @@ -50,7 +53,8 @@ ], "next": [ "number", - "drink_tea" + "drink_tea", + "tea_two" ] }, "number": { @@ -113,7 +117,8 @@ "action": "DoNothing", "post_delay": 13000, "next": [ - "company_confirm_two" + "company_confirm_two", + "company_confirm_one" ] }, "company_confirm_two": { @@ -129,7 +134,8 @@ ], "next": [ "Instrument", - "invite" + "invite", + "company_confirm_two" ] }, "Instrument": { @@ -202,7 +208,8 @@ 85 ], "next": [ - "tea_click_two" + "tea_click_two", + "topic" ] }, "tea_click_two": { @@ -211,7 +218,7 @@ "action": "Click", "green_mask": true, "index": -1, - "post_delay": 3000, + "post_delay": 2000, "target_offset": [ 40, 0, @@ -225,7 +232,8 @@ 355 ], "next": [ - "origin" + "origin", + "tea_click_two" ] }, "origin": { diff --git a/assets/resource_picli/base/pipeline/3_(6)_vitality.json b/assets/resource_picli/base/pipeline/3_(6)_vitality.json index 98b9199..08e4320 100644 --- a/assets/resource_picli/base/pipeline/3_(6)_vitality.json +++ b/assets/resource_picli/base/pipeline/3_(6)_vitality.json @@ -14,7 +14,7 @@ "post_delay": 7000, "next": [ "vitality_one", - "dc_back" + "vitality_back" ] }, "vitality_one": { diff --git a/assets/resource_picli/base/pipeline/3_(8)blueprint.json b/assets/resource_picli/base/pipeline/3_(8)blueprint.json index ddb29ab..910a9fc 100644 --- a/assets/resource_picli/base/pipeline/3_(8)blueprint.json +++ b/assets/resource_picli/base/pipeline/3_(8)blueprint.json @@ -53,8 +53,8 @@ "post_delay": 2000, "action": "Click", "target": [ - 1210, - 815, + 1200, + 185, 0, 0 ], 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 a37bc90..e76f1db 100644 --- a/assets/resource_picli/base/pipeline/3_(9)_weapons_fabricate.json +++ b/assets/resource_picli/base/pipeline/3_(9)_weapons_fabricate.json @@ -63,14 +63,15 @@ ], "next": [ "weapons-fabricate-lack", - "weapons-fabricate-determine" + "weapons-fabricate-determine", + "signed-contract" ] }, "weapons-fabricate-determine": { "recognition": "OCR", "expected": "确定", "action": "Click", - "post_delay": 2000, + "post_delay": 1500, "roi": [ 655, 400, @@ -95,8 +96,8 @@ ], "post_delay": 2000, "next": [ - "confidential-orders", - "weapons-fabricate-quit-Image" + "weapons-fabricate-quit-Image", + "confidential-orders" ] }, "weapons-fabricate-quit-Image": { @@ -134,7 +135,9 @@ ], "next": [ "signed-contract-two", - "weapons-fabricate-lack-two" + "weapons-fabricate-lack-two", + "weapons-fabricate-quit-Image", + "confidential-orders" ] }, "signed-contract-two": { @@ -150,7 +153,8 @@ ], "next": [ "weapons-fabricate-lack-two", - "weapons-fabricate-determine-three" + "weapons-fabricate-determine-three", + "signed-contract-two" ] }, "weapons-fabricate-determine-three": { diff --git a/assets/resource_picli/base/pipeline/4_dailybonus.json b/assets/resource_picli/base/pipeline/4_dailybonus.json index b3e6eb6..2071ded 100644 --- a/assets/resource_picli/base/pipeline/4_dailybonus.json +++ b/assets/resource_picli/base/pipeline/4_dailybonus.json @@ -14,7 +14,8 @@ "post_delay": 2000, "action": "Click", "next": [ - "libao" + "libao", + "shangting" ] }, "libao": { @@ -23,7 +24,8 @@ "action": "Click", "post_delay": 2000, "next": [ - "richang" + "richang", + "libao" ] }, "richang": { @@ -32,7 +34,8 @@ "action": "Click", "post_delay": 2000, "next": [ - "donggu" + "donggu", + "Quit" ] }, "donggu": { @@ -60,7 +63,8 @@ "action": "Click", "pre_wait_freezes": 1000, "next": [ - "Quit" + "Quit", + "obtain1" ] } } \ 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 2350e7b..f9614a7 100644 --- a/assets/resource_picli/base/pipeline/7_(03)allin.json +++ b/assets/resource_picli/base/pipeline/7_(03)allin.json @@ -181,7 +181,6 @@ ] }, "Sub_AddSpeedrunTime2": { - "is_sub": true, "recognition": "TemplateMatch", "template": "Speedrun/11.png", "action": "Click", @@ -196,7 +195,6 @@ ] }, "Sub_AddSpeedrunTime4": { - "is_sub": true, "recognition": "TemplateMatch", "template": "Speedrun/11.png", "action": "Click", @@ -211,7 +209,6 @@ ] }, "Sub_AddSpeedrunTime10": { - "is_sub": true, "recognition": "TemplateMatch", "template": "Speedrun/11.png", "action": "Click", @@ -356,24 +353,44 @@ "post_wait_freezes": 5000, "next": [ "substitute_shifts", + "allin-enemy-action", "await", - "situation" + "situation", + "allin-automatic" ] }, "substitute_shifts": { "recognition": "OCR", "expected": "代班中", - "inverse": true, - "action": "Click", + "action": "DoNothing", + "post_wait_freezes": 5000, + "next": [ + "await" + ] + }, + "allin-enemy-action": { + "recognition": "OCR", + "expected": "敌方", + "action": "DoNothing", "post_wait_freezes": 5000, + "next": [ + "await" + ] + }, + "allin-automatic": { + "recognition": "OCR", + "expected": "自动", + "action": "Click", "target": [ - 1236, - 159, + 1235, + 160, 0, 0 ], + "post_wait_freezes": 5000, "next": [ - "await" + "substitute_shifts", + "allin-enemy-action" ] }, "await": {