🐛 修复一些问题

This commit is contained in:
KimgiaiiWuyi 2022-08-31 20:40:31 +08:00
parent d68d3c3ff7
commit 50b2bc1e56
4 changed files with 10 additions and 9 deletions

View File

@ -30,7 +30,7 @@ max_data = {
async def dataToDataStr(max: int, my: int) -> List: async def dataToDataStr(max: int, my: int) -> List:
return [ return [
str(100 * float('{:.2f}'.format(my / max))) str('{:.2f}'.format(100 * (my / max)))
+ '% | ' + '% | '
+ str(my) + str(my)
+ '/' + '/'

View File

@ -173,7 +173,7 @@
}, },
"八重神子": { "八重神子": {
"50": "", "50": "",
"70": "E:dmgBonus+0.15%em" "70": "E:dmgBonus+15%em"
}, },
"夜兰": { "夜兰": {
"50": "hp+12", "50": "hp+12",

View File

@ -504,9 +504,13 @@ async def draw_char_img(
char_name = raw_data['avatarName'] char_name = raw_data['avatarName']
char_level = raw_data['avatarLevel'] char_level = raw_data['avatarLevel']
char_fetter = raw_data['avatarFetter'] char_fetter = raw_data['avatarFetter']
if await config_check('RandomPic'): if await config_check('RandomPic') and charUrl is None:
charUrl = f'http://img.genshin.cherishmoon.fun/{char_name}' 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 based_w, based_h = 600, 1200
if charUrl: if charUrl:

View File

@ -45,10 +45,7 @@ async def save_gachalogs(uid: str):
result['weapon_gacha_num'] = len(raw_data['武器祈愿']) result['weapon_gacha_num'] = len(raw_data['武器祈愿'])
for i in ['常驻祈愿', '角色祈愿', '武器祈愿']: for i in ['常驻祈愿', '角色祈愿', '武器祈愿']:
if len(raw_data[i]) > 1: if len(raw_data[i]) > 1:
if int(raw_data[i][-1]['id']) >= int(raw_data[i][-2]['id']) or int( raw_data[i].sort(key=lambda x: (-int(x['id'])))
raw_data[i][-1]['id']
) >= int(raw_data[i][0]['id']):
raw_data[i].sort(key=lambda x: (-int(x['id'])))
result['data'] = raw_data result['data'] = raw_data
# 计算数据 # 计算数据