From 2a069c6a964642c632ee24496d35d95607ce54eb Mon Sep 17 00:00:00 2001 From: xtaodada Date: Thu, 12 Oct 2023 21:06:09 +0800 Subject: [PATCH] :bug: Fix daily material game v4.1 --- plugins/genshin/daily/material.py | 8 ++++---- resources/genshin/daily_material/bg/area/4.png | Bin 0 -> 8898 bytes resources/genshin/daily_material/style.css | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 resources/genshin/daily_material/bg/area/4.png diff --git a/plugins/genshin/daily/material.py b/plugins/genshin/daily/material.py index 89304e9..d8aa9bf 100644 --- a/plugins/genshin/daily/material.py +++ b/plugins/genshin/daily/material.py @@ -46,7 +46,7 @@ INTERVAL = 1 DATA_TYPE = Dict[str, List[List[str]]] DATA_FILE_PATH = Path(__file__).joinpath("../daily.json").resolve() -DOMAINS = ["忘却之峡", "太山府", "菫色之庭", "昏识塔", "塞西莉亚苗圃", "震雷连山密宫", "砂流之庭", "有顶塔", "苍白的遗荣", "深潮的余响"] +DOMAINS = ["忘却之峡", "太山府", "菫色之庭", "昏识塔", "苍白的遗荣", "塞西莉亚苗圃", "震雷连山密宫", "砂流之庭", "有顶塔", "深潮的余响"] DOMAIN_AREA_MAP = dict(zip(DOMAINS, ["蒙德", "璃月", "稻妻", "须弥", "枫丹"] * 2)) WEEK_MAP = ["一", "二", "三", "四", "五", "六", "日"] @@ -242,7 +242,7 @@ class DailyMaterial(Plugin): for domain, sche in self.data.items(): domain = domain.strip() area = DOMAIN_AREA_MAP[domain] # 获取秘境所在的区域 - type_ = "avatar" if DOMAINS.index(domain) < 4 else "weapon" # 获取秘境的培养素材的类型:是天赋书还是武器突破材料 + type_ = "avatar" if DOMAINS.index(domain) < 5 else "weapon" # 获取秘境的培养素材的类型:是天赋书还是武器突破材料 # 将读取到的数据存入 local_data 中 local_data[type_].append({"name": area, "materials": sche[weekday][0], "items": sche[weekday][1]}) @@ -327,14 +327,14 @@ class DailyMaterial(Plugin): self.template_service.render( # 渲染角色素材页 "genshin/daily_material/character.jinja2", {"data": render_data}, - {"width": 1164, "height": 500}, + {"width": 2268, "height": 500}, file_type=file_type, ttl=30 * 24 * 60 * 60, ), self.template_service.render( # 渲染武器素材页 "genshin/daily_material/weapon.jinja2", {"data": render_data}, - {"width": 1164, "height": 500}, + {"width": 2268, "height": 500}, file_type=file_type, ttl=30 * 24 * 60 * 60, ), diff --git a/resources/genshin/daily_material/bg/area/4.png b/resources/genshin/daily_material/bg/area/4.png new file mode 100644 index 0000000000000000000000000000000000000000..a206e147b432f616c45d9709646ec9baa32eb28a GIT binary patch literal 8898 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