From 2da65b699212af2b942ca827653c620636ec3d5a Mon Sep 17 00:00:00 2001 From: qwerdvd <2450899274@qq.com> Date: Fri, 12 May 2023 23:12:46 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=E4=BF=AE=E5=A4=8D=E4=B8=80?= =?UTF-8?q?=E7=82=B9=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- StarRailUID/starrailuid_charinfo/mono/Character.py | 13 ++++++++----- StarRailUID/utils/resource/RESOURCE_PATH.py | 6 +++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/StarRailUID/starrailuid_charinfo/mono/Character.py b/StarRailUID/starrailuid_charinfo/mono/Character.py index 1aa3273..c785fb1 100644 --- a/StarRailUID/starrailuid_charinfo/mono/Character.py +++ b/StarRailUID/starrailuid_charinfo/mono/Character.py @@ -17,6 +17,7 @@ class Character: self.char_level: int = int(card_prop['avatarLevel']) self.char_id: str = card_prop['avatarId'] self.char_name: str = card_prop['avatarName'] + self.char_rank = card_prop['rank'] if card_prop.get('rank') else 0 self.char_element = card_prop['avatarElement'] self.char_promotion = card_prop['avatarPromotion'] self.char_skill = card_prop['avatarSkill'] @@ -102,10 +103,12 @@ class Character: else: self.add_attr[sub_property] = str(sub_value) # 处理套装属性 - set_id_dict = dict(Counter(set_id_list)) - for set_id, count in set_id_dict.items(): + set_id_dict = Counter(set_id_list) + for item in set_id_dict.most_common(): set_property = '' - if 2 <= count < 4: + set_id = item[0] + count = item[1] + if count == 2 or count == 3: set_property = RelicSetSkill[str(set_id)]['2']['Property'] set_value = mp.mpf(RelicSetSkill[str(set_id)]['2']['Value']) if count == 4 and RelicSetSkill[str(set_id)]['4'] != {}: @@ -119,8 +122,8 @@ class Character: else: self.add_attr[set_property] = str(set_value) - print(self.base_attributes) - print(self.add_attr) + print(json.dumps(self.base_attributes)) + print(json.dumps(self.add_attr)) async def p2v(power: str, power_plus: int) -> Tuple[float, float]: diff --git a/StarRailUID/utils/resource/RESOURCE_PATH.py b/StarRailUID/utils/resource/RESOURCE_PATH.py index 71802c6..0113139 100644 --- a/StarRailUID/utils/resource/RESOURCE_PATH.py +++ b/StarRailUID/utils/resource/RESOURCE_PATH.py @@ -10,8 +10,10 @@ RESOURCE_PATH = MAIN_PATH / 'resource' PLAYER_PATH = MAIN_PATH / 'players' CU_BG_PATH = MAIN_PATH / 'bg' TEMP_PATH = RESOURCE_PATH / 'temp' -CHAR_ICON_PATH = RESOURCE_PATH / 'char_icon' +CHAR_ICON_PATH = RESOURCE_PATH / 'character' WEAPON_PATH = RESOURCE_PATH / 'light_cone' +CHAR_PORTRAIT = RESOURCE_PATH / 'character_portrait' +SKILL_PATH = RESOURCE_PATH / 'skill' TEXT2D_PATH = Path(__file__).parent / 'texture2d' @@ -25,6 +27,8 @@ def init_dir(): TEXT2D_PATH, CU_BG_PATH, TEMP_PATH, + CHAR_PORTRAIT, + SKILL_PATH, ]: i.mkdir(parents=True, exist_ok=True)