From f9a8d992578eac72b66ff2aba5daaadc46e0f204 Mon Sep 17 00:00:00 2001 From: KimgiaiiWuyi <444835641@qq.com> Date: Tue, 30 Aug 2022 22:45:43 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E5=B0=9D=E8=AF=95=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D`=E5=88=B7=E6=96=B0=E6=8A=BD=E5=8D=A1=E8=AE=B0?= =?UTF-8?q?=E5=BD=95`=E7=9A=84=E6=95=B0=E6=8D=AE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- genshinuid_gachalog/get_gachalogs.py | 5 +++++ utils/mhy_api/get_mhy_data.py | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/genshinuid_gachalog/get_gachalogs.py b/genshinuid_gachalog/get_gachalogs.py index 8bff8f68..a4cb653d 100644 --- a/genshinuid_gachalog/get_gachalogs.py +++ b/genshinuid_gachalog/get_gachalogs.py @@ -43,6 +43,11 @@ async def save_gachalogs(uid: str): result['normal_gacha_num'] = len(raw_data['常驻祈愿']) result['char_gacha_num'] = len(raw_data['角色祈愿']) result['weapon_gacha_num'] = len(raw_data['武器祈愿']) + for i in raw_data['常驻祈愿', '角色祈愿', '武器祈愿']: + 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'])), reverse=True) result['data'] = raw_data # 计算数据 diff --git a/utils/mhy_api/get_mhy_data.py b/utils/mhy_api/get_mhy_data.py index 1df02425..f9279e06 100644 --- a/utils/mhy_api/get_mhy_data.py +++ b/utils/mhy_api/get_mhy_data.py @@ -105,10 +105,13 @@ async def get_gacha_log_by_authkey( for item in data: if item not in full_data[gacha_name]: temp.append(item) - full_data[gacha_name].extend(temp) + full_data[gacha_name][0:0] = temp temp = [] break - full_data[gacha_name].extend(data) + if int(data[-1]['id']) <= int(full_data[gacha_name][0]['id']): + full_data[gacha_name].extend(data) + else: + full_data[gacha_name][0:0] = data await asyncio.sleep(0.7) return full_data