From e7d6a709d48a604389746bfdaa401fbb4803c32c Mon Sep 17 00:00:00 2001 From: KimgiaiiWuyi <444835641@qq.com> Date: Sun, 5 Jun 2022 20:24:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A`=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=94=B6=E9=9B=86`=E5=B0=8F=E6=95=B0=E9=97=AE=E9=A2=98=20&=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mihoyo_libs/get_image.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mihoyo_libs/get_image.py b/mihoyo_libs/get_image.py index c3008446..c135bc18 100644 --- a/mihoyo_libs/get_image.py +++ b/mihoyo_libs/get_image.py @@ -1811,7 +1811,7 @@ async def draw_collect_card(uid: str, nickname: str, image: Optional[str] = None # 记录数据 raw_data = raw_data['data'] - max_data = {'成就':646,'华丽的宝箱':131,'珍贵的宝箱':344,'精致的宝箱':1218,'普通的宝箱':1653} + max_data = {'成就':646,'华丽的宝箱':131,'珍贵的宝箱':347,'精致的宝箱':1221,'普通的宝箱':1658} achieve = raw_data['stats']['achievement_number'] chest4 = raw_data['stats']['common_chest_number'] @@ -1820,7 +1820,7 @@ async def draw_collect_card(uid: str, nickname: str, image: Optional[str] = None chest1 = raw_data['stats']['luxurious_chest_number'] async def dataToDataStr(max, my) -> str: - return [str(100 * round((my / max), 2)) + '% | ' + str(my) + '/' + str(max), round((my / max),2) * 490 ] + return [str(100 * float('{:.2f}'.format(my / max))) + '% | ' + str(my) + '/' + str(max), float('{:.2f}'.format(my / max)) * 490 ] achieveStr = await dataToDataStr(max_data['成就'], achieve) chest1Str =await dataToDataStr(max_data['华丽的宝箱'], chest1) @@ -1829,7 +1829,7 @@ async def draw_collect_card(uid: str, nickname: str, image: Optional[str] = None chest4Str = await dataToDataStr(max_data['普通的宝箱'], chest4) # 计算 - val = str(round((achieveStr[1] + chest1Str[1] + chest2Str[1] + chest3Str[1] + chest4Str[1]) / 24.5, 2 )) + '%' + val = str(float('{:.2f}'.format((achieveStr[1] + chest1Str[1] + chest2Str[1] + chest3Str[1] + chest4Str[1]) / 24.5))) + '%' left = (max_data['华丽的宝箱'] - chest1) * 10 + \ (max_data['珍贵的宝箱'] - chest2) * 5 + \ (max_data['精致的宝箱'] - chest3) * 2 + \