diff --git a/genshinuid_collection/draw_collection_card.py b/genshinuid_collection/draw_collection_card.py index 8cfb87d0..73f25b4b 100644 --- a/genshinuid_collection/draw_collection_card.py +++ b/genshinuid_collection/draw_collection_card.py @@ -30,7 +30,7 @@ max_data = { async def dataToDataStr(max: int, my: int) -> List: return [ - str(100 * float('{:.2f}'.format(my / max))) + str('{:.2f}'.format(100 * (my / max))) + '% | ' + str(my) + '/' diff --git a/genshinuid_enka/dmgCalc/char_skill_effect.json b/genshinuid_enka/dmgCalc/char_skill_effect.json index 664bb01d..25868e74 100644 --- a/genshinuid_enka/dmgCalc/char_skill_effect.json +++ b/genshinuid_enka/dmgCalc/char_skill_effect.json @@ -173,7 +173,7 @@ }, "八重神子": { "50": "", - "70": "E:dmgBonus+0.15%em" + "70": "E:dmgBonus+15%em" }, "夜兰": { "50": "hp+12", diff --git a/genshinuid_enka/draw_char_card.py b/genshinuid_enka/draw_char_card.py index df037507..b77423e3 100644 --- a/genshinuid_enka/draw_char_card.py +++ b/genshinuid_enka/draw_char_card.py @@ -504,9 +504,13 @@ async def draw_char_img( char_name = raw_data['avatarName'] char_level = raw_data['avatarLevel'] char_fetter = raw_data['avatarFetter'] - - if await config_check('RandomPic'): - charUrl = f'http://img.genshin.cherishmoon.fun/{char_name}' + + if await config_check('RandomPic') and charUrl is None: + if char_name == '旅行者': + char_name_url = '荧' + else: + char_name_url = char_name + charUrl = f'http://img.genshin.cherishmoon.fun/{char_name_url}' based_w, based_h = 600, 1200 if charUrl: diff --git a/genshinuid_gachalog/get_gachalogs.py b/genshinuid_gachalog/get_gachalogs.py index 0dc9627d..57edc92a 100644 --- a/genshinuid_gachalog/get_gachalogs.py +++ b/genshinuid_gachalog/get_gachalogs.py @@ -45,10 +45,7 @@ async def save_gachalogs(uid: str): result['weapon_gacha_num'] = len(raw_data['武器祈愿']) for i in ['常驻祈愿', '角色祈愿', '武器祈愿']: if len(raw_data[i]) > 1: - if int(raw_data[i][-1]['id']) >= int(raw_data[i][-2]['id']) or int( - raw_data[i][-1]['id'] - ) >= int(raw_data[i][0]['id']): - raw_data[i].sort(key=lambda x: (-int(x['id']))) + raw_data[i].sort(key=lambda x: (-int(x['id']))) result['data'] = raw_data # 计算数据