From aebc0ae8a0c99c0b63bf24bae0061bcf85c15423 Mon Sep 17 00:00:00 2001 From: xtaodada Date: Wed, 9 Aug 2023 13:19:39 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20parse=20wiki?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 12 ++++++------ res_func/yatta/avatar.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/main.py b/main.py index 4ecf224..ec96afb 100644 --- a/main.py +++ b/main.py @@ -22,10 +22,10 @@ async def wiki( main_data = await get_list() if override_materials: await fetch_materials(main_data[4]) - await fetch_materials(main_data[5], "消耗品") - await fetch_materials(main_data[9], "任务道具") - await fetch_materials(main_data[10], "贵重物") - await fetch_materials(main_data[12]) + await fetch_materials(main_data[5]) + await fetch_materials(main_data[12], "消耗品") + await fetch_materials(main_data[10], "任务道具") + await fetch_materials(main_data[13], "贵重物") await fetch_materials_infos() await dump_materials(data_path / "materials.json") else: @@ -42,13 +42,13 @@ async def wiki( else: await read_light_cones(data_path / "light_cones.json") if override_monsters: - await fetch_monsters(main_data[2]) + await fetch_monsters(main_data[3]) await fetch_monsters_infos() await dump_monsters(data_path / "monsters.json") else: await read_monsters(data_path / "monsters.json") if override_relics: - await fetch_relics(main_data[3]) + await fetch_relics(main_data[2]) await fetch_relics_infos() await dump_relics(data_path / "relics.json") else: diff --git a/res_func/yatta/avatar.py b/res_func/yatta/avatar.py index 811abfb..03d4a9a 100644 --- a/res_func/yatta/avatar.py +++ b/res_func/yatta/avatar.py @@ -72,7 +72,7 @@ async def get_all_avatars_skills_icons(avatars: List[YattaAvatar]): local_path = ["basic_atk", "skill", "talent", "technique", "ultimate"] tasks = [] for avatar in avatars: - if avatar.id in ["8002", "8004"]: + if avatar.id in [8002, 8004]: continue for i in range(len(remote_path)): tasks.append(