🚧修复一点错误

This commit is contained in:
qwerdvd 2023-05-12 23:12:46 +08:00
parent 38d6848313
commit 2da65b6992
2 changed files with 13 additions and 6 deletions

View File

@ -17,6 +17,7 @@ class Character:
self.char_level: int = int(card_prop['avatarLevel']) self.char_level: int = int(card_prop['avatarLevel'])
self.char_id: str = card_prop['avatarId'] self.char_id: str = card_prop['avatarId']
self.char_name: str = card_prop['avatarName'] 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_element = card_prop['avatarElement']
self.char_promotion = card_prop['avatarPromotion'] self.char_promotion = card_prop['avatarPromotion']
self.char_skill = card_prop['avatarSkill'] self.char_skill = card_prop['avatarSkill']
@ -102,10 +103,12 @@ class Character:
else: else:
self.add_attr[sub_property] = str(sub_value) self.add_attr[sub_property] = str(sub_value)
# 处理套装属性 # 处理套装属性
set_id_dict = dict(Counter(set_id_list)) set_id_dict = Counter(set_id_list)
for set_id, count in set_id_dict.items(): for item in set_id_dict.most_common():
set_property = '' 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_property = RelicSetSkill[str(set_id)]['2']['Property']
set_value = mp.mpf(RelicSetSkill[str(set_id)]['2']['Value']) set_value = mp.mpf(RelicSetSkill[str(set_id)]['2']['Value'])
if count == 4 and RelicSetSkill[str(set_id)]['4'] != {}: if count == 4 and RelicSetSkill[str(set_id)]['4'] != {}:
@ -119,8 +122,8 @@ class Character:
else: else:
self.add_attr[set_property] = str(set_value) self.add_attr[set_property] = str(set_value)
print(self.base_attributes) print(json.dumps(self.base_attributes))
print(self.add_attr) print(json.dumps(self.add_attr))
async def p2v(power: str, power_plus: int) -> Tuple[float, float]: async def p2v(power: str, power_plus: int) -> Tuple[float, float]:

View File

@ -10,8 +10,10 @@ RESOURCE_PATH = MAIN_PATH / 'resource'
PLAYER_PATH = MAIN_PATH / 'players' PLAYER_PATH = MAIN_PATH / 'players'
CU_BG_PATH = MAIN_PATH / 'bg' CU_BG_PATH = MAIN_PATH / 'bg'
TEMP_PATH = RESOURCE_PATH / 'temp' TEMP_PATH = RESOURCE_PATH / 'temp'
CHAR_ICON_PATH = RESOURCE_PATH / 'char_icon' CHAR_ICON_PATH = RESOURCE_PATH / 'character'
WEAPON_PATH = RESOURCE_PATH / 'light_cone' WEAPON_PATH = RESOURCE_PATH / 'light_cone'
CHAR_PORTRAIT = RESOURCE_PATH / 'character_portrait'
SKILL_PATH = RESOURCE_PATH / 'skill'
TEXT2D_PATH = Path(__file__).parent / 'texture2d' TEXT2D_PATH = Path(__file__).parent / 'texture2d'
@ -25,6 +27,8 @@ def init_dir():
TEXT2D_PATH, TEXT2D_PATH,
CU_BG_PATH, CU_BG_PATH,
TEMP_PATH, TEMP_PATH,
CHAR_PORTRAIT,
SKILL_PATH,
]: ]:
i.mkdir(parents=True, exist_ok=True) i.mkdir(parents=True, exist_ok=True)