From 67b4b9fe36659460a7b057c13aa97a40ea5505e7 Mon Sep 17 00:00:00 2001 From: W1NDes Date: Thu, 13 Nov 2025 15:15:30 +0800 Subject: [PATCH] Upd(Event): regular event update --- campaign/Readme.md | 1 + campaign/event_20230914_cn/a1.py | 4 +- campaign/event_20230914_cn/b1.py | 4 +- campaign/event_20230914_cn/c1.py | 4 +- campaign/event_20230914_cn/d1.py | 4 +- config/template.json | 8 +-- module/config/argument/args.json | 98 ++++++++++++++-------------- module/config/argument/override.yaml | 8 +-- module/config/i18n/en-US.json | 2 +- module/config/i18n/ja-JP.json | 2 +- module/config/i18n/zh-CN.json | 2 +- 11 files changed, 73 insertions(+), 64 deletions(-) diff --git a/campaign/Readme.md b/campaign/Readme.md index c88eea3a1..c35252bf2 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -266,3 +266,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20251023 | event 20251023 cn | Tempesta and Islas de Libertád | 飓风与自由群岛 | Tempesta and Islas de Libertád | テンペスタと自由群島 | - | | 20251106 | event 20230803 cn | Anthem of Remembrance | 复刻奏响鸢尾之歌 | Anthem of Remembrance Rerun | 燃ゆる聖都の回想曲（復刻） | - | | 20251106 | event 20250227 cn | Paradiso of Shackled Light | - | - | - | 樊籠內的神光 | +| 20251113 | event 20230914 cn | Effulgence Before Eclipse | 复刻须臾望月抄 | Effulgence Before Eclipse Rerun | 須臾望月抄（復刻） | - | diff --git a/campaign/event_20230914_cn/a1.py b/campaign/event_20230914_cn/a1.py index 447dcae3a..9a7ee2a89 100644 --- a/campaign/event_20230914_cn/a1.py +++ b/campaign/event_20230914_cn/a1.py @@ -76,7 +76,9 @@ class Config: MAP_SWIPE_MULTIPLY = (1.074, 1.095) MAP_SWIPE_MULTIPLY_MINITOUCH = (1.039, 1.058) MAP_SWIPE_MULTIPLY_MAATOUCH = (1.009, 1.027) - + STAGE_INCREASE_CUSTOM = [ + 'A1 > A2 > A3 > B1 > B2 > B3 > C1 > C2 > C3 > D1 > D2 > D3', + ] class Campaign(CampaignBase): MAP = MAP diff --git a/campaign/event_20230914_cn/b1.py b/campaign/event_20230914_cn/b1.py index ed6df54e8..8a0a57f89 100644 --- a/campaign/event_20230914_cn/b1.py +++ b/campaign/event_20230914_cn/b1.py @@ -75,7 +75,9 @@ class Config: MAP_SWIPE_MULTIPLY = (1.146, 1.167) MAP_SWIPE_MULTIPLY_MINITOUCH = (1.108, 1.128) MAP_SWIPE_MULTIPLY_MAATOUCH = (1.076, 1.095) - + STAGE_INCREASE_CUSTOM = [ + 'A1 > A2 > A3 > B1 > B2 > B3 > C1 > C2 > C3 > D1 > D2 > D3', + ] class Campaign(CampaignBase): MAP = MAP diff --git a/campaign/event_20230914_cn/c1.py b/campaign/event_20230914_cn/c1.py index 9ecf8bfdf..5baeb29b0 100644 --- a/campaign/event_20230914_cn/c1.py +++ b/campaign/event_20230914_cn/c1.py @@ -61,7 +61,9 @@ class Config: MAP_SWIPE_MULTIPLY = (1.074, 1.095) MAP_SWIPE_MULTIPLY_MINITOUCH = (1.039, 1.058) MAP_SWIPE_MULTIPLY_MAATOUCH = (1.009, 1.027) - + STAGE_INCREASE_CUSTOM = [ + 'A1 > A2 > A3 > B1 > B2 > B3 > C1 > C2 > C3 > D1 > D2 > D3', + ] class Campaign(CampaignBase): MAP = MAP diff --git a/campaign/event_20230914_cn/d1.py b/campaign/event_20230914_cn/d1.py index dc752a208..721e2c5af 100644 --- a/campaign/event_20230914_cn/d1.py +++ b/campaign/event_20230914_cn/d1.py @@ -75,7 +75,9 @@ class Config: MAP_SWIPE_MULTIPLY = (1.146, 1.167) MAP_SWIPE_MULTIPLY_MINITOUCH = (1.108, 1.128) MAP_SWIPE_MULTIPLY_MAATOUCH = (1.076, 1.095) - + STAGE_INCREASE_CUSTOM = [ + 'A1 > A2 > A3 > B1 > B2 > B3 > C1 > C2 > C3 > D1 > D2 > D3', + ] class Campaign(CampaignBase): MAP = MAP diff --git a/config/template.json b/config/template.json index 5a04e7159..fd8fde938 100644 --- a/config/template.json +++ b/config/template.json @@ -491,10 +491,10 @@ }, "EventPt": { "EventPtSwitch": false, - "Event2MapName": "SP3", - "EventDailyAMapName": "sp1 > sp2 > sp3", - "EventDailySpMapName": false, - "EventDailyCD": false + "Event2MapName": "d3", + "EventDailyAMapName": "a1 > a2 > a3 > b1 > b2 > b3", + "EventDailySpMapName": "sp", + "EventDailyCD": "c1 > c2 > c3 > d1 > d2 > d3" }, "Fleet": { "Fleet1": 1, diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 1c12edaa1..583fcf537 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1977,24 +1977,24 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20230803_cn", + "event_20230914_cn", "event_20250227_cn" ], "display": "hide", "option_cn": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_en": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_jp": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_tw": [ "event_20250227_cn" ], "option_bold": [ - "event_20230803_cn", + "event_20230914_cn", "event_20250227_cn" ] }, @@ -2258,23 +2258,23 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20230803_cn", + "event_20230914_cn", "event_20250227_cn" ], "option_cn": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_en": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_jp": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_tw": [ "event_20250227_cn" ], "option_bold": [ - "event_20230803_cn", + "event_20230914_cn", "event_20250227_cn" ] }, @@ -2349,22 +2349,22 @@ }, "Event2MapName": { "type": "state", - "value": "SP3", + "value": "d3", "display": "display" }, "EventDailyAMapName": { "type": "state", - "value": "sp1 > sp2 > sp3", + "value": "a1 > a2 > a3 > b1 > b2 > b3", "display": "display" }, "EventDailySpMapName": { "type": "state", - "value": false, + "value": "sp", "display": "display" }, "EventDailyCD": { "type": "state", - "value": false, + "value": "c1 > c2 > c3 > d1 > d2 > d3", "display": "display" } }, @@ -2679,23 +2679,23 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20230803_cn", + "event_20230914_cn", "event_20250227_cn" ], "option_cn": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_en": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_jp": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_tw": [ "event_20250227_cn" ], "option_bold": [ - "event_20230803_cn", + "event_20230914_cn", "event_20250227_cn" ] }, @@ -3074,23 +3074,23 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20230803_cn", + "event_20230914_cn", "event_20250227_cn" ], "option_cn": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_en": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_jp": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_tw": [ "event_20250227_cn" ], "option_bold": [ - "event_20230803_cn", + "event_20230914_cn", "event_20250227_cn" ] }, @@ -4824,23 +4824,23 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20230803_cn", + "event_20230914_cn", "event_20250227_cn" ], "option_cn": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_en": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_jp": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_tw": [ "event_20250227_cn" ], "option_bold": [ - "event_20230803_cn", + "event_20230914_cn", "event_20250227_cn" ] }, @@ -5240,23 +5240,23 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20230803_cn", + "event_20230914_cn", "event_20250227_cn" ], "option_cn": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_en": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_jp": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_tw": [ "event_20250227_cn" ], "option_bold": [ - "event_20230803_cn", + "event_20230914_cn", "event_20250227_cn" ] }, @@ -5656,23 +5656,23 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20230803_cn", + "event_20230914_cn", "event_20250227_cn" ], "option_cn": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_en": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_jp": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_tw": [ "event_20250227_cn" ], "option_bold": [ - "event_20230803_cn", + "event_20230914_cn", "event_20250227_cn" ] }, @@ -6072,23 +6072,23 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20230803_cn", + "event_20230914_cn", "event_20250227_cn" ], "option_cn": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_en": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_jp": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_tw": [ "event_20250227_cn" ], "option_bold": [ - "event_20230803_cn", + "event_20230914_cn", "event_20250227_cn" ] }, @@ -6488,23 +6488,23 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20230803_cn", + "event_20230914_cn", "event_20250227_cn" ], "option_cn": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_en": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_jp": [ - "event_20230803_cn" + "event_20230914_cn" ], "option_tw": [ "event_20250227_cn" ], "option_bold": [ - "event_20230803_cn", + "event_20230914_cn", "event_20250227_cn" ] }, diff --git a/module/config/argument/override.yaml b/module/config/argument/override.yaml index b2a238045..9b0b31eda 100644 --- a/module/config/argument/override.yaml +++ b/module/config/argument/override.yaml @@ -61,19 +61,19 @@ Event: AmbushEvade: true EventPt: Event2MapName: - value: SP3 + value: d3 type: state display: display EventDailyAMapName: - value: sp1 > sp2 > sp3 + value: a1 > a2 > a3 > b1 > b2 > b3 type: state display: display EventDailySpMapName: - value: false + value: sp type: state display: display EventDailyCD: - value: false + value: c1 > c2 > c3 > d1 > d2 > d3 type: state display: display diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 5c9b45e28..417044056 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -1060,7 +1060,7 @@ "event_20230525_cn": "Confluence of Nothingness Rerun", "event_20230803_cn": "Anthem of Remembrance Rerun", "event_20230817_cn": "The Fools Scales Rerun", - "event_20230914_cn": "Effulgence Before Eclipse", + "event_20230914_cn": "Effulgence Before Eclipse Rerun", "event_20231026_cn": "Tempesta and the Fountain of Youth", "event_20231123_cn": "The Ninja Scrolls: Azur Flash", "event_20231221_cn": "Light-Chasing Sea of Stars", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 4abba1566..2a492035f 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -1060,7 +1060,7 @@ "event_20230525_cn": "覆天せし万象の塵（復刻）", "event_20230803_cn": "燃ゆる聖都の回想曲（復刻）", "event_20230817_cn": "愚者の天秤（復刻）", - "event_20230914_cn": "須臾望月抄", + "event_20230914_cn": "須臾望月抄（復刻）", "event_20231026_cn": "テンペスタと若返りの泉", "event_20231123_cn": "蒼閃忍法帖", "event_20231221_cn": "光追う星の海", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index b977edae6..239c97d0c 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -1060,7 +1060,7 @@ "event_20230525_cn": "复刻空相交汇点", "event_20230803_cn": "复刻奏响鸢尾之歌", "event_20230817_cn": "复刻愚者的天平", - "event_20230914_cn": "须臾望月抄", + "event_20230914_cn": "复刻须臾望月抄", "event_20231026_cn": "飓风与青春之泉", "event_20231123_cn": "苍闪忍法帖", "event_20231221_cn": "星海逐光",