From 31efe2a054eca81c40470e46dfb2b237e2281ab0 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Sat, 18 Apr 2026 00:18:14 +0800 Subject: [PATCH] =?UTF-8?q?Add:=20Event=20entrance=20of=20Vacation=20Lane?= =?UTF-8?q?=20=E2=80=93=20Beachside=20Brilliance=20(event=5F20260417=5Fcn)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- campaign/Readme.md | 1 + module/base/button.py | 3 +- module/config/argument/args.json | 80 ++++++++++++++++---------------- module/config/i18n/en-US.json | 1 + module/config/i18n/ja-JP.json | 1 + module/config/i18n/zh-CN.json | 1 + module/config/i18n/zh-TW.json | 1 + 7 files changed, 47 insertions(+), 41 deletions(-) diff --git a/campaign/Readme.md b/campaign/Readme.md index 2b5d1c16d..133585698 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -287,3 +287,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20260326 | event 20260326 cn | The Vagabond’s Recruitment Plan | 漫游者招募计划 | The Vagabond’s Recruitment Plan | ワンダラー募集計画 | - | | 20260402 | event 20260326 cn | The Vagabond’s Recruitment Plan | - | - | - | 漫遊者招募計劃 | | 20260416 | event 20220915 cn | Violet Tempest Blooming Lycoris | - | - | - | 復刻紫絳槿嵐 | +| 20260417 | event 20260417 cn | Vacation Lane – Beachside Brilliance | 假日航线闪耀海滨 | Vacation Lane – Beachside Brilliance | バケーションレーン・きらめく砂浜 | - | diff --git a/module/base/button.py b/module/base/button.py index eaf6ff62b..a24ed4ba3 100644 --- a/module/base/button.py +++ b/module/base/button.py @@ -1,13 +1,13 @@ import os import traceback -import imageio from PIL import ImageDraw from module.base.decorator import cached_property from module.base.resource import Resource from module.base.utils import * from module.config.server import VALID_SERVER +from module.logger import logger class Button(Resource): @@ -153,6 +153,7 @@ class Button(Resource): if not self._match_init: if self.is_gif: self.image = [] + import imageio for image in imageio.mimread(self.file): image = image[:, :, :3].copy() if len(image.shape) == 3 else image image = crop(image, self.area) diff --git a/module/config/argument/args.json b/module/config/argument/args.json index dd7808213..5fae5286f 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1643,24 +1643,24 @@ "value": "campaign_main", "option": [ "event_20220915_cn", - "event_20260326_cn" + "event_20260417_cn" ], "display": "hide", "option_cn": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_en": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_jp": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_tw": [ "event_20220915_cn" ], "option_bold": [ "event_20220915_cn", - "event_20260326_cn" + "event_20260417_cn" ] }, "Mode": { @@ -1926,23 +1926,23 @@ "value": "campaign_main", "option": [ "event_20220915_cn", - "event_20260326_cn" + "event_20260417_cn" ], "option_cn": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_en": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_jp": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_tw": [ "event_20220915_cn" ], "option_bold": [ "event_20220915_cn", - "event_20260326_cn" + "event_20260417_cn" ] }, "Mode": { @@ -2323,23 +2323,23 @@ "value": "campaign_main", "option": [ "event_20220915_cn", - "event_20260326_cn" + "event_20260417_cn" ], "option_cn": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_en": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_jp": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_tw": [ "event_20220915_cn" ], "option_bold": [ "event_20220915_cn", - "event_20260326_cn" + "event_20260417_cn" ] }, "Mode": { @@ -4050,23 +4050,23 @@ "value": "campaign_main", "option": [ "event_20220915_cn", - "event_20260326_cn" + "event_20260417_cn" ], "option_cn": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_en": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_jp": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_tw": [ "event_20220915_cn" ], "option_bold": [ "event_20220915_cn", - "event_20260326_cn" + "event_20260417_cn" ] }, "Mode": { @@ -4464,23 +4464,23 @@ "value": "campaign_main", "option": [ "event_20220915_cn", - "event_20260326_cn" + "event_20260417_cn" ], "option_cn": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_en": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_jp": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_tw": [ "event_20220915_cn" ], "option_bold": [ "event_20220915_cn", - "event_20260326_cn" + "event_20260417_cn" ] }, "Mode": { @@ -4878,23 +4878,23 @@ "value": "campaign_main", "option": [ "event_20220915_cn", - "event_20260326_cn" + "event_20260417_cn" ], "option_cn": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_en": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_jp": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_tw": [ "event_20220915_cn" ], "option_bold": [ "event_20220915_cn", - "event_20260326_cn" + "event_20260417_cn" ] }, "Mode": { @@ -5292,23 +5292,23 @@ "value": "campaign_main", "option": [ "event_20220915_cn", - "event_20260326_cn" + "event_20260417_cn" ], "option_cn": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_en": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_jp": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_tw": [ "event_20220915_cn" ], "option_bold": [ "event_20220915_cn", - "event_20260326_cn" + "event_20260417_cn" ] }, "Mode": { @@ -5696,23 +5696,23 @@ "value": "campaign_main", "option": [ "event_20220915_cn", - "event_20260326_cn" + "event_20260417_cn" ], "option_cn": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_en": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_jp": [ - "event_20260326_cn" + "event_20260417_cn" ], "option_tw": [ "event_20220915_cn" ], "option_bold": [ "event_20220915_cn", - "event_20260326_cn" + "event_20260417_cn" ] }, "Mode": { diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 5b01b62cd..93c58789c 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -769,6 +769,7 @@ "event_20251218_cn": "A Note Through the Firmament", "event_20260226_cn": "Springtide Inn Online", "event_20260326_cn": "The Vagabond’s Recruitment Plan", + "event_20260417_cn": "Vacation Lane – Beachside Brilliance", "raid_20200624": "Air Raid Drills with Essex Rerun", "raid_20210708": "Cross Wave rerun", "raid_20220127": "Mystery Investigation", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 2005c4584..acf88f7af 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -769,6 +769,7 @@ "event_20251218_cn": "天穹に響く音謡", "event_20260226_cn": "春色旅籠Online", "event_20260326_cn": "ワンダラー募集計画", + "event_20260417_cn": "バケーションレーン・きらめく砂浜", "raid_20200624": "特別演習超空強襲波（復刻）", "raid_20210708": "交錯する新たな波 (復刻)", "raid_20220127": "秘密事件調査", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index f76b0b2f8..a38fe95d5 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -769,6 +769,7 @@ "event_20251218_cn": "响彻于天穹之音", "event_20260226_cn": "春满客栈Online", "event_20260326_cn": "漫游者招募计划", + "event_20260417_cn": "假日航线闪耀海滨", "raid_20200624": "复刻特别演习埃塞克斯级", "raid_20210708": "复刻穿越彼方的水线", "raid_20220127": "演习神秘事件调查", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 24ae80edc..b6879cfb3 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -769,6 +769,7 @@ "event_20251218_cn": "響徹於天穹之音", "event_20260226_cn": "春滿客棧Online", "event_20260326_cn": "漫遊者招募計劃", + "event_20260417_cn": "Vacation Lane – Beachside Brilliance", "raid_20200624": "特別演習埃塞克斯級(復刻)", "raid_20210708": "復刻穿越彼方的水線", "raid_20220127": "演習神秘事件調查",