From 6964b91801f9a6ca111cb6006968d8b75a14558e Mon Sep 17 00:00:00 2001
From: KimigaiiWuyi <444835641@qq.com>
Date: Sun, 3 Dec 2023 20:39:26 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D`=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=B7=B1=E6=B8=8A4.3`=E6=95=B0=E6=8D=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../genshinuid_guide/get_new_abyss_data.py      | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/GenshinUID/genshinuid_guide/get_new_abyss_data.py b/GenshinUID/genshinuid_guide/get_new_abyss_data.py
index 5b2ca6c9..1b0dbbe1 100644
--- a/GenshinUID/genshinuid_guide/get_new_abyss_data.py
+++ b/GenshinUID/genshinuid_guide/get_new_abyss_data.py
@@ -56,13 +56,13 @@ async def get_half_img(data: List, half: Literal['Upper', 'Lower']):
         if 'Vers' not in up:
             break
 
-        if (ver is None) or (ver and up['Vers'][0] >= ver):
-            ver = up['Vers'][0]
+        if (ver is None) or (ver and up['Vers'][-1] >= ver):
+            ver = up['Vers'][-1]
             continue
 
     index = 0
     for wave in data:
-        if ver is not None and wave['Vers'][0] != ver:
+        if ver is not None and wave['Vers'][-1] != ver:
             continue
         monsters = wave['Monsters']
         wave_monster_uh = (((len(monsters) - 1) // 3) + 1) * 125 + 40
@@ -99,8 +99,12 @@ async def get_half_img(data: List, half: Literal['Upper', 'Lower']):
                 wave_desc = str(wave['WaveDesc'])
 
             if real_id in monster2entry_data:
-                monster_name = monster2entry_data[real_id]['name']
-                icon_name = monster2entry_data[real_id]['icon']
+                md = monster2entry_data[real_id]
+                if 'affix' in md and md['affix']:
+                    monster_name = md['affix'][0]['name']
+                else:
+                    monster_name = md['name']
+                icon_name = md['icon']
             elif 'Name' in monster:
                 monster_name = monster['Name']['CH']
                 if wave_desc in monster2entry_data:
@@ -120,6 +124,9 @@ async def get_half_img(data: List, half: Literal['Upper', 'Lower']):
                 monster_name = '未知怪物'
                 icon_name = 'UI_AnimalIcon_Inu_Tanuki_01'
 
+            monster_name = monster_name.replace('-', '·')
+            monster_name = monster_name.replace('·光', '·芒')
+
             if 'Mark' in monster:
                 if monster['Mark']:
                     monster_name = '*' + monster_name