From 86c32252284e75753e62595d6ada68bda6956898 Mon Sep 17 00:00:00 2001 From: xtaodada Date: Wed, 31 May 2023 23:13:40 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20`NamecardAssets`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/dependence/assets.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/core/dependence/assets.py b/core/dependence/assets.py index 2a33875..4e72167 100644 --- a/core/dependence/assets.py +++ b/core/dependence/assets.py @@ -468,10 +468,15 @@ class _NamecardAssets(_AssetsService): @lru_cache def _get_id_from_avatar_id(self, avatar_id: Union[int, str]) -> int: - avatar_icon_name = AVATAR_DATA[str(avatar_id)]["icon"].replace("AvatarIcon", "NameCardIcon") + avatar_icon_name = AVATAR_DATA[str(avatar_id)]["icon"].split("_")[-1] + fallback = None for namecard_id, namecard_data in NAMECARD_DATA.items(): - if namecard_data["icon"] == avatar_icon_name: + if namecard_data["icon"].split("_")[-1] == avatar_icon_name: return int(namecard_id) + elif avatar_icon_name in namecard_data["icon"].split("_")[-1]: + fallback = int(namecard_id) + if fallback: + return fallback raise ValueError(avatar_id) def __call__(self, target: int) -> "_NamecardAssets":