From e2f551535394609c9c1ad38d14d73c1317e9eb2f Mon Sep 17 00:00:00 2001 From: xtaodada Date: Mon, 29 Jul 2024 20:32:34 +0800 Subject: [PATCH] :bug: Fix calendar img theater --- .../apihelper/client/components/calendar.py | 46 ++++++++++++++----- modules/apihelper/models/genshin/calendar.py | 1 + resources/genshin/calendar/calendar.css | 8 ++++ resources/genshin/calendar/calendar.jinja2 | 13 +++++- 4 files changed, 56 insertions(+), 12 deletions(-) diff --git a/modules/apihelper/client/components/calendar.py b/modules/apihelper/client/components/calendar.py index 381b4e33..e3d17d9e 100644 --- a/modules/apihelper/client/components/calendar.py +++ b/modules/apihelper/client/components/calendar.py @@ -41,7 +41,7 @@ class Calendar: 762, # 《原神》公平运营声明 ] IGNORE_RE = re.compile( - r"(内容专题页|版本更新说明|调研|防沉迷|米游社|专项意见|更新修复与优化|问卷调查|版本更新通知|更新时间说明|预下载功能|周边限时|周边上新|角色演示)" + r"(内容专题页|版本更新说明|调研|防沉迷|米游社|专项意见|更新修复与优化|问卷调查|版本更新通知|更新时间说明|预下载功能|周边限时|周边上新|角色演示|攻略征集)" ) FULL_TIME_RE = re.compile(r"(魔神任务)") @@ -242,6 +242,8 @@ class Calendar: act.type = ActEnum.no_display elif act.title == "深渊": act.type = ActEnum.abyss + elif act.title == "幻想真境剧诗": + act.type = ActEnum.img_theater async def get_list( self, @@ -275,26 +277,25 @@ class Calendar: return act @staticmethod - def get_abyss_cal(start_time: datetime, end_time: datetime) -> List[List[Union[datetime, str]]]: - """获取深渊日历""" + def _get_abyss_cal(start_time: datetime, end_time: datetime, day: int) -> List[List[Union[datetime, str]]]: last = datetime.now().replace(day=1) - timedelta(days=2) last_month = last.month curr = datetime.now() curr_month = curr.month next_date = last + timedelta(days=40) next_month = next_date.month + next_next_date = next_date + timedelta(days=40) - def start(date: datetime, up: bool = False): - return date.replace(day=1 if up else 16, hour=4, minute=0, second=0, microsecond=0) + def start(date: datetime): + return date.replace(day=day, hour=4, minute=0, second=0, microsecond=0) - def end(date: datetime, up: bool = False): - return date.replace(day=1 if up else 16, hour=3, minute=59, second=59, microsecond=999999) + def end(date: datetime): + return date.replace(day=day, hour=3, minute=59, second=59, microsecond=999999) check = [ - [start(last, False), end(last, True), f"{last_month}月下半"], - [start(curr, True), end(curr, False), f"{curr_month}月上半"], - [start(curr, False), end(next_date, True), f"{curr_month}月下半"], - [start(next_date, True), end(next_date, False), f"{next_month}月上半"], + [start(last), end(curr), f"{last_month}月"], + [start(curr), end(next_date), f"{curr_month}月"], + [start(next_date), end(next_next_date), f"{next_month}月"], ] ret = [] for ds in check: @@ -303,6 +304,16 @@ class Calendar: ret.append(ds) return ret + @staticmethod + def get_abyss_cal(start_time: datetime, end_time: datetime) -> List[List[Union[datetime, str]]]: + """获取深渊日历""" + return Calendar._get_abyss_cal(start_time, end_time, 16) + + @staticmethod + def get_img_theater_cal(start_time: datetime, end_time: datetime) -> List[List[Union[datetime, str]]]: + """获取幻想真境剧诗日历""" + return Calendar._get_abyss_cal(start_time, end_time, 1) + async def get_birthday_char( self, date_list: List[Date], assets: "AssetsService" ) -> Tuple[int, Dict[str, Dict[str, List[BirthChar]]]]: @@ -374,6 +385,7 @@ class Calendar: birthday_char_line, birthday_chars = await self.get_birthday_char(date_list, assets) target: List[FinalAct] = [] abyss: List[FinalAct] = [] + img_theater: List[FinalAct] = [] for ds in list_data[1]: if act := await self.get_list(ds, start_time, end_time, total_range, time_map, True, assets): @@ -381,6 +393,7 @@ class Calendar: for ds in list_data[0]: if act := await self.get_list(ds, start_time, end_time, total_range, time_map, False, assets): target.append(act) + # 深渊 abyss_cal = self.get_abyss_cal(start_time, end_time) for t in abyss_cal: ds = ActDetail( @@ -390,6 +403,16 @@ class Calendar: ) if act := await self.get_list(ds, start_time, end_time, total_range, {}, True, assets): abyss.append(act) + # 幻想真境剧 + img_theater_cal = self.get_img_theater_cal(start_time, end_time) + for t in img_theater_cal: + ds = ActDetail( + title=f"「幻想真境剧诗」· {t[2]}", + start_time=t[0].strftime("%Y-%m-%d %H:%M:%S"), + end_time=t[1].strftime("%Y-%m-%d %H:%M:%S"), + ) + if act := await self.get_list(ds, start_time, end_time, total_range, {}, True, assets): + img_theater.append(act) target.sort(key=lambda x: (x.sort, x.start, x.duration)) target, char_count, char_old = self.merge_list(target) return { @@ -397,6 +420,7 @@ class Calendar: "now_left": now_left, "list": target, "abyss": abyss, + "img_theater": img_theater, "char_mode": f"char-{char_count}-{char_old}", "now_time": now.strftime("%Y-%m-%d %H 时"), "birthday_char_line": birthday_char_line, diff --git a/modules/apihelper/models/genshin/calendar.py b/modules/apihelper/models/genshin/calendar.py index 89469307..24da4556 100644 --- a/modules/apihelper/models/genshin/calendar.py +++ b/modules/apihelper/models/genshin/calendar.py @@ -22,6 +22,7 @@ class ActEnum(str, Enum): normal = "normal" no_display = "pass" abyss = "abyss" + img_theater = "img_theater" def __str__(self) -> str: return self.value diff --git a/resources/genshin/calendar/calendar.css b/resources/genshin/calendar/calendar.css index 04db4eaf..704e6884 100644 --- a/resources/genshin/calendar/calendar.css +++ b/resources/genshin/calendar/calendar.css @@ -295,6 +295,14 @@ body { background: url("img/abyss.jpg") #333465 top right no-repeat; position: absolute; } +.cal-item-img { + background: url("../role_combat/background/lookback-bg.jpg") #3d2a35 top right no-repeat!important; +} +.cal-item-img .info { + background: none; + color: #d3bc8d; + background-image: linear-gradient(to right, #3d2a35, #3d2a35 80%, rgba(51, 52, 101, 0) 100%)!important; +} .cal-abyss-cont .cal-item .info { background: none; color: #d3bc8d; diff --git a/resources/genshin/calendar/calendar.jinja2 b/resources/genshin/calendar/calendar.jinja2 index f8ac6def..d8c973ce 100644 --- a/resources/genshin/calendar/calendar.jinja2 +++ b/resources/genshin/calendar/calendar.jinja2 @@ -68,6 +68,17 @@ {% endfor %} +
+ {% for li in img_theater %} +
+
+ + {{ li.title }} + {{ li.label }} +
+
+ {% endfor %} +
{% for lis in list %} {% for li in lis %}
{{ now_time }}
-
Inspired By Miao-Plugin
+
Inspired By Miao-Plugin & Generated By PaiGram
\ No newline at end of file