diff --git a/campaign/Readme.md b/campaign/Readme.md index 2c9330b53..53184cd30 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -281,4 +281,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20260129 | coalition 20260122 | Light & Shadow Fashion Shoot! | - | - | - | 光影風尚-拍攝進行時 | | 20260205 | raid 20240328 | From Zero to Hero | 复刻从零开始的魔王讨伐之旅 | From Zero to Hero Rerun | ゼロから頑張る魔王討伐(復刻) | - | | 20260212 | raid 20260212 | Spring Auction Adventure | 春宴怀玉香满庭 | Spring Auction Adventure | 新春玉逸品会 | 春宴懷玉香滿庭 | -| 20260226 | event 20260226 cn | Springtide Inn Online | 春满客栈Online | Springtide Inn Online | 春色旅籠Online | - | +| 20260226 | event 20260226 cn | Springtide Inn Online | 春满客栈Online | Springtide Inn Online | 春色旅籠Online | 春滿客棧Online | diff --git a/module/config/argument/args.json b/module/config/argument/args.json index fe703db49..258890f0b 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1635,7 +1635,6 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20220526_cn", "event_20260226_cn" ], "display": "hide", @@ -1649,10 +1648,9 @@ "event_20260226_cn" ], "option_tw": [ - "event_20220526_cn" + "event_20260226_cn" ], "option_bold": [ - "event_20220526_cn", "event_20260226_cn" ] }, @@ -1916,7 +1914,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220526_cn", "event_20260226_cn" ], "option_cn": [ @@ -1929,10 +1926,9 @@ "event_20260226_cn" ], "option_tw": [ - "event_20220526_cn" + "event_20260226_cn" ], "option_bold": [ - "event_20220526_cn", "event_20260226_cn" ] }, @@ -2311,7 +2307,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220526_cn", "event_20260226_cn" ], "option_cn": [ @@ -2324,10 +2319,9 @@ "event_20260226_cn" ], "option_tw": [ - "event_20220526_cn" + "event_20260226_cn" ], "option_bold": [ - "event_20220526_cn", "event_20260226_cn" ] }, @@ -4034,7 +4028,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220526_cn", "event_20260226_cn" ], "option_cn": [ @@ -4047,10 +4040,9 @@ "event_20260226_cn" ], "option_tw": [ - "event_20220526_cn" + "event_20260226_cn" ], "option_bold": [ - "event_20220526_cn", "event_20260226_cn" ] }, @@ -4446,7 +4438,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220526_cn", "event_20260226_cn" ], "option_cn": [ @@ -4459,10 +4450,9 @@ "event_20260226_cn" ], "option_tw": [ - "event_20220526_cn" + "event_20260226_cn" ], "option_bold": [ - "event_20220526_cn", "event_20260226_cn" ] }, @@ -4858,7 +4848,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220526_cn", "event_20260226_cn" ], "option_cn": [ @@ -4871,10 +4860,9 @@ "event_20260226_cn" ], "option_tw": [ - "event_20220526_cn" + "event_20260226_cn" ], "option_bold": [ - "event_20220526_cn", "event_20260226_cn" ] }, @@ -5270,7 +5258,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220526_cn", "event_20260226_cn" ], "option_cn": [ @@ -5283,10 +5270,9 @@ "event_20260226_cn" ], "option_tw": [ - "event_20220526_cn" + "event_20260226_cn" ], "option_bold": [ - "event_20220526_cn", "event_20260226_cn" ] }, @@ -5672,7 +5658,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220526_cn", "event_20260226_cn" ], "option_cn": [ @@ -5685,10 +5670,9 @@ "event_20260226_cn" ], "option_tw": [ - "event_20220526_cn" + "event_20260226_cn" ], "option_bold": [ - "event_20220526_cn", "event_20260226_cn" ] }, diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 7687ff8aa..994f878f3 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -766,7 +766,7 @@ "event_20250912_cn": "起舞於天原之上", "event_20251023_cn": "颶風與自由群島", "event_20251218_cn": "響徹於天穹之音", - "event_20260226_cn": "Springtide Inn Online", + "event_20260226_cn": "春滿客棧Online", "raid_20200624": "特別演習埃塞克斯級(復刻)", "raid_20210708": "復刻穿越彼方的水線", "raid_20220127": "演習神秘事件調查", diff --git a/module/eventstory/eventstory.py b/module/eventstory/eventstory.py index 81c20bdbb..1a941e338 100644 --- a/module/eventstory/eventstory.py +++ b/module/eventstory/eventstory.py @@ -201,6 +201,14 @@ class EventStory(CampaignUI, Combat, LoginHandler): return 'unknown' def run(self): + event = self.config.cross_get('Event.Campaign.Event', '') + if event in [ + # event story is in event minigame + 'event_20260226_cn', + ]: + logger.info(f'Current event ({event}) does not have event story, stopped') + return + if not self.device.app_is_running(): logger.warning('Game is not running, start it') self.app_start()