From edc5976a09344534fe97ede28ae30c46b3d6a9ab Mon Sep 17 00:00:00 2001 From: W1NDes Date: Fri, 1 May 2026 05:30:47 +0800 Subject: [PATCH] =?UTF-8?q?Upd(event):=20=E6=9B=B4=E6=96=B0=E5=A4=8D?= =?UTF-8?q?=E5=88=BB=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- campaign/Readme.md | 1 + config/template.json | 6 +- module/config/argument/args.json | 141 +++++++++------------------ module/config/argument/override.yaml | 6 +- module/config/i18n/en-US.json | 2 +- module/config/i18n/ja-JP.json | 2 +- module/config/i18n/zh-CN.json | 2 +- module/eventstory/eventstory.py | 2 +- 8 files changed, 59 insertions(+), 103 deletions(-) diff --git a/campaign/Readme.md b/campaign/Readme.md index ff86c031b..cb6abb1ca 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -289,3 +289,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20260416 | event 20220915 cn | Violet Tempest Blooming Lycoris | - | - | - | 復刻紫絳槿嵐 | | 20260417 | event 20260417 cn | Vacation Lane – Beachside Brilliance | 假日航线闪耀海滨 | Vacation Lane – Beachside Brilliance | バケーションレーン・きらめく砂浜 | - | | 20260417 | event 20201126 cn | Vacation Lane Rerun | 复刻假日航线 | Vacation Lane Rerun | バケーションレーン（復刻） | - | +| 20250424 | event 20250424 cn | Toward Tulipa’s Seas Rerun | 复刻扬起郁金之旗 | Toward Tulipa’s Seas Rerun | チュリッパの海へ（復刻） | - | diff --git a/config/template.json b/config/template.json index c66a151cb..8b65db991 100644 --- a/config/template.json +++ b/config/template.json @@ -539,12 +539,12 @@ }, "EventPt": { "EventPtSwitch": false, - "Event2MapName": "sp4", - "EventDailyAMapName": false, + "Event2MapName": "HT3", + "EventDailyAMapName": "T1>T2>T3>HT1>HT2>HT3", "EventDailySpMapName": "sp", "EventDailyCD": false, "EventResetStageAfterHours": 72, - "EventResetStageName": "sp1", + "EventResetStageName": "T1", "EventResetStageRecord": "2020-01-01 00:00:00" }, "Fleet": { diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 7e2b5d540..49209919e 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1976,29 +1976,24 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20201126_cn", "event_20220915_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_cn": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_en": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_jp": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_tw": [ "event_20220915_cn" ], "option_bold": [ - "event_20201126_cn", "event_20220915_cn", - "event_20260417_cn" + "event_20250424_cn" ] }, "Mode": { @@ -2512,29 +2507,24 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20201126_cn", "event_20220915_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_cn": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_en": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_jp": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_tw": [ "event_20220915_cn" ], "option_bold": [ - "event_20201126_cn", "event_20220915_cn", - "event_20260417_cn" + "event_20250424_cn" ] }, "Mode": { @@ -2608,12 +2598,12 @@ }, "Event2MapName": { "type": "state", - "value": "sp4", + "value": "HT3", "display": "display" }, "EventDailyAMapName": { "type": "state", - "value": false, + "value": "T1>T2>T3>HT1>HT2>HT3", "display": "display" }, "EventDailySpMapName": { @@ -2633,7 +2623,7 @@ }, "EventResetStageName": { "type": "state", - "value": "sp1", + "value": "T1", "display": "display" }, "EventResetStageRecord": { @@ -2955,29 +2945,24 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20201126_cn", "event_20220915_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_cn": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_en": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_jp": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_tw": [ "event_20220915_cn" ], "option_bold": [ - "event_20201126_cn", "event_20220915_cn", - "event_20260417_cn" + "event_20250424_cn" ] }, "Mode": { @@ -3357,29 +3342,24 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20201126_cn", "event_20220915_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_cn": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_en": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_jp": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_tw": [ "event_20220915_cn" ], "option_bold": [ - "event_20201126_cn", "event_20220915_cn", - "event_20260417_cn" + "event_20250424_cn" ] }, "Mode": { @@ -5101,29 +5081,24 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20201126_cn", "event_20220915_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_cn": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_en": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_jp": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_tw": [ "event_20220915_cn" ], "option_bold": [ - "event_20201126_cn", "event_20220915_cn", - "event_20260417_cn" + "event_20250424_cn" ] }, "Mode": { @@ -5524,29 +5499,24 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20201126_cn", "event_20220915_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_cn": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_en": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_jp": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_tw": [ "event_20220915_cn" ], "option_bold": [ - "event_20201126_cn", "event_20220915_cn", - "event_20260417_cn" + "event_20250424_cn" ] }, "Mode": { @@ -5947,29 +5917,24 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20201126_cn", "event_20220915_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_cn": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_en": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_jp": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_tw": [ "event_20220915_cn" ], "option_bold": [ - "event_20201126_cn", "event_20220915_cn", - "event_20260417_cn" + "event_20250424_cn" ] }, "Mode": { @@ -6370,29 +6335,24 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20201126_cn", "event_20220915_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_cn": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_en": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_jp": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_tw": [ "event_20220915_cn" ], "option_bold": [ - "event_20201126_cn", "event_20220915_cn", - "event_20260417_cn" + "event_20250424_cn" ] }, "Mode": { @@ -6793,29 +6753,24 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20201126_cn", "event_20220915_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_cn": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_en": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_jp": [ - "event_20201126_cn", - "event_20260417_cn" + "event_20250424_cn" ], "option_tw": [ "event_20220915_cn" ], "option_bold": [ - "event_20201126_cn", "event_20220915_cn", - "event_20260417_cn" + "event_20250424_cn" ] }, "Mode": { diff --git a/module/config/argument/override.yaml b/module/config/argument/override.yaml index faba1273a..0a7a6576c 100644 --- a/module/config/argument/override.yaml +++ b/module/config/argument/override.yaml @@ -57,11 +57,11 @@ Event: AmbushEvade: true EventPt: Event2MapName: - value: sp4 + value: HT3 type: state display: display EventDailyAMapName: - value: false + value: T1>T2>T3>HT1>HT2>HT3 type: state display: display EventDailySpMapName: @@ -77,7 +77,7 @@ Event: type: state display: display EventResetStageName: - value: sp1 + value: T1 type: state display: display diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 1b0c36f82..4f12aa487 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -1079,7 +1079,7 @@ "event_20241121_cn": "Dangerous Inventions Incoming", "event_20241219_cn": "Substellar Crepuscule", "event_20250227_cn": "Paradiso of Shackled Light", - "event_20250424_cn": "Toward Tulipa’s Seas", + "event_20250424_cn": "Toward Tulipa’s Seas Rerun", "event_20250520_cn": "A Rose on the High Tower", "event_20250724_cn": "The Alchemist and the Tower of Horizons", "event_20250814_cn": "Secrets of the Abyss", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 9680eb1f0..afeda9275 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -1079,7 +1079,7 @@ "event_20241121_cn": "危険発明接近中", "event_20241219_cn": "星降る夕影の残光", "event_20250227_cn": "籠檻に囚われし神光", - "event_20250424_cn": "チュリッパの海へ", + "event_20250424_cn": "チュリッパの海へ（復刻）", "event_20250520_cn": "高い塔の薔薇", "event_20250724_cn": "錬金術士と天空邂逅の塔", "event_20250814_cn": "淵層界の秘密", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 04f64b39b..880aa8c54 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -1079,7 +1079,7 @@ "event_20241121_cn": "危险发明迫近中", "event_20241219_cn": "星光下的余晖", "event_20250227_cn": "樊笼内的神光", - "event_20250424_cn": "扬起郁金之旗", + "event_20250424_cn": "复刻扬起郁金之旗", "event_20250520_cn": "高塔上的蔷薇", "event_20250724_cn": "优米雅的炼金工房", "event_20250814_cn": "奇渊下的秘密", diff --git a/module/eventstory/eventstory.py b/module/eventstory/eventstory.py index 55b98c2e7..e64ba8b55 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(2026, 4, 27, 12, 0, 0):#eventSet + if datetime.now() < datetime(2026, 5, 7, 12, 0, 0):#eventSet self.run_event_story() else: logger.info('Event story expired')