From 32e2c789cdb540b71267df336f4f110b3fc6e780 Mon Sep 17 00:00:00 2001 From: xtaodada Date: Sun, 28 May 2023 20:16:19 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Support=20player's=20player=5Fcard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- metadata/shortname.py | 8 ++++---- .../playercards/metadata/FightPropRule.json | 19 +++++++++++++++++++ modules/wiki/models/avatar.py | 2 +- modules/wiki/models/light_cone.py | 6 ++++-- plugins/starrail/player_cards.py | 8 +------- 5 files changed, 29 insertions(+), 14 deletions(-) diff --git a/metadata/shortname.py b/metadata/shortname.py index 6ae95ed..1976982 100644 --- a/metadata/shortname.py +++ b/metadata/shortname.py @@ -18,10 +18,10 @@ __all__ = [ # noinspection SpellCheckingInspection roles = { - 8001: ["开拓者"], - 8002: ["开拓者"], - 8003: ["开拓者"], - 8004: ["开拓者"], + 8001: ["开拓者·毁灭"], + 8002: ["开拓者·毁灭"], + 8003: ["开拓者·存护"], + 8004: ["开拓者·存护"], 1001: ["三月七", "mar7th", "三月", "小三月", "阿七", "冷面小粉龙", "纠缠之缘", "小仓唯", "xcw"], 1002: ["丹恒", "danheng", "冷面小青龙", "闷葫芦"], 1003: ["姬子", "himeko", "姬子阿姐"], diff --git a/modules/playercards/metadata/FightPropRule.json b/modules/playercards/metadata/FightPropRule.json index 8dce5b8..81ffc79 100644 --- a/modules/playercards/metadata/FightPropRule.json +++ b/modules/playercards/metadata/FightPropRule.json @@ -128,5 +128,24 @@ "暴击率百分比", "暴击伤害百分比", "雷属性伤害提高百分比" + ], + "罗刹": [ + "生命值百分比", + "生命值", + "治疗量加成百分比" + ], + "开拓者·毁灭": [ + "攻击力百分比", + "击破特攻", + "暴击率百分比", + "暴击伤害百分比", + "物理属性伤害提高百分比" + ], + "开拓者·存护": [ + "防御力百分比", + "火属性伤害提高百分比", + "速度", + "效果命中百分比", + "效果抵抗百分比" ] } \ No newline at end of file diff --git a/modules/wiki/models/avatar.py b/modules/wiki/models/avatar.py index 51759fa..c78266e 100644 --- a/modules/wiki/models/avatar.py +++ b/modules/wiki/models/avatar.py @@ -28,7 +28,7 @@ class AvatarPromote(BaseModel): coin: int = 0 """信用点""" - items: list[AvatarItem] + items: List[AvatarItem] """突破所需材料""" diff --git a/modules/wiki/models/light_cone.py b/modules/wiki/models/light_cone.py index a9c8fee..21a6e24 100644 --- a/modules/wiki/models/light_cone.py +++ b/modules/wiki/models/light_cone.py @@ -1,4 +1,6 @@ # 光锥 +from typing import List + from pydantic import BaseModel from .enums import Quality, Destiny @@ -22,7 +24,7 @@ class LightConePromote(BaseModel): coin: int = 0 """信用点""" - items: list[LightConeItem] + items: List[LightConeItem] """突破所需材料""" @@ -41,7 +43,7 @@ class LightCone(BaseModel): """稀有度""" destiny: Destiny """命途""" - promote: list[LightConePromote] + promote: List[LightConePromote] """晋阶信息""" @property diff --git a/plugins/starrail/player_cards.py b/plugins/starrail/player_cards.py index 33ca7a6..be4c277 100644 --- a/plugins/starrail/player_cards.py +++ b/plugins/starrail/player_cards.py @@ -164,9 +164,6 @@ class PlayerCards(Plugin): else: await message.reply_text(f"角色展柜中未找到 {ch_name} ，请检查角色是否存在于角色展柜中，或者等待角色数据更新后重试") return - if characters.AvatarID in {8001, 8002, 8003, 8004}: - await message.reply_text(f"暂不支持查询 {ch_name} 的角色卡片") - return await message.reply_chat_action(ChatAction.UPLOAD_PHOTO) render_result = await RenderTemplate( uid, @@ -292,9 +289,6 @@ class PlayerCards(Plugin): await message.delete() await callback_query.answer(f"角色展柜中未找到 {result} ，请检查角色是否存在于角色展柜中，或者等待角色数据更新后重试", show_alert=True) return - if characters.AvatarID in {8001, 8002, 8003, 8004}: - await callback_query.answer(f"暂不支持查询 {result} 的角色卡片") - return await callback_query.answer(text="正在渲染图片中 请稍等 请不要重复点击按钮", show_alert=False) await message.reply_chat_action(ChatAction.UPLOAD_PHOTO) render_result = await RenderTemplate( @@ -367,7 +361,7 @@ class PlayerCards(Plugin): """ characters_data = [] for idx, character in enumerate(data.AvatarList): - cid = 8004 if character.AvatarID in {8001, 8002, 8003, 8004} else character.AvatarID + cid = character.AvatarID try: characters_data.append( {