diff --git a/assets/Resource/Base/pipeline/Club.json b/assets/Resource/Base/pipeline/Club.json
index 6e14ce2..e7dcd69 100644
--- a/assets/Resource/Base/pipeline/Club.json
+++ b/assets/Resource/Base/pipeline/Club.json
@@ -7,7 +7,7 @@
         ]
     },
     "Sub_Goto_Club_Partial": {
-        "doc": "这个 json 同时是前往一个位置的最小单元实例，NowLoading 需要和 Goto 的父级绑定（TODO：每次出现场景变化的时候均为使用 Goto 之后，同个场景的任务尽可能使用 Sub 并列）（需要更改的文件有 Buttons Cafe Campaign Club Commissions Mailbox Scrimmage StartUp TacticalChallenge）。非业务类的弹窗则尽可能由 ProcessingNotice 处理",
+        "doc": "这个 json 同时是前往一个位置的最小单元实例，NowLoading 需要和 Goto 的父级绑定（TODO：每次出现场景变化的时候均为使用 Goto 之后，同个场景的任务尽可能使用 Sub 并列）（需要更改的文件有 Buttons Cafe Campaign Club Mailbox StartUp TacticalChallenge）。非业务类的弹窗则尽可能由 ProcessingNotice 处理",
         "is_sub": true,
         "inverse": true,
         "recognition": "OCR",
diff --git a/assets/Resource/Base/pipeline/Scrimmage.json b/assets/Resource/Base/pipeline/Scrimmage.json
index c09df1f..baa49cc 100644
--- a/assets/Resource/Base/pipeline/Scrimmage.json
+++ b/assets/Resource/Base/pipeline/Scrimmage.json
@@ -1,10 +1,11 @@
 {
     "Scrimmage": {
         "next": [
+            "Sub_Wait_NowLoading_Partial",
             "Sub_Goto_Scrimmage_Partial",
-            "Sub_Check_TrinityTickets",
-            "Sub_Check_GehennaTickets",
-            "Sub_Check_MillenniumTickets",
+            "Sub_Check_TrinityTicket",
+            "Sub_Check_GehennaTicket",
+            "Sub_Check_MillenniumTicket",
             "Stop"
         ]
     },
@@ -15,10 +16,9 @@
         "text": "AcademySelect",
         "roi": [ 630, 125, 650, 70 ],
         "next": [
-            "AcademySelectFlag_Partial",
+            "Click_ScrimmageButton_Partial",
             "ScrimmageFlag_Partial",
             "Sub_Wait_NowLoading_Partial",
-            "Click_ScrimmageButton_Partial",
             "Sub_Goto_Campaign"
         ]
     },
@@ -37,67 +37,81 @@
             "Click_BackButton"
         ]
     },
