增加弹窗异常处理

MAWHA · Nov 18, 2024 · bd31922 · bd31922
1 parent 00efbb1
commit bd31922
Show file tree

Hide file tree

Showing 21 changed files with 184 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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": {