diff --git a/campaign/Readme.md b/campaign/Readme.md index 45596360c..aa078e5e7 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -282,4 +282,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 59228fe03..83435332f 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1938,7 +1938,6 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20220526_cn", "event_20260226_cn" ], "display": "hide", @@ -1952,10 +1951,9 @@ "event_20260226_cn" ], "option_tw": [ - "event_20220526_cn" + "event_20260226_cn" ], "option_bold": [ - "event_20220526_cn", "event_20260226_cn" ] }, @@ -2353,7 +2351,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220526_cn", "event_20260226_cn" ], "option_cn": [ @@ -2366,10 +2363,9 @@ "event_20260226_cn" ], "option_tw": [ - "event_20220526_cn" + "event_20260226_cn" ], "option_bold": [ - "event_20220526_cn", "event_20260226_cn" ] }, @@ -2761,7 +2757,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220526_cn", "event_20260226_cn" ], "option_cn": [ @@ -2774,10 +2769,9 @@ "event_20260226_cn" ], "option_tw": [ - "event_20220526_cn" + "event_20260226_cn" ], "option_bold": [ - "event_20220526_cn", "event_20260226_cn" ] }, @@ -4556,7 +4550,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220526_cn", "event_20260226_cn" ], "option_cn": [ @@ -4569,10 +4562,9 @@ "event_20260226_cn" ], "option_tw": [ - "event_20220526_cn" + "event_20260226_cn" ], "option_bold": [ - "event_20220526_cn", "event_20260226_cn" ] }, @@ -4982,7 +4974,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220526_cn", "event_20260226_cn" ], "option_cn": [ @@ -4995,10 +4986,9 @@ "event_20260226_cn" ], "option_tw": [ - "event_20220526_cn" + "event_20260226_cn" ], "option_bold": [ - "event_20220526_cn", "event_20260226_cn" ] }, @@ -5408,7 +5398,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220526_cn", "event_20260226_cn" ], "option_cn": [ @@ -5421,10 +5410,9 @@ "event_20260226_cn" ], "option_tw": [ - "event_20220526_cn" + "event_20260226_cn" ], "option_bold": [ - "event_20220526_cn", "event_20260226_cn" ] }, @@ -5834,7 +5822,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220526_cn", "event_20260226_cn" ], "option_cn": [ @@ -5847,10 +5834,9 @@ "event_20260226_cn" ], "option_tw": [ - "event_20220526_cn" + "event_20260226_cn" ], "option_bold": [ - "event_20220526_cn", "event_20260226_cn" ] }, @@ -6250,7 +6236,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220526_cn", "event_20260226_cn" ], "option_cn": [ @@ -6263,10 +6248,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 cd00aa855..d856fc59b 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -788,7 +788,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 72593b489..34f4d9eb9 100644 --- a/module/eventstory/eventstory.py +++ b/module/eventstory/eventstory.py @@ -202,6 +202,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()