From eed418477ff73baf4167c8fca1c6ab941899513d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B4=9B=E6=B0=B4=E5=B1=85=E5=AE=A4?= Date: Tue, 9 May 2023 19:01:45 +0800 Subject: [PATCH] :recycle: Rename HTML templates to use .jinja2 extension Previously, all templates were named with the .html extension, which caused problems for editors to recognize the Jinja2 syntax used in them. In this commit, all templates have been renamed to use the .jinja2 extension to better reflect their use of Jinja2 and to improve editor recognition. --- plugins/genshin/abyss.py | 8 +- plugins/genshin/abyss_team.py | 2 +- plugins/genshin/avatar_list.py | 2 +- plugins/genshin/calendar.py | 2 +- plugins/genshin/daily/material.py | 4 +- plugins/genshin/daily_note.py | 2 +- plugins/genshin/help.py | 2 +- plugins/genshin/ledger.py | 2 +- plugins/genshin/material.py | 2 +- plugins/genshin/player_cards.py | 9 +- plugins/genshin/stats.py | 7 +- plugins/genshin/weapon.py | 2 +- plugins/genshin/wish.py | 2 +- .../bot/help/{help.html => example.html} | 2 +- resources/bot/help/help.jinja2 | 255 ++++++++++++++++++ .../abyss/{floor.html => floor.jinja2} | 3 +- .../abyss/{overview.html => overview.jinja2} | 3 +- .../{abyss_team.html => abyss_team.jinja2} | 0 .../avatar_list/{main.html => main.jinja2} | 0 .../{calendar.html => calendar.jinja2} | 0 .../{character.html => character.jinja2} | 0 .../{weapon.html => weapon.jinja2} | 0 .../{daily_note.html => daily_note.jinja2} | 0 .../ledger/{ledger.html => ledger.jinja2} | 0 ...es_material.html => roles_material.jinja2} | 0 .../{artifacts.html => artifacts.jinja2} | 0 ...stellations.html => constellations.jinja2} | 0 .../{holder.html => holder.jinja2} | 0 ...der_example.html => holder_example.jinja2} | 0 .../{player_card.html => player_card.jinja2} | 14 +- .../player_card/{score.html => score.jinja2} | 0 .../{skills.html => skills.jinja2} | 0 .../player_card/{stats.html => stats.jinja2} | 0 .../{weapon.html => weapon.jinja2} | 0 .../stats/{stats.html => stats.jinja2} | 0 .../weapon/{weapon.html => weapon.jinja2} | 0 .../{gacha => wish}/items/Electric.png | Bin .../genshin/{gacha => wish}/items/Fire.png | Bin .../genshin/{gacha => wish}/items/Grass.png | Bin .../genshin/{gacha => wish}/items/Ice.png | Bin .../genshin/{gacha => wish}/items/Rock.png | Bin .../{gacha => wish}/items/WEAPON_BOW.png | Bin .../{gacha => wish}/items/WEAPON_CATALYST.png | Bin .../{gacha => wish}/items/WEAPON_CLAYMORE.png | Bin .../{gacha => wish}/items/WEAPON_POLE.png | Bin .../items/WEAPON_SWORD_ONE_HAND.png | Bin .../genshin/{gacha => wish}/items/Water.png | Bin .../genshin/{gacha => wish}/items/Wind.png | Bin .../{gacha => wish}/items/background.jpg | Bin .../genshin/{gacha => wish}/items/bg.png | Bin .../genshin/{gacha => wish}/items/bg2.png | Bin .../{gacha => wish}/items/bgWeapon.png | Bin .../genshin/{gacha => wish}/items/s-3.png | Bin .../genshin/{gacha => wish}/items/s-4.png | Bin .../genshin/{gacha => wish}/items/s-5.png | Bin .../{gacha => wish}/items/shadow-3.png | Bin .../{gacha => wish}/items/shadow-4.png | Bin .../{gacha => wish}/items/shadow-5-1.png | Bin .../{gacha => wish}/items/shadow-5-2.png | Bin .../{gacha => wish}/items/shadow-5-3.png | Bin .../{gacha => wish}/items/shadow-5-4.png | Bin .../{gacha => wish}/items/shadow-5-5.png | Bin .../{gacha => wish}/items/shadow-5-6.png | Bin .../{gacha => wish}/items/shadow-5-7.png | Bin .../{gacha => wish}/items/shadow-5.png | Bin .../{gacha => wish}/items/星尘紫.png | Bin .../{gacha => wish}/items/星尘金.png | Bin .../{gacha => wish}/items/星辉10.png | Bin .../genshin/{gacha => wish}/items/星辉2.png | Bin .../{gacha/gacha.css => wish/wish.css} | 4 +- .../{gacha/gacha.html => wish/wish.jinja2} | 7 +- 71 files changed, 290 insertions(+), 44 deletions(-) rename resources/bot/help/{help.html => example.html} (99%) create mode 100644 resources/bot/help/help.jinja2 rename resources/genshin/abyss/{floor.html => floor.jinja2} (95%) rename resources/genshin/abyss/{overview.html => overview.jinja2} (96%) rename resources/genshin/abyss_team/{abyss_team.html => abyss_team.jinja2} (100%) rename resources/genshin/avatar_list/{main.html => main.jinja2} (100%) rename resources/genshin/calendar/{calendar.html => calendar.jinja2} (100%) rename resources/genshin/daily_material/{character.html => character.jinja2} (100%) rename resources/genshin/daily_material/{weapon.html => weapon.jinja2} (100%) rename resources/genshin/daily_note/{daily_note.html => daily_note.jinja2} (100%) rename resources/genshin/ledger/{ledger.html => ledger.jinja2} (100%) rename resources/genshin/material/{roles_material.html => roles_material.jinja2} (100%) rename resources/genshin/player_card/{artifacts.html => artifacts.jinja2} (100%) rename resources/genshin/player_card/{constellations.html => constellations.jinja2} (100%) rename resources/genshin/player_card/{holder.html => holder.jinja2} (100%) rename resources/genshin/player_card/{holder_example.html => holder_example.jinja2} (100%) rename resources/genshin/player_card/{player_card.html => player_card.jinja2} (88%) rename resources/genshin/player_card/{score.html => score.jinja2} (100%) rename resources/genshin/player_card/{skills.html => skills.jinja2} (100%) rename resources/genshin/player_card/{stats.html => stats.jinja2} (100%) rename resources/genshin/player_card/{weapon.html => weapon.jinja2} (100%) rename resources/genshin/stats/{stats.html => stats.jinja2} (100%) rename resources/genshin/weapon/{weapon.html => weapon.jinja2} (100%) rename resources/genshin/{gacha => wish}/items/Electric.png (100%) rename resources/genshin/{gacha => wish}/items/Fire.png (100%) rename resources/genshin/{gacha => wish}/items/Grass.png (100%) rename resources/genshin/{gacha => wish}/items/Ice.png (100%) rename resources/genshin/{gacha => wish}/items/Rock.png (100%) rename resources/genshin/{gacha => wish}/items/WEAPON_BOW.png (100%) rename resources/genshin/{gacha => wish}/items/WEAPON_CATALYST.png (100%) rename resources/genshin/{gacha => wish}/items/WEAPON_CLAYMORE.png (100%) rename resources/genshin/{gacha => wish}/items/WEAPON_POLE.png (100%) rename resources/genshin/{gacha => wish}/items/WEAPON_SWORD_ONE_HAND.png (100%) rename resources/genshin/{gacha => wish}/items/Water.png (100%) rename resources/genshin/{gacha => wish}/items/Wind.png (100%) rename resources/genshin/{gacha => wish}/items/background.jpg (100%) rename resources/genshin/{gacha => wish}/items/bg.png (100%) rename resources/genshin/{gacha => wish}/items/bg2.png (100%) rename resources/genshin/{gacha => wish}/items/bgWeapon.png (100%) rename resources/genshin/{gacha => wish}/items/s-3.png (100%) rename resources/genshin/{gacha => wish}/items/s-4.png (100%) rename resources/genshin/{gacha => wish}/items/s-5.png (100%) rename resources/genshin/{gacha => wish}/items/shadow-3.png (100%) rename resources/genshin/{gacha => wish}/items/shadow-4.png (100%) rename resources/genshin/{gacha => wish}/items/shadow-5-1.png (100%) rename resources/genshin/{gacha => wish}/items/shadow-5-2.png (100%) rename resources/genshin/{gacha => wish}/items/shadow-5-3.png (100%) rename resources/genshin/{gacha => wish}/items/shadow-5-4.png (100%) rename resources/genshin/{gacha => wish}/items/shadow-5-5.png (100%) rename resources/genshin/{gacha => wish}/items/shadow-5-6.png (100%) rename resources/genshin/{gacha => wish}/items/shadow-5-7.png (100%) rename resources/genshin/{gacha => wish}/items/shadow-5.png (100%) rename resources/genshin/{gacha => wish}/items/星尘紫.png (100%) rename resources/genshin/{gacha => wish}/items/星尘金.png (100%) rename resources/genshin/{gacha => wish}/items/星辉10.png (100%) rename resources/genshin/{gacha => wish}/items/星辉2.png (100%) rename resources/genshin/{gacha/gacha.css => wish/wish.css} (97%) rename resources/genshin/{gacha/gacha.html => wish/wish.jinja2} (93%) diff --git a/plugins/genshin/abyss.py b/plugins/genshin/abyss.py index cc793076..fca992a2 100644 --- a/plugins/genshin/abyss.py +++ b/plugins/genshin/abyss.py @@ -280,7 +280,7 @@ class AbyssPlugin(Plugin): def overview_task(): return -1, self.template_service.render( - "genshin/abyss/overview.html", render_data, viewport={"width": 750, "height": 580} + "genshin/abyss/overview.jinja2", render_data, viewport={"width": 750, "height": 580} ) def floor_task(floor_index: int): @@ -288,7 +288,7 @@ class AbyssPlugin(Plugin): return ( floor_d["floor"], self.template_service.render( - "genshin/abyss/floor.html", + "genshin/abyss/floor.jinja2", { **render_data, "floor": floor_d, @@ -314,7 +314,7 @@ class AbyssPlugin(Plugin): render_data["data"] = jsonlib.loads(result) return [ await self.template_service.render( - "genshin/abyss/overview.html", render_data, viewport={"width": 750, "height": 580} + "genshin/abyss/overview.jinja2", render_data, viewport={"width": 750, "height": 580} ) ] num_dic = { @@ -342,6 +342,6 @@ class AbyssPlugin(Plugin): render_data["total_stars"] = f"{floor_data[0]['stars']}/{floor_data[0]['max_stars']}" return [ await self.template_service.render( - "genshin/abyss/floor.html", render_data, viewport={"width": 690, "height": 500} + "genshin/abyss/floor.jinja2", render_data, viewport={"width": 690, "height": 500} ) ] diff --git a/plugins/genshin/abyss_team.py b/plugins/genshin/abyss_team.py index bc05e435..4a9b09fd 100644 --- a/plugins/genshin/abyss_team.py +++ b/plugins/genshin/abyss_team.py @@ -80,7 +80,7 @@ class AbyssTeamPlugin(Plugin): await message.reply_chat_action(ChatAction.UPLOAD_PHOTO) render_result = await self.template_service.render( - "genshin/abyss_team/abyss_team.html", + "genshin/abyss_team/abyss_team.jinja2", abyss_teams_data, {"width": 785, "height": 800}, full_page=True, diff --git a/plugins/genshin/avatar_list.py b/plugins/genshin/avatar_list.py index e1b96e3c..940cedab 100644 --- a/plugins/genshin/avatar_list.py +++ b/plugins/genshin/avatar_list.py @@ -239,7 +239,7 @@ class AvatarListPlugin(Plugin): await message.reply_chat_action(ChatAction.UPLOAD_DOCUMENT if as_document else ChatAction.UPLOAD_PHOTO) image = await self.template_service.render( - "genshin/avatar_list/main.html", + "genshin/avatar_list/main.jinja2", render_data, viewport={"width": 1040, "height": 500}, full_page=True, diff --git a/plugins/genshin/calendar.py b/plugins/genshin/calendar.py index 3a9d3f78..b7666853 100644 --- a/plugins/genshin/calendar.py +++ b/plugins/genshin/calendar.py @@ -52,7 +52,7 @@ class CalendarPlugin(Plugin): data = await self._fetch_data() data["display_mode"] = mode image = await self.template_service.render( - "genshin/calendar/calendar.html", + "genshin/calendar/calendar.jinja2", data, query_selector=".container", ) diff --git a/plugins/genshin/daily/material.py b/plugins/genshin/daily/material.py index 0d10793e..0d208c73 100644 --- a/plugins/genshin/daily/material.py +++ b/plugins/genshin/daily/material.py @@ -314,14 +314,14 @@ class DailyMaterial(Plugin): character_img_data, weapon_img_data = await asyncio.gather( self.template_service.render( # 渲染角色素材页 - "genshin/daily_material/character.html", + "genshin/daily_material/character.jinja2", {"data": render_data}, {"width": 1164, "height": 500}, file_type=file_type, ttl=30 * 24 * 60 * 60, ), self.template_service.render( # 渲染武器素材页 - "genshin/daily_material/weapon.html", + "genshin/daily_material/weapon.jinja2", {"data": render_data}, {"width": 1164, "height": 500}, file_type=file_type, diff --git a/plugins/genshin/daily_note.py b/plugins/genshin/daily_note.py index 021fd1ab..9f4ac147 100644 --- a/plugins/genshin/daily_note.py +++ b/plugins/genshin/daily_note.py @@ -82,7 +82,7 @@ class DailyNotePlugin(Plugin): "transformer_recovery_time": transformer_recovery_time, } render_result = await self.template_service.render( - "genshin/daily_note/daily_note.html", + "genshin/daily_note/daily_note.jinja2", render_data, {"width": 600, "height": 548}, full_page=False, diff --git a/plugins/genshin/help.py b/plugins/genshin/help.py index 51703837..bc18cf42 100644 --- a/plugins/genshin/help.py +++ b/plugins/genshin/help.py @@ -22,7 +22,7 @@ class HelpPlugin(Plugin): logger.info("用户 %s[%s] 发出help命令", user.full_name, user.id) await message.reply_chat_action(ChatAction.TYPING) render_result = await self.template_service.render( - "bot/help/help.html", + "bot/help/help.jinja2", {"bot_username": self.application.bot.username}, {"width": 1280, "height": 900}, ttl=30 * 24 * 60 * 60, diff --git a/plugins/genshin/ledger.py b/plugins/genshin/ledger.py index 68d5a9cf..efe40949 100644 --- a/plugins/genshin/ledger.py +++ b/plugins/genshin/ledger.py @@ -63,7 +63,7 @@ class LedgerPlugin(Plugin): "color": color, } render_result = await self.template_service.render( - "genshin/ledger/ledger.html", ledger_data, {"width": 580, "height": 610} + "genshin/ledger/ledger.jinja2", ledger_data, {"width": 580, "height": 610} ) return render_result diff --git a/plugins/genshin/material.py b/plugins/genshin/material.py index 1c93dfce..a5196314 100644 --- a/plugins/genshin/material.py +++ b/plugins/genshin/material.py @@ -181,7 +181,7 @@ class MaterialPlugin(Plugin): if not data: return return await self.template_service.render( - "genshin/material/roles_material.html", + "genshin/material/roles_material.jinja2", data, {"width": 960, "height": 1460}, full_page=True, diff --git a/plugins/genshin/player_cards.py b/plugins/genshin/player_cards.py index 5751cc7b..fd9c61af 100644 --- a/plugins/genshin/player_cards.py +++ b/plugins/genshin/player_cards.py @@ -228,7 +228,7 @@ class PlayerCards(Plugin): buttons = self.gen_button(data, user.id, uid, update_button=False) render_data = await self.parse_holder_data(data) holder = await self.template_service.render( - "genshin/player_card/holder.html", + "genshin/player_card/holder.jinja2", render_data, viewport={"width": 750, "height": 580}, ttl=60 * 10, @@ -492,13 +492,8 @@ class RenderTemplate: "DigitType": DigitType, } - # html = await self.template_service.render_async( - # "genshin/player_card/player_card.html", data - # ) - # logger.debug(html) - return await self.template_service.render( - "genshin/player_card/player_card.html", + "genshin/player_card/player_card.jinja2", data, {"width": 950, "height": 1080}, full_page=True, diff --git a/plugins/genshin/stats.py b/plugins/genshin/stats.py index 89a3ae49..94138127 100644 --- a/plugins/genshin/stats.py +++ b/plugins/genshin/stats.py @@ -113,15 +113,10 @@ class PlayerStatsPlugins(Plugin): "style": random.choice(["mondstadt", "liyue"]), # nosec } - # html = await self.template_service.render_async( - # "genshin/stats/stats.html", data - # ) - # logger.debug(html) - await self.cache_images(user_info) return await self.template_service.render( - "genshin/stats/stats.html", + "genshin/stats/stats.jinja2", data, {"width": 650, "height": 800}, full_page=True, diff --git a/plugins/genshin/weapon.py b/plugins/genshin/weapon.py index edfa983f..c3f8b412 100644 --- a/plugins/genshin/weapon.py +++ b/plugins/genshin/weapon.py @@ -120,7 +120,7 @@ class WeaponPlugin(Plugin): self.add_delete_message_job(reply_message) return png_data = await self.template_service.render( - "genshin/weapon/weapon.html", template_data, {"width": 540, "height": 540}, ttl=31 * 24 * 60 * 60 + "genshin/weapon/weapon.jinja2", template_data, {"width": 540, "height": 540}, ttl=31 * 24 * 60 * 60 ) await message.reply_chat_action(ChatAction.UPLOAD_PHOTO) reply_photo = await png_data.reply_photo( diff --git a/plugins/genshin/wish.py b/plugins/genshin/wish.py index 298b3e13..f51bf377 100644 --- a/plugins/genshin/wish.py +++ b/plugins/genshin/wish.py @@ -266,7 +266,7 @@ class WishSimulatorPlugin(Plugin): template_data["items"] = data await message.reply_chat_action(ChatAction.UPLOAD_PHOTO) png_data = await self.template_service.render( - "genshin/gacha/gacha.html", template_data, {"width": 1157, "height": 603}, False + "genshin/wish/wish.jinja2", template_data, {"width": 1157, "height": 603}, False ) reply_message = await message.reply_photo(png_data.photo) diff --git a/resources/bot/help/help.html b/resources/bot/help/example.html similarity index 99% rename from resources/bot/help/help.html rename to resources/bot/help/example.html index 69400a45..6a174540 100644 --- a/resources/bot/help/help.html +++ b/resources/bot/help/example.html @@ -11,7 +11,7 @@
-

TGPaimonBot

+

PaiGram

使用说明

diff --git a/resources/bot/help/help.jinja2 b/resources/bot/help/help.jinja2 new file mode 100644 index 00000000..6a174540 --- /dev/null +++ b/resources/bot/help/help.jinja2 @@ -0,0 +1,255 @@ + + + + + Title + + + + + +
+
+
+

PaiGram

+

使用说明

+
+
+
+ 需要绑定Cookie +
+
+ 需要绑定UID +
+
+
+
+
+
+ +
+
+

查询命令

+
+
+ +
+
/weapon
+
查询武器
+
+
+
/strategy
+
查询角色攻略
+
+
+
/material
+
角色培养素材查询
+
+ +
+
+ /stats + +
+
玩家统计查询
+
+
+
+ /player_card + +
+
角色卡片
+
+ +
+
+ /dailynote + +
+
查询实时便笺
+
+
+
+ /ledger + +
+
查询当月旅行札记
+
+
+
+ /abyss + +
+
查询当期深渊战绩
+
+
+
+ /abyss_team + +
+
查询深渊推荐配队
+
+
+
+ /avatars + +
+
查询角色练度
+
+
+
+ /reg_time + +
+
原神账号注册时间
+
+ +
+
+ /gacha_log + +
+
抽卡记录
+
+
+
+ /gacha_count + +
+
抽卡统计
+
+
+
+ /pay_log + +
+
充值记录
+
+
+
+ /sign + +
+
每日签到 | 查询
+
+
+
/daily_material
+
每日素材
+
+ +
+
/hilichurls
+
丘丘语字典
+
+
+
/birthday
+
角色生日
+
+
+
+ /birthday_card + +
+
领取角色生日画片
+
+
+
/calendar
+
活动日历
+
+
+
+ +
+
+ +
+
+

其他命令

+
+
+
+
/wish
+
抽卡模拟器(非洲人模拟器)
+
+
+
/set_wish
+
抽卡模拟器定轨
+
+
+
/quiz
+
+ 派蒙的十万个为什么 +
+
+ +
+
/gacha_log_import
+
导入抽卡记录
+
+
+
/gacha_log_export
+
导出抽卡记录
+
+
+
/gacha_log_delete
+
删除抽卡记录
+
+ +
+
/pay_log_import
+
导入充值记录
+
+
+
/pay_log_export
+
导出充值记录
+
+
+
/pay_log_delete
+
删除充值记录
+
+ +
+
/setuid
+
添加/重设UID(请私聊BOT)
+
+
+
/setcookie
+
添加/重设Cookie(请私聊BOT)
+
+
+
/player
+
管理账号(请私聊BOT)
+
+ +
+
/cancel
+
+ 取消操作(解决一切玄学问题) +
+
+
+
+ +
+
+

inline 模式关键词

+
+
+
+
@{{bot_username}} 角色名
+
查询角色攻略
+
+
+
@{{bot_username}} 武器名
+
查询武器信息
+
+
+
+ +
+ 更多功能,还在咕咕咕!咕咕咕! +
+
+
+ + diff --git a/resources/genshin/abyss/floor.html b/resources/genshin/abyss/floor.jinja2 similarity index 95% rename from resources/genshin/abyss/floor.html rename to resources/genshin/abyss/floor.jinja2 index 380a69fa..52758add 100644 --- a/resources/genshin/abyss/floor.html +++ b/resources/genshin/abyss/floor.jinja2 @@ -75,7 +75,8 @@ {{ constellation }} 命
{% endif %} -
+
diff --git a/resources/genshin/abyss/overview.html b/resources/genshin/abyss/overview.jinja2 similarity index 96% rename from resources/genshin/abyss/overview.html rename to resources/genshin/abyss/overview.jinja2 index be4a3306..f2ce53ee 100644 --- a/resources/genshin/abyss/overview.html +++ b/resources/genshin/abyss/overview.jinja2 @@ -37,7 +37,8 @@
{% for avatar in data.ranks.most_played %}
-
+
@@ -63,7 +63,7 @@ style="background-image: url('{{ character.image.banner.url }}'); background-size: auto 100%;" >
- {% include 'genshin/player_card/constellations.html' %} + {% include "genshin/player_card/constellations.jinja2" %}
@@ -83,8 +83,8 @@
- {% include 'genshin/player_card/skills.html' %} {% include - 'genshin/player_card/stats.html' %} + {% include "genshin/player_card/skills.jinja2" %} {% include + "genshin/player_card/stats.jinja2" %}
@@ -93,11 +93,11 @@
- {% include 'genshin/player_card/weapon.html' %} {% include - 'genshin/player_card/score.html' %} + {% include "genshin/player_card/weapon.jinja2" %} {% include + "genshin/player_card/score.jinja2" %}
- {% include 'genshin/player_card/artifacts.html' %} + {% include "genshin/player_card/artifacts.jinja2" %}
diff --git a/resources/genshin/player_card/score.html b/resources/genshin/player_card/score.jinja2 similarity index 100% rename from resources/genshin/player_card/score.html rename to resources/genshin/player_card/score.jinja2 diff --git a/resources/genshin/player_card/skills.html b/resources/genshin/player_card/skills.jinja2 similarity index 100% rename from resources/genshin/player_card/skills.html rename to resources/genshin/player_card/skills.jinja2 diff --git a/resources/genshin/player_card/stats.html b/resources/genshin/player_card/stats.jinja2 similarity index 100% rename from resources/genshin/player_card/stats.html rename to resources/genshin/player_card/stats.jinja2 diff --git a/resources/genshin/player_card/weapon.html b/resources/genshin/player_card/weapon.jinja2 similarity index 100% rename from resources/genshin/player_card/weapon.html rename to resources/genshin/player_card/weapon.jinja2 diff --git a/resources/genshin/stats/stats.html b/resources/genshin/stats/stats.jinja2 similarity index 100% rename from resources/genshin/stats/stats.html rename to resources/genshin/stats/stats.jinja2 diff --git a/resources/genshin/weapon/weapon.html b/resources/genshin/weapon/weapon.jinja2 similarity index 100% rename from resources/genshin/weapon/weapon.html rename to resources/genshin/weapon/weapon.jinja2 diff --git a/resources/genshin/gacha/items/Electric.png b/resources/genshin/wish/items/Electric.png similarity index 100% rename from resources/genshin/gacha/items/Electric.png rename to resources/genshin/wish/items/Electric.png diff --git a/resources/genshin/gacha/items/Fire.png b/resources/genshin/wish/items/Fire.png similarity index 100% rename from resources/genshin/gacha/items/Fire.png rename to resources/genshin/wish/items/Fire.png diff --git a/resources/genshin/gacha/items/Grass.png b/resources/genshin/wish/items/Grass.png similarity index 100% rename from resources/genshin/gacha/items/Grass.png rename to resources/genshin/wish/items/Grass.png diff --git a/resources/genshin/gacha/items/Ice.png b/resources/genshin/wish/items/Ice.png similarity index 100% rename from resources/genshin/gacha/items/Ice.png rename to resources/genshin/wish/items/Ice.png diff --git a/resources/genshin/gacha/items/Rock.png b/resources/genshin/wish/items/Rock.png similarity index 100% rename from resources/genshin/gacha/items/Rock.png rename to resources/genshin/wish/items/Rock.png diff --git a/resources/genshin/gacha/items/WEAPON_BOW.png b/resources/genshin/wish/items/WEAPON_BOW.png similarity index 100% rename from resources/genshin/gacha/items/WEAPON_BOW.png rename to resources/genshin/wish/items/WEAPON_BOW.png diff --git a/resources/genshin/gacha/items/WEAPON_CATALYST.png b/resources/genshin/wish/items/WEAPON_CATALYST.png similarity index 100% rename from resources/genshin/gacha/items/WEAPON_CATALYST.png rename to resources/genshin/wish/items/WEAPON_CATALYST.png diff --git a/resources/genshin/gacha/items/WEAPON_CLAYMORE.png b/resources/genshin/wish/items/WEAPON_CLAYMORE.png similarity index 100% rename from resources/genshin/gacha/items/WEAPON_CLAYMORE.png rename to resources/genshin/wish/items/WEAPON_CLAYMORE.png diff --git a/resources/genshin/gacha/items/WEAPON_POLE.png b/resources/genshin/wish/items/WEAPON_POLE.png similarity index 100% rename from resources/genshin/gacha/items/WEAPON_POLE.png rename to resources/genshin/wish/items/WEAPON_POLE.png diff --git a/resources/genshin/gacha/items/WEAPON_SWORD_ONE_HAND.png b/resources/genshin/wish/items/WEAPON_SWORD_ONE_HAND.png similarity index 100% rename from resources/genshin/gacha/items/WEAPON_SWORD_ONE_HAND.png rename to resources/genshin/wish/items/WEAPON_SWORD_ONE_HAND.png diff --git a/resources/genshin/gacha/items/Water.png b/resources/genshin/wish/items/Water.png similarity index 100% rename from resources/genshin/gacha/items/Water.png rename to resources/genshin/wish/items/Water.png diff --git a/resources/genshin/gacha/items/Wind.png b/resources/genshin/wish/items/Wind.png similarity index 100% rename from resources/genshin/gacha/items/Wind.png rename to resources/genshin/wish/items/Wind.png diff --git a/resources/genshin/gacha/items/background.jpg b/resources/genshin/wish/items/background.jpg similarity index 100% rename from resources/genshin/gacha/items/background.jpg rename to resources/genshin/wish/items/background.jpg diff --git a/resources/genshin/gacha/items/bg.png b/resources/genshin/wish/items/bg.png similarity index 100% rename from resources/genshin/gacha/items/bg.png rename to resources/genshin/wish/items/bg.png diff --git a/resources/genshin/gacha/items/bg2.png b/resources/genshin/wish/items/bg2.png similarity index 100% rename from resources/genshin/gacha/items/bg2.png rename to resources/genshin/wish/items/bg2.png diff --git a/resources/genshin/gacha/items/bgWeapon.png b/resources/genshin/wish/items/bgWeapon.png similarity index 100% rename from resources/genshin/gacha/items/bgWeapon.png rename to resources/genshin/wish/items/bgWeapon.png diff --git a/resources/genshin/gacha/items/s-3.png b/resources/genshin/wish/items/s-3.png similarity index 100% rename from resources/genshin/gacha/items/s-3.png rename to resources/genshin/wish/items/s-3.png diff --git a/resources/genshin/gacha/items/s-4.png b/resources/genshin/wish/items/s-4.png similarity index 100% rename from resources/genshin/gacha/items/s-4.png rename to resources/genshin/wish/items/s-4.png diff --git a/resources/genshin/gacha/items/s-5.png b/resources/genshin/wish/items/s-5.png similarity index 100% rename from resources/genshin/gacha/items/s-5.png rename to resources/genshin/wish/items/s-5.png diff --git a/resources/genshin/gacha/items/shadow-3.png b/resources/genshin/wish/items/shadow-3.png similarity index 100% rename from resources/genshin/gacha/items/shadow-3.png rename to resources/genshin/wish/items/shadow-3.png diff --git a/resources/genshin/gacha/items/shadow-4.png b/resources/genshin/wish/items/shadow-4.png similarity index 100% rename from resources/genshin/gacha/items/shadow-4.png rename to resources/genshin/wish/items/shadow-4.png diff --git a/resources/genshin/gacha/items/shadow-5-1.png b/resources/genshin/wish/items/shadow-5-1.png similarity index 100% rename from resources/genshin/gacha/items/shadow-5-1.png rename to resources/genshin/wish/items/shadow-5-1.png diff --git a/resources/genshin/gacha/items/shadow-5-2.png b/resources/genshin/wish/items/shadow-5-2.png similarity index 100% rename from resources/genshin/gacha/items/shadow-5-2.png rename to resources/genshin/wish/items/shadow-5-2.png diff --git a/resources/genshin/gacha/items/shadow-5-3.png b/resources/genshin/wish/items/shadow-5-3.png similarity index 100% rename from resources/genshin/gacha/items/shadow-5-3.png rename to resources/genshin/wish/items/shadow-5-3.png diff --git a/resources/genshin/gacha/items/shadow-5-4.png b/resources/genshin/wish/items/shadow-5-4.png similarity index 100% rename from resources/genshin/gacha/items/shadow-5-4.png rename to resources/genshin/wish/items/shadow-5-4.png diff --git a/resources/genshin/gacha/items/shadow-5-5.png b/resources/genshin/wish/items/shadow-5-5.png similarity index 100% rename from resources/genshin/gacha/items/shadow-5-5.png rename to resources/genshin/wish/items/shadow-5-5.png diff --git a/resources/genshin/gacha/items/shadow-5-6.png b/resources/genshin/wish/items/shadow-5-6.png similarity index 100% rename from resources/genshin/gacha/items/shadow-5-6.png rename to resources/genshin/wish/items/shadow-5-6.png diff --git a/resources/genshin/gacha/items/shadow-5-7.png b/resources/genshin/wish/items/shadow-5-7.png similarity index 100% rename from resources/genshin/gacha/items/shadow-5-7.png rename to resources/genshin/wish/items/shadow-5-7.png diff --git a/resources/genshin/gacha/items/shadow-5.png b/resources/genshin/wish/items/shadow-5.png similarity index 100% rename from resources/genshin/gacha/items/shadow-5.png rename to resources/genshin/wish/items/shadow-5.png diff --git a/resources/genshin/gacha/items/星尘紫.png b/resources/genshin/wish/items/星尘紫.png similarity index 100% rename from resources/genshin/gacha/items/星尘紫.png rename to resources/genshin/wish/items/星尘紫.png diff --git a/resources/genshin/gacha/items/星尘金.png b/resources/genshin/wish/items/星尘金.png similarity index 100% rename from resources/genshin/gacha/items/星尘金.png rename to resources/genshin/wish/items/星尘金.png diff --git a/resources/genshin/gacha/items/星辉10.png b/resources/genshin/wish/items/星辉10.png similarity index 100% rename from resources/genshin/gacha/items/星辉10.png rename to resources/genshin/wish/items/星辉10.png diff --git a/resources/genshin/gacha/items/星辉2.png b/resources/genshin/wish/items/星辉2.png similarity index 100% rename from resources/genshin/gacha/items/星辉2.png rename to resources/genshin/wish/items/星辉2.png diff --git a/resources/genshin/gacha/gacha.css b/resources/genshin/wish/wish.css similarity index 97% rename from resources/genshin/gacha/gacha.css rename to resources/genshin/wish/wish.css index e9fc98ac..a21d62fa 100644 --- a/resources/genshin/gacha/gacha.css +++ b/resources/genshin/wish/wish.css @@ -116,7 +116,7 @@ body { left: 3px; width: 106px; height: 448px; - clip-path: url(#wishframe); + clip-path: url(#wish-frame); z-index: 100; } @@ -134,7 +134,7 @@ body { width: 106px; height: 448px; z-index: 101; - clip-path: url(#wishframe); + clip-path: url(#wish-frame); } .item-weapon-img { diff --git a/resources/genshin/gacha/gacha.html b/resources/genshin/wish/wish.jinja2 similarity index 93% rename from resources/genshin/gacha/gacha.html rename to resources/genshin/wish/wish.jinja2 index 643484dd..2eabf344 100644 --- a/resources/genshin/gacha/gacha.html +++ b/resources/genshin/wish/wish.jinja2 @@ -3,7 +3,7 @@ - + @@ -53,10 +53,9 @@
- + + d="M0.01 168.12l0 -9.64c4.32,-21.34 12,-32.33 25.46,-25.58 -2.35,-10.3 -1.53,-26.06 5.79,-25.96 19.18,0.25 29.95,-3.14 40.24,-13.16 -4.5,-66.43 51.39,-54.26 79.61,-93.78l0 0c28.22,39.52 84.1,27.34 79.61,93.78 10.29,10.02 21.06,13.41 40.24,13.16 7.32,-0.1 8.13,15.66 5.79,25.96 13.46,-6.75 21.14,4.24 25.46,25.58l0 9.64 0.01 0 0 1004.21 -0.01 0 0 3.13c-4.32,21.34 -12,32.33 -25.46,25.58 2.35,10.3 1.53,26.06 -5.79,25.96 -19.18,-0.25 -29.95,3.14 -40.24,13.16 4.5,66.43 -51.39,54.26 -79.61,93.78l0 0c-28.22,-39.52 -84.1,-27.34 -79.61,-93.78 -10.29,-10.02 -21.06,-13.41 -40.24,-13.16 -7.32,0.1 -8.13,-15.66 -5.79,-25.96 -13.46,6.75 -21.14,-4.24 -25.46,-25.58l0 -3.13 -0.01 0 0 -1004.21 0.01 0z"> \ No newline at end of file