From bd31922431561e116c17456e968315fda7610c13 Mon Sep 17 00:00:00 2001 From: mmwuyou <3176706900@qq.com> Date: Mon, 18 Nov 2024 14:14:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=B9=E7=AA=97=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/interface.json | 8 ++-- .../base/pipeline/10receivemail.json | 8 ++++ .../base/pipeline/11_Research.json | 20 +++++++++ .../base/pipeline/12_dissect_weapon.json | 4 ++ .../base/pipeline/13_activity_attendance.json | 6 ++- .../base/pipeline/15_visit.json | 4 ++ .../base/pipeline/2_collect_operators.json | 4 +- .../base/pipeline/3-(2)_vending_machine.json | 4 ++ .../pipeline/3_(1)resources_induction.json | 8 ++++ .../base/pipeline/3_(3)_dispatch_social.json | 8 ++++ .../base/pipeline/3_(4)_fabricate.json | 8 ++++ .../base/pipeline/3_(5)_tea.json | 8 ++++ .../base/pipeline/3_(6)_vitality.json | 8 ++++ .../base/pipeline/3_(7)combine.json | 8 ++++ .../base/pipeline/3_(8)blueprint.json | 8 ++++ .../base/pipeline/4_dailybonus.json | 4 ++ .../base/pipeline/5_Barter.json | 4 ++ .../base/pipeline/6_drink_a_2day_water.json | 4 ++ .../base/pipeline/7_training.json | 12 +++++ .../base/pipeline/8_resource.json | 44 +++++++++++++++++++ .../base/pipeline/9receive_reward.json | 8 ++++ 21 files changed, 184 insertions(+), 6 deletions(-) diff --git a/assets/interface.json b/assets/interface.json index 6c12aa2..6ca3846 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -95,7 +95,7 @@ "option": [ "选择研学主题", "选择地图(仅老研学)", - "是否自行选择角色和buff" + "是否手动选择角色和buff" ] }, { @@ -662,10 +662,10 @@ } ] }, - "是否自行选择角色和buff": { + "是否手动选择角色和buff": { "cases": [ { - "name": "自行选择(选择完成，进入博学地图后才能开始运行)", + "name": "手动选择角色(选择完成，进入博学地图后才能开始运行)", "pipeline_override": { "gold_research": { "next": [ @@ -676,7 +676,7 @@ } }, { - "name": "不自行选择", + "name": "不手动选择，由MWA选择", "pipeline_override": { "gold_research": { "next": [ diff --git a/assets/resource_picli/base/pipeline/10receivemail.json b/assets/resource_picli/base/pipeline/10receivemail.json index 2385979..7d4aec7 100644 --- a/assets/resource_picli/base/pipeline/10receivemail.json +++ b/assets/resource_picli/base/pipeline/10receivemail.json @@ -2,6 +2,10 @@ "Mail": { "next": [ "EnterMail" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "EnterMail": { @@ -11,6 +15,10 @@ "next": [ "ReceiveMail", "Quit" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "ReceiveMail": { diff --git a/assets/resource_picli/base/pipeline/11_Research.json b/assets/resource_picli/base/pipeline/11_Research.json index f2838b6..25147ff 100644 --- a/assets/resource_picli/base/pipeline/11_Research.json +++ b/assets/resource_picli/base/pipeline/11_Research.json @@ -5,6 +5,10 @@ "research_home", "research_return", "research_quit" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "research_quit": { @@ -23,6 +27,10 @@ "research_return", "research_quit", "museum" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "research_return": { @@ -40,6 +48,10 @@ "research_home", "research_return", "museum" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "research_home": { @@ -55,6 +67,10 @@ "post_delay": 1000, "next": [ "museum" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "museum": { @@ -73,6 +89,10 @@ "Research-week", "choose_theme", "museum" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "Research-week": { diff --git a/assets/resource_picli/base/pipeline/12_dissect_weapon.json b/assets/resource_picli/base/pipeline/12_dissect_weapon.json index 9313c37..931d925 100644 --- a/assets/resource_picli/base/pipeline/12_dissect_weapon.json +++ b/assets/resource_picli/base/pipeline/12_dissect_weapon.json @@ -10,6 +10,10 @@ ], "next": [ "dissect_button" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "dissect_button": { diff --git a/assets/resource_picli/base/pipeline/13_activity_attendance.json b/assets/resource_picli/base/pipeline/13_activity_attendance.json index 9bfbdd1..3e118dd 100644 --- a/assets/resource_picli/base/pipeline/13_activity_attendance.json +++ b/assets/resource_picli/base/pipeline/13_activity_attendance.json @@ -3,6 +3,10 @@ "next": [ "activity", "attendance" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "activity": { @@ -42,7 +46,7 @@ }, "attendance": { "recognition": "OCR", - "expected": "协韵行歌", + "expected": "旅程将启", "action": "Click", "post_delay": 2000, "roi": [ diff --git a/assets/resource_picli/base/pipeline/15_visit.json b/assets/resource_picli/base/pipeline/15_visit.json index da42165..938d235 100644 --- a/assets/resource_picli/base/pipeline/15_visit.json +++ b/assets/resource_picli/base/pipeline/15_visit.json @@ -5,6 +5,10 @@ "visit-friends-all-one", "visit-friends-one", "visit-quit-one" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "visit-contact": { diff --git a/assets/resource_picli/base/pipeline/2_collect_operators.json b/assets/resource_picli/base/pipeline/2_collect_operators.json index 7c1ae13..37f53df 100644 --- a/assets/resource_picli/base/pipeline/2_collect_operators.json +++ b/assets/resource_picli/base/pipeline/2_collect_operators.json @@ -8,7 +8,9 @@ "Exception-handling-convened", "Exception-handling-quit", "Exception-handling-home", - "Exception-handling-Network reconnection" + "Exception-handling-Network reconnection", + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "Collecting": { 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 7fceae0..413046e 100644 --- a/assets/resource_picli/base/pipeline/3-(2)_vending_machine.json +++ b/assets/resource_picli/base/pipeline/3-(2)_vending_machine.json @@ -6,6 +6,10 @@ "entry_dispath_two", "vending_home", "entry_back" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "entry_dispath_two": { 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 f39bcf8..ed863c0 100644 --- a/assets/resource_picli/base/pipeline/3_(1)resources_induction.json +++ b/assets/resource_picli/base/pipeline/3_(1)resources_induction.json @@ -5,6 +5,10 @@ "dispath_resources", "entry_back", "entry_convened" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "entry_dispath_one": { @@ -18,6 +22,10 @@ "donshe", "weapons", "entry_two" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "dispath_resources": { 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 7f405f1..dad9190 100644 --- a/assets/resource_picli/base/pipeline/3_(3)_dispatch_social.json +++ b/assets/resource_picli/base/pipeline/3_(3)_dispatch_social.json @@ -4,6 +4,10 @@ "entry_dispath_three", "dispath_back", "dispath_convened" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "entry_dispath_three": { @@ -17,6 +21,10 @@ "dispatch_social_three", "dispatch_social_four", "dispath_back" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "dispatch_social_one": { diff --git a/assets/resource_picli/base/pipeline/3_(4)_fabricate.json b/assets/resource_picli/base/pipeline/3_(4)_fabricate.json index bdaf24a..8a72a65 100644 --- a/assets/resource_picli/base/pipeline/3_(4)_fabricate.json +++ b/assets/resource_picli/base/pipeline/3_(4)_fabricate.json @@ -3,6 +3,10 @@ "next": [ "entry_dispath_four", "dc_back" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "entry_dispath_four": { @@ -24,6 +28,10 @@ "entry_dispath_four", "fabricate_back", "fabricate_convened" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "fabricate_all_one": { diff --git a/assets/resource_picli/base/pipeline/3_(5)_tea.json b/assets/resource_picli/base/pipeline/3_(5)_tea.json index 3d29290..0de276e 100644 --- a/assets/resource_picli/base/pipeline/3_(5)_tea.json +++ b/assets/resource_picli/base/pipeline/3_(5)_tea.json @@ -7,6 +7,10 @@ "Instrument", "tea_back", "tea_convened" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "entry_dispath_five": { @@ -21,6 +25,10 @@ "entry_dispath_five", "tea_back", "tea_convened" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "tearoom": { diff --git a/assets/resource_picli/base/pipeline/3_(6)_vitality.json b/assets/resource_picli/base/pipeline/3_(6)_vitality.json index ec0ae82..99956b6 100644 --- a/assets/resource_picli/base/pipeline/3_(6)_vitality.json +++ b/assets/resource_picli/base/pipeline/3_(6)_vitality.json @@ -5,6 +5,10 @@ "vitality_one", "vitality_back", "vitality-convened" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "entry_dispath_six": { @@ -15,6 +19,10 @@ "next": [ "vitality_one", "vitality_back" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "vitality_one": { diff --git a/assets/resource_picli/base/pipeline/3_(7)combine.json b/assets/resource_picli/base/pipeline/3_(7)combine.json index 8351e64..fb73292 100644 --- a/assets/resource_picli/base/pipeline/3_(7)combine.json +++ b/assets/resource_picli/base/pipeline/3_(7)combine.json @@ -6,6 +6,10 @@ "combine-one", "combine-choose", "combine-game" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "entry_dispath_seven": { @@ -17,6 +21,10 @@ "tearoom-combine", "combine-one", "combine-game" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "tearoom-combine": { diff --git a/assets/resource_picli/base/pipeline/3_(8)blueprint.json b/assets/resource_picli/base/pipeline/3_(8)blueprint.json index 4ab3d17..d4d9cd1 100644 --- a/assets/resource_picli/base/pipeline/3_(8)blueprint.json +++ b/assets/resource_picli/base/pipeline/3_(8)blueprint.json @@ -4,6 +4,10 @@ "entry_dispath_eight", "blueprint-tearoom", "blueprint-one" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "entry_dispath_eight": { @@ -14,6 +18,10 @@ "next": [ "blueprint-tearoom", "blueprint-one" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "blueprint-tearoom": { diff --git a/assets/resource_picli/base/pipeline/4_dailybonus.json b/assets/resource_picli/base/pipeline/4_dailybonus.json index 2071ded..a614c3d 100644 --- a/assets/resource_picli/base/pipeline/4_dailybonus.json +++ b/assets/resource_picli/base/pipeline/4_dailybonus.json @@ -6,6 +6,10 @@ "richang", "donggu", "Quit" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "shangting": { diff --git a/assets/resource_picli/base/pipeline/5_Barter.json b/assets/resource_picli/base/pipeline/5_Barter.json index 261a351..cbeb440 100644 --- a/assets/resource_picli/base/pipeline/5_Barter.json +++ b/assets/resource_picli/base/pipeline/5_Barter.json @@ -7,6 +7,10 @@ "random_three", "random_four", "Quit" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "Barter": { diff --git a/assets/resource_picli/base/pipeline/6_drink_a_2day_water.json b/assets/resource_picli/base/pipeline/6_drink_a_2day_water.json index a8cb319..0ca7719 100644 --- a/assets/resource_picli/base/pipeline/6_drink_a_2day_water.json +++ b/assets/resource_picli/base/pipeline/6_drink_a_2day_water.json @@ -14,6 +14,10 @@ "max_water", "Swipe_drink", "drink" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "Swipe_drink": { diff --git a/assets/resource_picli/base/pipeline/7_training.json b/assets/resource_picli/base/pipeline/7_training.json index 8f5778d..3c1fd31 100644 --- a/assets/resource_picli/base/pipeline/7_training.json +++ b/assets/resource_picli/base/pipeline/7_training.json @@ -3,6 +3,10 @@ "next": [ "EnterTraining", "StartTraining" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "EnterTraining": { @@ -12,6 +16,10 @@ "post_delay": 3000, "next": [ "StartTraining" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "StartTraining": { @@ -34,6 +42,10 @@ "Ranger", "LightMelee", "Tactical" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "Cash": { diff --git a/assets/resource_picli/base/pipeline/8_resource.json b/assets/resource_picli/base/pipeline/8_resource.json index 71417e5..317800a 100644 --- a/assets/resource_picli/base/pipeline/8_resource.json +++ b/assets/resource_picli/base/pipeline/8_resource.json @@ -6,6 +6,10 @@ "resource_three", "resource_four", "resource_five" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "resource_one": { @@ -14,6 +18,10 @@ "come_ancient", "big_map_one", "ancient" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "execute_one": { @@ -25,6 +33,10 @@ "come_ancient", "big_map_one", "ancient" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "come_ancient": { @@ -132,6 +144,10 @@ "Biandu", "big_map_two", "both" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "execute_two": { @@ -143,6 +159,10 @@ "Biandu", "big_map_two", "both" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "Biandu": { @@ -215,6 +235,10 @@ "deut_sea", "big_map_three", "sea" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "execute_three": { @@ -226,6 +250,10 @@ "deut_sea", "big_map_three", "sea" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "deut_sea": { @@ -318,6 +346,10 @@ "cantonese_prefecture", "big_map_four", "cantonese" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "execute_four": { @@ -329,6 +361,10 @@ "cantonese_prefecture", "big_map_four", "cantonese" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "cantonese_prefecture": { @@ -400,6 +436,10 @@ "often_quiet", "big_map_five", "often" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "execute_five": { @@ -411,6 +451,10 @@ "often_quiet", "big_map_five", "often" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "often_quiet": { diff --git a/assets/resource_picli/base/pipeline/9receive_reward.json b/assets/resource_picli/base/pipeline/9receive_reward.json index 9f0c65f..96e7ccd 100644 --- a/assets/resource_picli/base/pipeline/9receive_reward.json +++ b/assets/resource_picli/base/pipeline/9receive_reward.json @@ -5,6 +5,10 @@ "weekly1", "travel1", "mission1" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] }, "daily1": { @@ -142,6 +146,10 @@ "post_delay": 5000, "next": [ "travel1" + ], + "interrupt": [ + "Exception-handling-remind", + "Exception-handling-nurturance-one" ] } } \ No newline at end of file