From b771e5916f1bff9bbb89bf6609ed40905080d1b8 Mon Sep 17 00:00:00 2001
From: KimigaiiWuyi <444835641@qq.com>
Date: Mon, 16 Oct 2023 23:04:24 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D`=E6=AD=A6?=
 =?UTF-8?q?=E5=99=A8=E4=BB=8B=E7=BB=8D=E9=9B=BE=E5=88=87`=20(#592)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GenshinUID/genshinuid_wikitext/get_weapons_pic.py |   2 +-
 GenshinUID/utils/get_assets.py                    |  11 ++++++++++-
 GenshinUID/utils/image/texture2d/unknown.png      | Bin 0 -> 691 bytes
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 GenshinUID/utils/image/texture2d/unknown.png

diff --git a/GenshinUID/genshinuid_wikitext/get_weapons_pic.py b/GenshinUID/genshinuid_wikitext/get_weapons_pic.py
index c43b9cac..31ebae6f 100644
--- a/GenshinUID/genshinuid_wikitext/get_weapons_pic.py
+++ b/GenshinUID/genshinuid_wikitext/get_weapons_pic.py
@@ -195,7 +195,7 @@ async def draw_weapons_wiki_img(data: Weapon, stats: WeaponStats):
             if _cost_pic is None:
                 cost_pic = get_unknown_png()
             else:
-                cost_pic = _cost_pic.resize((64, 64))
+                cost_pic = _cost_pic.convert('RGBA').resize((64, 64))
 
             if not cost_pos and material['materialtype'] == '武器突破素材':
                 pos = material['dropdomain']
diff --git a/GenshinUID/utils/get_assets.py b/GenshinUID/utils/get_assets.py
index 4ac5b1ba..a67dee02 100644
--- a/GenshinUID/utils/get_assets.py
+++ b/GenshinUID/utils/get_assets.py
@@ -19,8 +19,10 @@ async def _get_assets(
         return Image.open(path)
     if type == 'AMBR':
         URL = AMBR_UI
+        EURL = ENKA_UI
     else:
         URL = ENKA_UI
+        EURL = AMBR_UI
     async with ClientSession() as sess:
         async with sess.get(URL.format(name)) as res:
             if res.status == 200:
@@ -29,7 +31,14 @@ async def _get_assets(
                     await f.write(content)
                 return Image.open(BytesIO(content))
             else:
-                return None
+                async with sess.get(EURL.format(name)) as res:
+                    if res.status == 200:
+                        content = await res.read()
+                        async with aiofiles.open(path, 'wb') as f:
+                            await f.write(content)
+                        return Image.open(BytesIO(content))
+                    else:
+                        return None
 
 
 async def get_assets_from_enka(name: str) -> Optional[Image.Image]:
diff --git a/GenshinUID/utils/image/texture2d/unknown.png b/GenshinUID/utils/image/texture2d/unknown.png
new file mode 100644
index 0000000000000000000000000000000000000000..2626f3162df7a8069bf93f8dac3f4de0457de482
GIT binary patch
literal 691
zcmV;k0!;mhP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj7T}ebiRCr$PnaxWTQ5c73L|dqvtTc!=5+d{k5d<Mg
z)FLQK+qSYr%b;x#*`h^%Kv3Jjz>O_~{sD_VDB8480ts4ZnW<rs-JbW{*Fff+3)0+~
zxySc`hxdBsbvVDd*Ez?ziD4LqVHk#C7>2P8NwpSAtybGf8N@y}kR;!60Y9W^`pb>P
z2BCZL7QVv}zws@O<ADBZYeSG7co)}jEBwJnxJysfdNBDt_#FR-IXs}JY#o?%7rv1M
zIWU9Wdg@$h+D(uNKcrl%|K#NrPUBD9ho^BbhPcBGa$H|m8^Rx#w=KXtp3&BSFxHOO
zaUFfkX>0XivXk{WXIR05+UAAhw_T^7{n}Ptm}EDG?)W#fEeJjR^;R#(v@JK<wC2rK
zypOMOT?XJAKB&KJ$eLCkt+z?yUF*bCctM96B7GQQx3<Lz0cGiY@1kaz)wWz|)}O$Z
zA)xH|p5h@lkma$~_#pfd{3vg8fCcQ)_P8L}C0v!10c2lrUfbh>V51r^gdDq~?Qub{
z!}vo|23W>(+8!4KYr~h4GQeldebZAJ2sh$l`uT+Y+8QSWoN`gKEMXi^f*L`{FD`DD
zo7xgDgp}Q0h!fgY7-j4PJGA<cha-hj#s#S1QoxP>91X)T3Zazm1_hS9i<D86RpA*<
zq-nZ6Zi0lr=T`mAJi*F5plKR}9CUI0T-LV2DC3F`Y4tIzwJ^%K04rL3G&&Xse9U`r
z(S6`IBTs*hYFpe8^eoDEgd4~+!7)8tC}l2#U6hm9jxSgOzsk5_7=~dOhG7_nVKkd0
Z`3oK6=Wy7CCv5-#002ovPDHLkV1g$QKE?n5

literal 0
HcmV?d00001