diff --git a/campaign/event_20230525_cn/campaign_base.py b/campaign/event_20230525_cn/campaign_base.py
index 71873058a..de2fe7d5a 100644
--- a/campaign/event_20230525_cn/campaign_base.py
+++ b/campaign/event_20230525_cn/campaign_base.py
@@ -10,13 +10,15 @@ BALL = Button(area=(589, 279, 685, 374), color=(), button=(589, 279, 685, 374))
 
 
 class CampaignBase(CampaignBase_):
+    # STAGE_INCREASE = [
+    #     'T1 > T2 > TS1 > T3',
+    #     'T4 > T5 > TS2 > T6',
+    #     'HT1 > HT2 > HTS1 > HT3',
+    #     'HT4 > HT5 > HTS2 > HT6',
+    # ]
     STAGE_INCREASE = [
-        'T1 > T2 > TS1 > T3',
-        'T4 > T5 > TS2 > T6',
-        'HT1 > HT2 > HTS1 > HT3',
-        'HT4 > HT5 > HTS2 > HT6',
+        'T1 > T2 > TS1 > T3 > T4 > T5 > TS2 > T6 > HT1 > HT2 > HTS1 > HT3 > HT4 > HT5 > HTS2 > HT6',
     ]
-
     def campaign_set_chapter(self, name, mode='normal'):
         """
         Args:
diff --git a/config/template.json b/config/template.json
index 19c850132..80e73c708 100644
--- a/config/template.json
+++ b/config/template.json
@@ -474,10 +474,10 @@
     },
     "EventPt": {
       "EventPtSwitch": false,
-      "Event2MapName": "D3",
-      "EventDailyAMapName": "A1>A2>A3>B1>B2>B3",
+      "Event2MapName": "HT6",
+      "EventDailyAMapName": "T1>T2>T3>T4>T5>T6",
       "EventDailySpMapName": "sp",
-      "EventDailyCD": false
+      "EventDailyCD": "HT1>HT2>HT3>HT4>HT5>HT6"
     },
     "Fleet": {
       "Fleet1": 1,
diff --git a/module/config/argument/args.json b/module/config/argument/args.json
index 37c6f746a..604ec1432 100644
--- a/module/config/argument/args.json
+++ b/module/config/argument/args.json
@@ -2406,12 +2406,12 @@
       },
       "Event2MapName": {
         "type": "state",
-        "value": "D3",
+        "value": "HT6",
         "display": "display"
       },
       "EventDailyAMapName": {
         "type": "state",
-        "value": "A1>A2>A3>B1>B2>B3",
+        "value": "T1>T2>T3>T4>T5>T6",
         "display": "display"
       },
       "EventDailySpMapName": {
@@ -2421,7 +2421,7 @@
       },
       "EventDailyCD": {
         "type": "state",
-        "value": false,
+        "value": "HT1>HT2>HT3>HT4>HT5>HT6",
         "display": "display"
       }
     },
@@ -3273,13 +3273,13 @@
           "event_20250520_cn"
         ],
         "option_bold": [
-          "event_20240912_cn",
+          "event_20230525_cn",
           "event_20250520_cn"
         ],
-        "cn": "event_20250520_cn",
-        "en": "event_20250520_cn",
-        "jp": "event_20250520_cn",
-        "tw": "event_20240912_cn"
+        "cn": "event_20230525_cn",
+        "en": "event_20230525_cn",
+        "jp": "event_20230525_cn",
+        "tw": "event_20250520_cn"
       },
       "Mode": {
         "type": "select",
diff --git a/module/config/argument/override.yaml b/module/config/argument/override.yaml
index 12b9aafae..0657827bb 100644
--- a/module/config/argument/override.yaml
+++ b/module/config/argument/override.yaml
@@ -61,11 +61,11 @@ Event:
     AmbushEvade: true
   EventPt:
     Event2MapName: 
-      value: D3
+      value: HT6
       type: state
       display: display
     EventDailyAMapName:
-      value: A1>A2>A3>B1>B2>B3
+      value: T1>T2>T3>T4>T5>T6
       type: state
       display: display
     EventDailySpMapName:
@@ -73,7 +73,7 @@ Event:
       type: state
       display: display
     EventDailyCD:
-      value: false
+      value: HT1>HT2>HT3>HT4>HT5>HT6
       type: state
       display: display
 
diff --git a/module/handler/fast_forward.py b/module/handler/fast_forward.py
index b421e8bef..649a96ceb 100644
--- a/module/handler/fast_forward.py
+++ b/module/handler/fast_forward.py
@@ -471,8 +471,8 @@ class FastForwardHandler(AutoSearchHandler):
                         self.config.cross_set(keys=f'EventSp.EventDaily.StageFilter',value = f'{self.config.EventPt_EventDailySpMapName}') 
                         self.config.task_call('EventSp')
                     if self.config.EventPt_EventDailyCD != False:
+                        self.config.cross_set(keys=f'EventC.EventDaily.StageFilter', value=f'{self.config.EventPt_EventDailyCD}')
                         self.config.task_call('EventC')
-                        self.config.task_call('EventD')
                     
                 
                 # logger.info(f"{self.config.Fleet_FleetOrder},{self.config.Emotion_Fleet1Value},{self.config.Emotion_Fleet1Recover}")