From 6d2b29b3e43ec2f640e2e8f886285a1c11a2232a Mon Sep 17 00:00:00 2001
From: W1NDes <w1ndes@outlook.com>
Date: Fri, 24 Oct 2025 01:41:41 +0800
Subject: [PATCH] Upd(event): regular update

---
 config/template.json                 |  6 +++---
 module/config/argument/args.json     | 20 ++++++++++----------
 module/config/argument/override.yaml |  6 +++---
 module/eventstory/eventstory.py      |  2 +-
 module/ship_ir/ship_ir.py            |  4 ++--
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/config/template.json b/config/template.json
index 7244b0d03..b11a06e57 100644
--- a/config/template.json
+++ b/config/template.json
@@ -491,10 +491,10 @@
     },
     "EventPt": {
       "EventPtSwitch": false,
-      "Event2MapName": "D3",
-      "EventDailyAMapName": "A1>A2>A3>B1>B2>B3",
+      "Event2MapName": "T6",
+      "EventDailyAMapName": false,
       "EventDailySpMapName": "sp",
-      "EventDailyCD": "C1>C2>C3>D1>D2>D3"
+      "EventDailyCD": false
     },
     "Fleet": {
       "Fleet1": 1,
diff --git a/module/config/argument/args.json b/module/config/argument/args.json
index e9ace85ac..6699217fa 100644
--- a/module/config/argument/args.json
+++ b/module/config/argument/args.json
@@ -2349,12 +2349,12 @@
       },
       "Event2MapName": {
         "type": "state",
-        "value": "D3",
+        "value": "T6",
         "display": "display"
       },
       "EventDailyAMapName": {
         "type": "state",
-        "value": "A1>A2>A3>B1>B2>B3",
+        "value": false,
         "display": "display"
       },
       "EventDailySpMapName": {
@@ -2364,7 +2364,7 @@
       },
       "EventDailyCD": {
         "type": "state",
-        "value": "C1>C2>C3>D1>D2>D3",
+        "value": false,
         "display": "display"
       }
     },
@@ -3074,24 +3074,24 @@
         "type": "select",
         "value": "campaign_main",
         "option": [
-          "event_20230817_cn",
-          "event_20250912_cn"
+          "event_20250912_cn",
+          "event_20251023_cn"
         ],
         "option_cn": [
-          "event_20230817_cn"
+          "event_20251023_cn"
         ],
         "option_en": [
-          "event_20230817_cn"
+          "event_20251023_cn"
         ],
         "option_jp": [
-          "event_20230817_cn"
+          "event_20251023_cn"
         ],
         "option_tw": [
           "event_20250912_cn"
         ],
         "option_bold": [
-          "event_20230817_cn",
-          "event_20250912_cn"
+          "event_20250912_cn",
+          "event_20251023_cn"
         ]
       },
       "Mode": {
diff --git a/module/config/argument/override.yaml b/module/config/argument/override.yaml
index 23ed90537..844378b99 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: T6
       type: state
       display: display
     EventDailyAMapName:
-      value: A1>A2>A3>B1>B2>B3
+      value: false
       type: state
       display: display
     EventDailySpMapName:
@@ -73,7 +73,7 @@ Event:
       type: state
       display: display
     EventDailyCD:
-      value: C1>C2>C3>D1>D2>D3
+      value: false
       type: state
       display: display
 
diff --git a/module/eventstory/eventstory.py b/module/eventstory/eventstory.py
index 3871e5b27..ad8f52d26 100644
--- a/module/eventstory/eventstory.py
+++ b/module/eventstory/eventstory.py
@@ -250,7 +250,7 @@ class EventStory(CampaignUI, Combat, LoginHandler):
         return 'unknown'
 
     def run(self):
-        if datetime.now() < datetime(2025, 10, 3, 0, 0, 0):#eventSet
+        if datetime.now() < datetime(2025, 11, 6, 12, 0, 0):#eventSet
             self.run_event_story()
         else:
             logger.info('Event story expired')
diff --git a/module/ship_ir/ship_ir.py b/module/ship_ir/ship_ir.py
index 5ab45a54f..d4ae2ef04 100644
--- a/module/ship_ir/ship_ir.py
+++ b/module/ship_ir/ship_ir.py
@@ -11,8 +11,8 @@ HANDBOOK_SCROLL = Scroll(HANDBOOK_SCROLL_AREA, color=(244, 208, 66))
 SHIP_NAME_BUTTON = ButtonGrid(origin=(200, 448), delta=(164 + 1 / 3, 226), button_shape=(135,21), grid_shape=(6, 2), name='SHIP_NAME')
 SHIP_NAME_BUTTON_2 = ButtonGrid(origin=(200, 511), delta=(164 + 1 / 3, 226), button_shape=(135,21), grid_shape=(6, 1), name='SHIP_NAME_2')
 
-CHECK_FILTER1 = ["全部","自由鸢尾","超稀有","无限制"]
-CHECK_FILTER2 = ["全部","自由鸢尾","精锐","无限制"]
+CHECK_FILTER1 = ["全部","飓风","超稀有","无限制"]
+CHECK_FILTER2 = ["全部","飓风","精锐","无限制"]
 CHECK_FILTER3 = ["","重樱","全部","无限制"]
 CHECK_FILTER4 = ["","白鹰","金色","无限制"]
 CHECK_FILTER5 = ["","皇家","全部","无限制"]