-    "AcademySelectFlag_Partial": {
-        "recognition": "OCR",
-        "text": "AcademySelect",
-        "roi": [ 630, 125, 650, 70 ]
+    "Start_SweepMission_OnScrimmage": {
+        "next": [
+            "Start_SweepMission_Partial",
+            "Sub_Click_EnterButton_OnClearedMission_Partial",
+            "StopOnException"
+        ]
     },
-    "Sub_Check_TrinityTickets": {
+    "Sub_Check_TrinityTicket": {
         "is_sub": true,
         "inverse": true,
-        "times_limit": 2,
+        "times_limit": 5,
         "recognition": "OCR",
         "text": "0/2",
         "roi": [ 680, 210, 600, 136 ],
         "next": [
-            "Click_Trinity_Partial"
+            "Sub_Wait_NowLoading_Partial",
+            "Sub_Goto_Trinity_Partial",
+            "Start_SweepMission_OnScrimmage"
         ],
         "runout_next": [
+            "Sub_Wait_NowLoading_Partial",
             "Sub_Goto_Scrimmage_Partial",
-            "Sub_Check_GehennaTickets",
-            "Sub_Check_MillenniumTickets",
+            "Sub_Check_GehennaTicket",
+            "Sub_Check_MillenniumTicket",
             "StopTask"
         ]
     },
-    "Sub_Check_GehennaTickets": {
+    "Sub_Goto_Trinity_Partial": {
         "is_sub": true,
         "inverse": true,
-        "times_limit": 2,
         "recognition": "OCR",
-        "text": "0/2",
-        "roi": [ 680, 346, 600, 136 ],
+        "text": "Trinity",
+        "roi": [ 90, 130, 530, 85 ],
         "next": [
-            "Click_Gehenna_Partial"
-        ],
-        "runout_next": [
-            "Sub_Goto_Scrimmage_Partial",
-            "Sub_Check_MillenniumTickets",
-            "StopTask"
+            "Click_Trinity_Partial",
+            "Sub_Wait_NowLoading_Partial",
+            "Sub_Goto_Bounty_Partial"
         ]
     },
-    "Sub_Check_MillenniumTickets": {
+    "Click_Trinity_Partial": {
+        "recognition": "OCR",
+        "text": "Trinity",
+        "roi": [ 680, 210, 600, 136 ],
+        "action": "Click",
+        "post_delay": 1500
+    },
+    "Sub_Check_GehennaTicket": {
         "is_sub": true,
         "inverse": true,
-        "times_limit": 2,
+        "times_limit": 5,
         "recognition": "OCR",
         "text": "0/2",
-        "roi": [ 680, 482, 600, 136 ],
+        "roi": [ 680, 346, 600, 136 ],
         "next": [
-            "Click_Millennium_Partial"
+            "Sub_Wait_NowLoading_Partial",
+            "Sub_Goto_Gehenna_Partial",
+            "Start_SweepMission_OnScrimmage"
         ],
         "runout_next": [
+            "Sub_Wait_NowLoading_Partial",
+            "Sub_Goto_Scrimmage_Partial",
+            "Sub_Check_MillenniumTicket",
             "StopTask"
         ]
     },
-    "Click_Trinity_Partial": {
+    "Sub_Goto_Gehenna_Partial": {
+        "is_sub": true,
+        "inverse": true,
         "recognition": "OCR",
-        "text": "Trinity",
-        "roi": [ 680, 210, 600, 136 ],
-        "action": "Click",
+        "text": "Gehenna",
+        "roi": [ 90, 130, 530, 85 ],
         "next": [
-            "Start_SweepMission_Partial",
-            "Sub_Click_EnterButton_OnClearedMission_Partial",
-            "Stop"
+            "Click_Gehenna_Partial",
+            "Sub_Wait_NowLoading_Partial",
+            "Sub_Goto_Bounty_Partial"
         ]
     },
     "Click_Gehenna_Partial": {
@@ -105,10 +119,34 @@
         "text": "Gehenna",
         "roi": [ 680, 346, 600, 136 ],
         "action": "Click",
+        "post_delay": 1500
+    },
+    "Sub_Check_MillenniumTicket": {
+        "is_sub": true,
+        "inverse": true,
+        "times_limit": 5,
+        "recognition": "OCR",
+        "text": "0/2",
+        "roi": [ 680, 482, 600, 136 ],
         "next": [
-            "Start_SweepMission_Partial",
-            "Sub_Click_EnterButton_OnClearedMission_Partial",
-            "Stop"
+            "Sub_Wait_NowLoading_Partial",
+            "Sub_Goto_Millennium_Partial",
+            "Start_SweepMission_OnScrimmage"
+        ],
+        "runout_next": [
+            "StopTask"
+        ]
+    },
+    "Sub_Goto_Millennium_Partial": {
+        "is_sub": true,
+        "inverse": true,
+        "recognition": "OCR",
+        "text": "Millennium",
+        "roi": [ 90, 130, 530, 85 ],
+        "next": [
+            "Click_Millennium_Partial",
+            "Sub_Wait_NowLoading_Partial",
+            "Sub_Goto_Bounty_Partial"
         ]
     },
     "Click_Millennium_Partial": {
@@ -116,10 +154,6 @@
         "text": "Millennium",
         "roi": [ 680, 482, 600, 136 ],
         "action": "Click",
-        "next": [
-            "Start_SweepMission_Partial",
-            "Sub_Click_EnterButton_OnClearedMission_Partial",
-            "Stop"
-        ]
+        "post_delay": 1500
     }
 }
diff --git a/assets/Resource/EN/pipeline/OCRPartialTasks.json b/assets/Resource/EN/pipeline/OCRPartialTasks.json
index 9eac537..ede943f 100644
--- a/assets/Resource/EN/pipeline/OCRPartialTasks.json
+++ b/assets/Resource/EN/pipeline/OCRPartialTasks.json
@@ -269,10 +269,9 @@
             "Scrimmage"
         ]
     },
-    "AcademySelectFlag_Partial": {
+    "Sub_Goto_Trinity_Partial": {
         "text": [
-            "Academy Select",
-            "AcademySelect"
+            "Trinity"
         ]
     },
     "Click_Trinity_Partial": {
@@ -280,11 +279,21 @@
             "Trinity"
         ]
     },
+    "Sub_Goto_Gehenna_Partial": {
+        "text": [
+            "Gehenna"
+        ]
+    },
     "Click_Gehenna_Partial": {
         "text": [
             "Gehenna"
         ]
     },
+    "Sub_Goto_Millennium_Partial": {
+        "text": [
+            "Millennium"
+        ]
+    },
     "Click_Millennium_Partial": {
         "text": [
             "Millennium"