diff --git a/README.md b/README.md
index 3ac05ae4..1fc2779a 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,28 @@ $ pip3 install -r requirements.txt
 
 ## 更新记录
 
+#### 2021-9-7
+
+​	修改了米游社的salt值[@Azure](https://github.com/Azure99)，修复了米游社ds算法[@lulu666lululu](https://github.com/lulu666lulu)
+
+​	更换了新ui+新背景画面。
+
+​	添加了自动下载拼接头像、武器的程序，以后理论上游戏更新也通用。
+
+​	uid命令现在可以根据角色数量自动设定长宽，并且自定义背景仍然适用！并且添加了角色当前携带的武器ui界面。
+
+​	![8](C:\Users\44483\Desktop\GenshinUID\readme\8.PNG)
+
+​	UID命令在uid命令的基础上删除了武器的ui界面。
+
+​	![7](C:\Users\44483\Desktop\GenshinUID\readme\7.PNG)
+
+​	添加了深渊查询，指令：uidxxxxxx深渊xx，例如uid123456789深渊12，只能查指定楼层（beta）
+
+​	![9](C:\Users\44483\Desktop\GenshinUID\readme\9.PNG)
+
+​	删除角色命令。
+
 #### 2021-8-14
 
 ​	修复宵宫和早柚可能导致的输入错误bug。
diff --git a/__init__.py b/__init__.py
index 982f99d1..4a5254a1 100644
--- a/__init__.py
+++ b/__init__.py
@@ -3,7 +3,7 @@ import re
 #from nonebot import on_command
 #from nonebot.adapters.cqhttp import Event, Bot, Message
 
-from .getImg import draw_pic,draw_char_pic
+from .getImg import draw_pic,draw_char_pic,new_draw_pic,draw_abyss_pic
 
 from nonebot import *
 import json
@@ -39,15 +39,29 @@ async def _(bot:HoshinoBot,  ev: CQEvent):
     message = ev.message.extract_plain_text()
     uid = re.findall(r"\d+", message)[0]  # str
     m = ''.join(re.findall('[\u4e00-\u9fa5]',message))
-    if m == "角色":
+    if m == "深渊":
         try:
-            im = await draw_char_pic(uid,ev.sender['nickname'],image)
+            floor_num = re.findall(r"\d+", message)[1]
+            im = await draw_abyss_pic(uid,ev.sender['nickname'],floor_num,image)
             await bot.send(ev, im, at_sender=True)
         except:
-            await bot.send(ev,'输入也许错误！')
+            await bot.send(ev,'深渊输入错误！')
     else:
         try:
-            im = await draw_pic(uid,ev.sender['nickname'],image)
+            im = await new_draw_pic(uid,ev.sender['nickname'],image)
             await bot.send(ev, im, at_sender=True)
         except:
             await bot.send(ev,'输入错误！')
+
+
+@sv.on_prefix('UID')
+async def _(bot:HoshinoBot,  ev: CQEvent):
+    image = re.search(r"\[CQ:image,file=(.*),url=(.*)\]", str(ev.message))
+    message = ev.message.extract_plain_text()
+    uid = re.findall(r"\d+", message)[0]  # str
+    try:
+        im = await draw_pic(uid,ev.sender['nickname'],image)
+        await bot.send(ev, im, at_sender=True)
+    except:
+        await bot.send(ev,'输入错误！')
+
diff --git a/getData.py b/getData.py
index 0d047376..7a8d11a4 100644
--- a/getData.py
+++ b/getData.py
@@ -27,11 +27,11 @@ from  PIL  import   Image,ImageFont,ImageDraw
 from io import BytesIO
 import base64
 
-mhyVersion = "2.7.0"
+mhyVersion = "2.11.1"
 
 
 def cache_Cookie():
-    cookie_list = ['']#在这里输入cookies
+    cookie_list = []
     return random.choice(cookie_list)
 
 
@@ -40,13 +40,16 @@ def md5(text):
     md5.update(text.encode())
     return md5.hexdigest()
 
-
-def DSGet():
-    n = "fd3ykrh7o1j54g581upo1tvpam0dsgtf"
-    i = str(int(time.time()))
-    r = ''.join(random.sample(string.ascii_lowercase + string.digits, 6))
-    c = md5("salt=" + n + "&t=" + i + "&r=" + r)
-    return (i + "," + r + "," + c)
+def DSGet(q = "",b = None):
+    if b:
+        br = json.dumps(b)
+    else:
+        br = ""
+    s = "xV8v4Qu54lUKrEYFZkJhB8cuOh9Asafs" #@Azure99
+    t = str(int(time.time()))
+    r = str(random.randint(100000, 200000))
+    c = md5("salt=" + s + "&t=" + t + "&r=" + r + "&b=" + br + "&q=" + q) #@lulu666lulu
+    return t + "," + r + "," + c
 
 async def GetInfo(Uid, ServerID="cn_gf01",Schedule_type="1"):
     if Uid[0] == '5':
@@ -54,71 +57,75 @@ async def GetInfo(Uid, ServerID="cn_gf01",Schedule_type="1"):
     try:
         async with AsyncClient() as client:
             req = await client.get(
-                url="https://api-takumi.mihoyo.com/game_record/genshin/api/index?server=" + ServerID + "&role_id=" + Uid,
+                url="https://api-takumi.mihoyo.com/game_record/app/genshin/api/index?role_id=" + Uid + "&server=" + ServerID,
                 headers={
-                    'Accept': 'application/json, text/plain, */*',
-                    'DS': DSGet(),
-                    'Origin': 'https://webstatic.mihoyo.com',
+                    #'Accept': 'application/json, text/plain, */*',
+                    'DS': DSGet("role_id=" + Uid + "&server=" + ServerID),
+                    #'Origin': 'https://webstatic.mihoyo.com',
                     'x-rpc-app_version': mhyVersion,
-                    'User-Agent': 'Mozilla/5.0 (Linux; Android 9; Unspecified Device) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Mobile Safari/537.36 miHoYoBBS/2.2.0',
-                    'x-rpc-client_type': '2',
-                    'Referer': 'https://webstatic.mihoyo.com/app/community-game-records/index.html?v=6',
-                    'Accept-Encoding': 'gzip, deflate',
-                    'Accept-Language': 'zh-CN,en-US;q=0.8',
-                    'X-Requested-With': 'com.mihoyo.hyperion',
+                    'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) miHoYoBBS/2.11.1',
+                    'x-rpc-client_type': '5',
+                    'Referer': 'https://webstatic.mihoyo.com/',
+                    #'Accept-Encoding': 'gzip, deflate',
+                    #'Accept-Language': 'zh-CN,en-US;q=0.8',
+                    #'X-Requested-With': 'com.mihoyo.hyperion',
                     "Cookie": cache_Cookie()})
-            data1 = json.loads(req.text)
+            data = json.loads(req.text)
+        return data
+    except:
+        print("访问失败，请重试！")
+        sys.exit(1)
+
+async def GetSpiralAbyssInfo(Uid, ServerID="cn_gf01",Schedule_type="1"):
+    if Uid[0] == '5':
+        ServerID = "cn_qd01"
+    try:
         async with AsyncClient() as client:
             req = await client.get(
-                url="https://api-takumi.mihoyo.com/game_record/genshin/api/spiralAbyss?schedule_type=" + Schedule_type + "&server="+ ServerID +"&role_id=" + Uid,
+                url="https://api-takumi.mihoyo.com/game_record/app/genshin/api/spiralAbyss?schedule_type=" + Schedule_type + "&server="+ ServerID +"&role_id=" + Uid,
                 headers={
                     'Accept': 'application/json, text/plain, */*',
-                    'DS': DSGet(),
+                    'DS': DSGet("role_id=" + Uid + "&schedule_type=" + Schedule_type + "&server="+ ServerID),
                     'Origin': 'https://webstatic.mihoyo.com',
-                    'Cookie': cache_Cookie(),               
+                    'Cookie': cache_Cookie(),                
                     'x-rpc-app_version': mhyVersion,
-                    'User-Agent': 'Mozilla/5.0 (Linux; Android 9; Unspecified Device) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Mobile Safari/537.36 miHoYoBBS/2.2.0',
-                    'x-rpc-client_type': '2',
-                    'Referer': 'https://webstatic.mihoyo.com/app/community-game-records/index.html?v=6',
+                    'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) miHoYoBBS/2.11.1',
+                    'x-rpc-client_type': '5',
+                    'Referer': 'https://webstatic.mihoyo.com/',
                     'Accept-Encoding': 'gzip, deflate',
                     'Accept-Language': 'zh-CN,en-US;q=0.8',
                     'X-Requested-With': 'com.mihoyo.hyperion'
                     }
                 )
-            data2 = json.loads(req.text)
-        data = data1
-        #f=open("/root/hoshino/HoshinoBot/hoshino/modules/GenshinUID/mys/chars/666.txt",'w') 
-        #f.write(str(data))
+            data = json.loads(req.text)
         return data
-
     except:
         print("访问失败，请重试！")
         sys.exit(1)
 
+
 async def GetCharacter(Uid,Character_ids, ServerID="cn_gf01"):
     if Uid[0] == '5':
         ServerID = "cn_qd01"
     try:
         req = requests.post(
-            url = "https://api-takumi.mihoyo.com/game_record/genshin/api/character",
-            headers = {
+            url = "https://api-takumi.mihoyo.com/game_record/app/genshin/api/character",
+            headers={
                 'Accept': 'application/json, text/plain, */*',
-                'DS': DSGet(),
+                'DS': DSGet('',{"character_ids": Character_ids ,"role_id": Uid ,"server": ServerID}),
                 'Origin': 'https://webstatic.mihoyo.com',
                 'Cookie': cache_Cookie(),
                 'x-rpc-app_version': mhyVersion,
-                'User-Agent': 'Mozilla/5.0 (Linux; Android 9; Unspecified Device) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Mobile Safari/537.36 miHoYoBBS/2.2.0',
-                'x-rpc-client_type': '2',
-                'Referer': 'https://webstatic.mihoyo.com/app/community-game-records/index.html?v=6',
+                'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) miHoYoBBS/2.11.1',
+                'x-rpc-client_type': '5',
+                'Referer': 'https://webstatic.mihoyo.com/',
                 'Accept-Encoding': 'gzip, deflate',
                 'Accept-Language': 'zh-CN,en-US;q=0.8',
                 'X-Requested-With': 'com.mihoyo.hyperion'
             },
-            json = {"character_ids": Character_ids ,"role_id": Uid ,"server": ServerID }
+            json = {"character_ids": Character_ids ,"role_id": Uid ,"server": ServerID}
         )
         data2 = json.loads(req.text)
-        #f=open("/root/hoshino/HoshinoBot/hoshino/modules/GenshinUID/mys/chars/555.txt",'w') 
-        #f.write(str(data2))
         return data2
 
     except:
diff --git a/getImg.py b/getImg.py
index 16880647..fc85e38e 100644
--- a/getImg.py
+++ b/getImg.py
@@ -7,7 +7,7 @@ import math
 
 from PIL import Image, ImageDraw, ImageFont, ImageFilter
 
-from .getData import GetInfo,GetCharacter
+from .getData import GetInfo,GetCharacter,GetSpiralAbyssInfo
 
 import os
 import json
@@ -16,6 +16,7 @@ import random
 FILE_PATH = os.path.dirname(__file__)
 FILE2_PATH = os.path.join(FILE_PATH,'mys')
 CHAR_PATH = os.path.join(FILE2_PATH,'chars')
+CHAR_DONE_PATH = os.path.join(FILE2_PATH,'char_done')
 CHAR_WEAPON_PATH = os.path.join(FILE2_PATH,'char_weapon')
 TEXT_PATH = os.path.join(FILE2_PATH,'texture2d')
 WEAPON_PATH = os.path.join(FILE2_PATH,'weapon')
@@ -23,9 +24,36 @@ WEAPON_PATH = os.path.join(FILE2_PATH,'weapon')
 def ys_font(size):
     return ImageFont.truetype(os.path.join(FILE2_PATH,"yuanshen.ttf"), size=size)
 
-async def draw_pic(uid,nickname,image = None):
+def get_char_pic(id,url):
+    urllib.request.urlretrieve(f'{url}', os.path.join(CHAR_PATH,f'{id}.png'))
+
+def get_chardone_pic(id,url,star):
+    urllib.request.urlretrieve(f'{url}', os.path.join(CHAR_DONE_PATH,f'{id}.png'))
+    if star == 4:
+        star4_1 = Image.open(star4_1_path)
+        star4_2 = Image.open(star4_2_path)
+        char_path = os.path.join(CHAR_DONE_PATH,str(id) + '.png')
+        char_img = Image.open(char_path)
+        char_img = char_img.resize((104,104),Image.ANTIALIAS)
+        star4_1.paste(char_img,(12,15),char_img)
+        star4_1.paste(star4_2,(0,0),star4_2)
+        star4_1.save(os.path.join(CHAR_DONE_PATH,str(id) + '.png'))
+    else:
+        star5_1 = Image.open(star5_1_path)
+        star5_2 = Image.open(star5_2_path)
+        char_path = os.path.join(CHAR_DONE_PATH,str(id) + '.png')
+        char_img = Image.open(char_path)
+        char_img = char_img.resize((104,104),Image.ANTIALIAS)
+        star5_1.paste(char_img,(12,15),char_img)
+        star5_1.paste(star5_2,(0,0),star5_2)
+        star5_1.save(os.path.join(CHAR_DONE_PATH,str(id) + '.png'))
+    
+def get_weapon_pic(url):
+    urllib.request.urlretrieve(url, os.path.join(WEAPON_PATH, url.split('/')[-1]))
+
+async def draw_char_pic(uid,nickname,image = None):
     is_edit = False
-    if image != None:
+    if image:
         image_file= image.group(1)
         image_data = image.group(2)
         urllib.request.urlretrieve(f'{image_data}', os.path.join(TEXT_PATH,nickname + '.png'))
@@ -36,9 +64,9 @@ async def draw_pic(uid,nickname,image = None):
     if (raw_data["retcode"] != 0):
         if (raw_data["retcode"] == 10001):
             return ("Cookie错误/过期，请重置Cookie")
-        if (raw_data["retcode"] == 10101):
+        elif (raw_data["retcode"] == 10101):
             return ("当前cookies已达到30人上限！")
-        if (raw_data["retcode"] == 10102):
+        elif (raw_data["retcode"] == 10102):
             return ("当前查询id已经设置了隐私，无法查询！")
         return (
             "Api报错，返回内容为：\r\n"
@@ -47,152 +75,136 @@ async def draw_pic(uid,nickname,image = None):
     else:
         pass
 
-    bg_list = ['bg_img_1.png','bg_img_2.png','bg_img_3.png']
-    bg_path = os.path.join(TEXT_PATH,"bg.png")
+    bg_list = ['bg_img_2.png','bg_img_3.png','bg_img_4.png','bg_img_5.png']
     bg2_path = os.path.join(TEXT_PATH,random.choice(bg_list))
-    fg_path = os.path.join(TEXT_PATH,"fg_img_1.png")
-    mask_path = os.path.join(TEXT_PATH,"mask_img.png")
+
+    panle1_path = os.path.join(TEXT_PATH,"panle_1.png")
+    panle2_path = os.path.join(TEXT_PATH,"panle_2.png")
+    panle3_path = os.path.join(TEXT_PATH,"panle_3.png")
+
+    raw_data = raw_data['data']
+    char_data = raw_data["avatars"]
+
+    char_num = len(raw_data["avatars"])
+
+    char_hang = 1 + (char_num-1)//6
+    char_lie = char_num%6
+
+    based_w = 900
+    based_h = 840+char_hang*130
+    based_scale = math.ceil(based_w/based_h)
 
     if is_edit == True:
         bg_path_edit = os.path.join(TEXT_PATH,f"{nickname}.png")
-        edit_bg = Image.open(bg_path_edit)
-        w, h = edit_bg.size
-        scale_f = w / h
-        scale = '%.4f' % scale_f
-        new_w = math.ceil(1200*float(scale))
-        new_h = math.ceil(800/float(scale))
-        if w > h:
-            bg_img2 = edit_bg.resize((new_w, 1200),Image.ANTIALIAS)
-        elif float(scale) > 0.66:
-            bg_img2 = edit_bg.resize((new_w, 1200),Image.ANTIALIAS)
-        else:
-            bg_img2 = edit_bg.resize((800, new_h),Image.ANTIALIAS)
-        bg_img = bg_img2.crop((0, 0, 800, 1200))
     else:
-        bg_img = Image.open(bg2_path)
+        bg_path_edit = bg2_path
 
-    raw_data = raw_data['data']
+    edit_bg = Image.open(bg_path_edit)
+    w, h = edit_bg.size
+    scale_f = math.ceil(w / h)
+    new_w = math.ceil(based_w/float(scale_f))
+    new_h = math.ceil(based_h*float(scale_f))
+    if w > h:
+        bg_img2 = edit_bg.resize((new_h, based_h),Image.ANTIALIAS)
+    else:
+        if scale_f > based_scale:
+            bg_img2 = edit_bg.resize((900, new_h),Image.ANTIALIAS)
+        else:
+            bg_img2 = edit_bg.resize((900, new_h),Image.ANTIALIAS)
 
-    fg_img = Image.open(fg_path)
-    mask_img = Image.open(mask_path)
+    bg_img = bg_img2.crop((0, 0, 900, based_h))
 
-    #img = Image.open(bg_path)
-    area = (37, 268, 764, 1154)
-    img_bb = bg_img.crop(area)
-    img_blur = img_bb.filter(ImageFilter.GaussianBlur(4))
-    
-    bg_img.paste(img_blur, (37,268),mask_img)
+    x, y = 45, 268 
+    radius = 50
+    cropped_img = bg_img.crop((x, y, 856, based_h-45))
+    blurred_img = cropped_img.filter(ImageFilter.GaussianBlur(5),).convert("RGBA")
+    bg_img.paste(blurred_img, (x, y), create_rounded_rectangle_mask(cropped_img,radius))
 
-    bg_img.paste(fg_img,(0,0),fg_img)
+    panle1 = Image.open(panle1_path)
+    panle2 = Image.open(panle2_path)
+    panle3 = Image.open(panle3_path)
+
+    bg_img.paste(panle1,(0,0),panle1)
+    for i in range(0,char_hang):
+        bg_img.paste(panle2,(0,750+i*130),panle2)
+    bg_img.paste(panle3,(0,char_hang*130+750),panle3)
+ 
     text_draw = ImageDraw.Draw(bg_img)
 
-    text_draw.text((192.6,128.3), f"{nickname}", (217,217,217), ys_font(32))
-    text_draw.text((210.6, 165.3), 'UID ' + f"{uid}", (217,217,217), ys_font(14))
+    text_draw.text((242.6,128.3), f"{nickname}", (217,217,217), ys_font(32))
+    text_draw.text((260.6, 165.3), 'UID ' + f"{uid}", (217,217,217), ys_font(14))
 
-    char_data = raw_data["avatars"]
+    text_draw.text((640, 94.8),str(raw_data['stats']['active_day_number']), (65, 65, 65), ys_font(26))
+    text_draw.text((640, 139.3),str(raw_data['stats']['achievement_number']), (65, 65, 65), ys_font(26))
+    text_draw.text((640, 183.9),raw_data['stats']['spiral_abyss'], (65, 65, 65), ys_font(26))
 
-    index_char = ["神里绫华","琴","迪卢克","温迪","魈","可莉","钟离","达达利亚","七七","甘雨","阿贝多","莫娜","刻晴","胡桃","枫原万叶","优菈","丽莎","芭芭拉","凯亚","雷泽","安柏","香菱","北斗","行秋","凝光","菲谢尔","班尼特","诺艾尔","重云","迪奥娜","砂糖","辛焱","罗莎莉亚","烟绯","旅行者"]
+    text_draw.text((241, 390),str(raw_data['stats']['common_chest_number']),(65, 65, 65), ys_font(26))
+    text_draw.text((241, 432),str(raw_data['stats']['exquisite_chest_number']),(65, 65, 65), ys_font(26))
+    text_draw.text((241, 474),str(raw_data['stats']['precious_chest_number']), (65, 65, 65), ys_font(26))
+    text_draw.text((241, 516),str(raw_data['stats']['luxurious_chest_number']), (65, 65, 65), ys_font(26))
 
-    five_star_char = ["神里绫华","琴","迪卢克","温迪","魈","可莉","钟离","达达利亚","七七","甘雨","阿贝多","莫娜","刻晴","胡桃","枫原万叶","优菈","宵宫"]
-    four_star_char = ["丽莎","芭芭拉","凯亚","雷泽","安柏","香菱","北斗","行秋","凝光","菲谢尔","班尼特","诺艾尔","重云","迪奥娜","砂糖","辛焱","罗莎莉亚","烟绯","早柚"]
-    
-    for k in char_data:
-        if k['name'] in five_star_char:
-            k['star'] = 5
-        if k['name'] in four_star_char:
-            k['star'] = 4
-        if k['name'] == '旅行者':
-            k['star'] = 3
-    
-    #char_data.sort(key=lambda x: index_char.index(x['name']))
+    text_draw.text((241, 558),str(raw_data['stats']['avatar_number']),(65, 65, 65), ys_font(26))
+    text_draw.text((241, 600),str(raw_data['stats']['way_point_number']),(65, 65, 65), ys_font(26))
+    text_draw.text((241, 642),str(raw_data['stats']['domain_number']),(65, 65, 65), ys_font(26))
 
-    char_data.sort(key=lambda x: (-x['star'],-x['level'],-x['fetter']))
+    #蒙德
+    text_draw.text((480, 380),str(raw_data['world_explorations'][3]['exploration_percentage']/10) + '%',(65, 65, 65), ys_font(23))
+    text_draw.text((480, 410),'lv.' + str(raw_data['world_explorations'][3]['level']),(65, 65, 65), ys_font(23))
+    text_draw.text((505, 440), str(raw_data['stats']['anemoculus_number']), (65, 65, 65), ys_font(23))
 
-    text_draw.text((590, 94.8),str(raw_data['stats']['active_day_number']), (21, 21, 21), ys_font(26))
-    text_draw.text((590, 139.3),str(raw_data['stats']['achievement_number']), (21, 21, 21), ys_font(26))
-    text_draw.text((590, 183.9),raw_data['stats']['spiral_abyss'], (21, 21, 21), ys_font(26))
+    #璃月
+    text_draw.text((715, 380),str(raw_data['world_explorations'][2]['exploration_percentage']/10) + '%',(65, 65, 65), ys_font(23))
+    text_draw.text((715, 410),'lv.' + str(raw_data['world_explorations'][2]['level']),(65, 65, 65), ys_font(23))
+    text_draw.text((740, 440), str(raw_data['stats']['geoculus_number']), (65, 65, 65), ys_font(23))
 
+    #雪山
+    text_draw.text((480, 522),str(raw_data['world_explorations'][1]['exploration_percentage']/10) + '%',(65, 65, 65), ys_font(23))
+    text_draw.text((480, 556),'lv.' + str(raw_data['world_explorations'][1]['level']),(65, 65, 65), ys_font(23))
 
-    text_draw.text((635.4, 462.8), str(raw_data['stats']['anemoculus_number']), 'white', ys_font(26))
-    text_draw.text((635.4, 493.6), str(raw_data['stats']['geoculus_number']), 'white', ys_font(26))
-    text_draw.text((635.4, 524.8), str(raw_data['stats']['electroculus_number']), 'white', ys_font(26))
-
-    text_draw.text((224.6, 379.1),str(raw_data['stats']['common_chest_number']),'white', ys_font(28))
-    text_draw.text((436.5, 379.1),str(raw_data['stats']['exquisite_chest_number']),'white', ys_font(28))
-    text_draw.text((224.6, 416),str(raw_data['stats']['precious_chest_number']), 'white', ys_font(28))
-    text_draw.text((436.5, 416),str(raw_data['stats']['luxurious_chest_number']), 'white', ys_font(28))
-
-    text_draw.text((646.3, 379.1),str(raw_data['stats']['avatar_number']),'white', ys_font(26))
-    text_draw.text((646.3, 416),str(raw_data['stats']['way_point_number']),'white', ys_font(26))
-
-
-    text_draw.text((228.9, 502),str(raw_data['world_explorations'][3]['exploration_percentage']/10) + '%','white', ys_font(20))
-    text_draw.text((228.9, 538),'lv.' + str(raw_data['world_explorations'][3]['level']),'white', ys_font(20))
-
-    text_draw.text((451.1, 502),str(raw_data['world_explorations'][2]['exploration_percentage']/10) + '%','white', ys_font(20))
-    text_draw.text((451.1, 538),'lv.' + str(raw_data['world_explorations'][2]['level']),'white', ys_font(20))
-
-    text_draw.text((228.9, 606.4),str(raw_data['world_explorations'][1]['exploration_percentage']/10) + '%','white', ys_font(20))
-    text_draw.text((228.9, 641),'lv.' + str(raw_data['world_explorations'][1]['level']),'white', ys_font(20))
-
-    text_draw.text((451.1, 597),str(raw_data['world_explorations'][0]['exploration_percentage']/10) + '%','white', ys_font(20))
-    text_draw.text((451.1, 624),'lv.' + str(raw_data['world_explorations'][0]['level']),'white', ys_font(20))
-    text_draw.text((451.1, 652),'lv.' + str(raw_data['world_explorations'][0]['offerings'][0]['level']),'white', ys_font(20))
+    #稻妻
+    text_draw.text((715, 497),str(raw_data['world_explorations'][0]['exploration_percentage']/10) + '%',(65, 65, 65), ys_font(23))
+    text_draw.text((715, 525),'lv.' + str(raw_data['world_explorations'][0]['level']),(65, 65, 65), ys_font(23))
+    text_draw.text((715, 553),'lv.' + str(raw_data['world_explorations'][0]['offerings'][0]['level']),(65, 65, 65), ys_font(23))
+    text_draw.text((740, 581), str(raw_data['stats']['electroculus_number']), (65, 65, 65), ys_font(23))
 
     if len(raw_data['homes']):
-        text_draw.text((594.5, 565),'lv.' + str(raw_data['homes'][0]['level']),'white', ys_font(26))
-        text_draw.text((594.5, 598),str(raw_data['homes'][0]['visit_num']),'white', ys_font(26))
-        text_draw.text((594.5, 630),str(raw_data['homes'][0]['item_num']),'white', ys_font(26))
-        text_draw.text((594.5, 662),str(raw_data['homes'][0]['comfort_num']),'white', ys_font(26))
+        text_draw.text((480, 622),'lv.' + str(raw_data['homes'][0]['level']),(65, 65, 65), ys_font(24))
+        text_draw.text((480, 653),str(raw_data['homes'][0]['visit_num']),(65, 65, 65), ys_font(24))
+        text_draw.text((715, 622),str(raw_data['homes'][0]['item_num']),(65, 65, 65), ys_font(24))
+        text_draw.text((715, 653),str(raw_data['homes'][0]['comfort_num']),(65, 65, 65), ys_font(24))
     else:
-        text_draw.text((594.5, 616.6),'未开',(0, 0, 0), ys_font(26))
+        text_draw.text((650, 640),'未开',(0, 0, 0), ys_font(26))
+
+    char_data.sort(key=lambda x: (-x['rarity'],-x['level'],-x['fetter']))
 
     num = 0
-
     for i in raw_data['avatars']:
-        if num < 15:
-            char = os.path.join(CHAR_PATH,str(char_data[num]['id']) + ".png")
-            char_img = Image.open(char)
-            char_draw = ImageDraw.Draw(char_img)
-            char_draw.text((40,108),f'Lv.{str(char_data[num]["level"])}',(21,21,21),ys_font(18))
-            char_draw.text((95.3,19),f'{str(char_data[num]["actived_constellation_num"])}','white',ys_font(18))
-            if str(char_data[num]["fetter"]) == "10":
-                char_draw.text((95.3,40.5),"F",(21,21,21),ys_font(17))
-            else:
-                char_draw.text((95.3,40.5),f'{str(char_data[num]["fetter"])}',(21,21,21),ys_font(18))
-        
-            if num < 5:
-                char_crop = (74+133*num,750)
-                bg_img.paste(char_img,char_crop,char_img)
-            elif num >= 5 and num < 10:
-                char_crop = (74+133*(num-5),875)
-                bg_img.paste(char_img,(char_crop),char_img)
-            elif num >= 10 and num < 15:
-                char_crop = (74+133*(num-10),1000)
-                bg_img.paste(char_img,(char_crop),char_img)
-            else:
-                break
-            num = num+1
+        if not os.path.exists(os.path.join(CHAR_DONE_PATH,str(char_data[num]['id']) + ".png")):
+            get_char_pic(char_data[num]['id'],char_data[num]['image'],char_data[num]['rarity'])
+        char = os.path.join(CHAR_DONE_PATH,str(char_data[num]['id']) + ".png")
+        char_img = Image.open(char)
+        char_draw = ImageDraw.Draw(char_img)
+        char_draw.text((40,108),f'Lv.{str(char_data[num]["level"])}',(21,21,21),ys_font(18))
+        char_draw.text((95.3,19),f'{str(char_data[num]["actived_constellation_num"])}','white',ys_font(18))
+        if str(char_data[num]["fetter"]) == "10":
+            char_draw.text((95.3,40.5),"F",(21,21,21),ys_font(17))
+        else:
+            char_draw.text((95.3,40.5),f'{str(char_data[num]["fetter"])}',(21,21,21),ys_font(18))
+    
+        char_crop = (68+129*(num%6),750+130*(num//6))
+        bg_img.paste(char_img,char_crop,char_img)
+        num = num+1
 
+    bg_img = bg_img.convert('RGB')
     result_buffer = BytesIO()
-    bg_img.save(result_buffer, format='png')
+    bg_img.save(result_buffer, format='JPEG', subsampling=0, quality=100)
     imgmes = 'base64://' + b64encode(result_buffer.getvalue()).decode()
     resultmes = f"[CQ:image,file={imgmes}]"
-    #return 'base64://' + b64encode(result_buffer.getvalue()).decode()
     return resultmes
-
-def get_weapon_pic():
-    f2 = open(os.path.join(WEAPON_PATH,"weapons.json"),"r")
-    ikk = json.load(f2)
-    for k in ikk:
-        m = ikk[f'{k}']['icon']
-        urllib.request.urlretrieve(f'{m}', os.path.join(WEAPON_PATH, m.split('/')[-1]))
-        print(k)
-        time.sleep(2)
-
-async def draw_char_pic(uid,nickname,image = None):
+    
+async def new_draw_pic(uid,nickname,image = None):
     is_edit = False
-    if image != None:
+    if image:
         image_file= image.group(1)
         image_data = image.group(2)
         urllib.request.urlretrieve(f'{image_data}', os.path.join(TEXT_PATH,nickname + '.png'))
@@ -203,76 +215,159 @@ async def draw_char_pic(uid,nickname,image = None):
     if (raw_data["retcode"] != 0):
         if (raw_data["retcode"] == 10001):
             return ("Cookie错误/过期，请重置Cookie")
+        elif (raw_data["retcode"] == 10101):
+            return ("当前cookies已达到30人上限！")
+        elif (raw_data["retcode"] == 10102):
+            return ("当前查询id已经设置了隐私，无法查询！")
         return (
-                "Api报错，返回内容为：\r\n"
-                + str(raw_data) + "\r\n出现这种情况可能的UID输入错误 or 不存在"
+            "Api报错，返回内容为：\r\n"
+            + str(raw_data) + "\r\n出现这种情况可能的UID输入错误 or 不存在"
         )
     else:
         pass
 
-    bg_list = ['bg_img_1.png','bg_img_2.png',"bg_img_3.png"]
-    bg_path = os.path.join(TEXT_PATH,"bg.png")
+    bg_list = ['bg_img_2.png','bg_img_3.png','bg_img_4.png','bg_img_5.png']
     bg2_path = os.path.join(TEXT_PATH,random.choice(bg_list))
-    fg_path = os.path.join(TEXT_PATH,"char_fg_img.png")
-    mask_path = os.path.join(TEXT_PATH,"char_mask_img.png")
 
-    if is_edit == True:
-        bg_path_edit = os.path.join(TEXT_PATH,f"{nickname}.png")
-        edit_bg = Image.open(bg_path_edit)
-        w, h = edit_bg.size
-        scale_f = w / h
-        scale = '%.4f' % scale_f
-        new_w = math.ceil(1200*float(scale))
-        new_h = math.ceil(800/float(scale))
-        if w > h:
-            bg_img2 = edit_bg.resize((new_w, 1200),Image.ANTIALIAS)
-        elif float(scale) > 0.66:
-            bg_img2 = edit_bg.resize((new_w, 1200),Image.ANTIALIAS)
-        else:
-            bg_img2 = edit_bg.resize((800, new_h),Image.ANTIALIAS)
-        bg_img = bg_img2.crop((0, 0, 800, 1200))
-    else:
-        bg_img = Image.open(bg2_path)
+    panle1_path = os.path.join(TEXT_PATH,"panle_1.png")
+    panle2_path = os.path.join(TEXT_PATH,"panle_2.png")
+    panle3_path = os.path.join(TEXT_PATH,"panle_3.png")
 
-    fg_img = Image.open(fg_path)
-    mask_img = Image.open(mask_path)
+    raw_data = raw_data['data']
+    char_data = raw_data["avatars"]
 
-    #img = Image.open(bg_path)
-    area = (37, 58, 764, 1142)
-    img_bb = bg_img.crop(area)
-    img_blur = img_bb.filter(ImageFilter.GaussianBlur(4))
-    
-    bg_img.paste(img_blur, (37,268),mask_img)
-
-    bg_img.paste(fg_img,(0,0),fg_img)
-    text_draw = ImageDraw.Draw(bg_img)
-
-    #text_draw.text((192.6,128.3), f"{nickname}", (217,217,217), ys_font(32))
-    text_draw.text((297.7, 83.8), 'UID ' + f"{uid}", (245,245,245), ys_font(26))
-
-
-    charid_data = raw_data['data']["avatars"]
+    char_num = len(raw_data["avatars"])
     char_ids = []
     char_rawdata = []
 
-    for i in charid_data:
+    for i in char_data:
         char_ids.append(i["id"])
 
     char_rawdata = await GetCharacter(uid,char_ids)
-    char_data = char_rawdata["data"]["avatars"]
+    char_datas = char_rawdata["data"]["avatars"]
 
-    bar_5_path = os.path.join(TEXT_PATH,"jinglian_5.png")
-    bar_5 = Image.open(bar_5_path)
-    #bar_5.thumbnail((13, 30))
-    bar_4_path = os.path.join(TEXT_PATH,"jinglian_4.png")
-    bar_4 = Image.open(bar_4_path)
-    #bar_4.thumbnail((13, 30))
+    char_hang = 1 + (char_num-1)//6
+    char_lie = char_num%6
+
+    based_w = 900
+    based_h = 840+char_hang*130
+    based_scale = math.ceil(based_w/based_h)
+
+    if is_edit == True:
+        bg_path_edit = os.path.join(TEXT_PATH,f"{nickname}.png")
+    else:
+        bg_path_edit = bg2_path
+
+    edit_bg = Image.open(bg_path_edit)
+    w, h = edit_bg.size
+    scale_f = math.ceil(w / h)
+    new_w = math.ceil(based_w/float(scale_f))
+    new_h = math.ceil(based_h*float(scale_f))
+    if w > h:
+        bg_img2 = edit_bg.resize((new_h, based_h),Image.ANTIALIAS)
+    else:
+        if scale_f > based_scale:
+            bg_img2 = edit_bg.resize((900, new_h),Image.ANTIALIAS)
+        else:
+            bg_img2 = edit_bg.resize((900, new_h),Image.ANTIALIAS)
+
+    bg_img = bg_img2.crop((0, 0, 900, based_h))
+
+    x, y = 45, 268 
+    radius = 50
+    cropped_img = bg_img.crop((x, y, 856, based_h-45))
+    blurred_img = cropped_img.filter(ImageFilter.GaussianBlur(5),).convert("RGBA")
+    bg_img.paste(blurred_img, (x, y), create_rounded_rectangle_mask(cropped_img,radius))
+
+    panle1 = Image.open(panle1_path)
+    panle2 = Image.open(panle2_path)
+    panle3 = Image.open(panle3_path)
+
+    bg_img.paste(panle1,(0,0),panle1)
+    for i in range(0,char_hang):
+        bg_img.paste(panle2,(0,750+i*130),panle2)
+    bg_img.paste(panle3,(0,char_hang*130+750),panle3)
+ 
+    text_draw = ImageDraw.Draw(bg_img)
+
+    text_draw.text((242.6,128.3), f"{nickname}", (217,217,217), ys_font(32))
+    text_draw.text((260.6, 165.3), 'UID ' + f"{uid}", (217,217,217), ys_font(14))
+
+    text_draw.text((640, 94.8),str(raw_data['stats']['active_day_number']), (65, 65, 65), ys_font(26))
+    text_draw.text((640, 139.3),str(raw_data['stats']['achievement_number']), (65, 65, 65), ys_font(26))
+    text_draw.text((640, 183.9),raw_data['stats']['spiral_abyss'], (65, 65, 65), ys_font(26))
+
+    text_draw.text((241, 390),str(raw_data['stats']['common_chest_number']),(65, 65, 65), ys_font(26))
+    text_draw.text((241, 432),str(raw_data['stats']['exquisite_chest_number']),(65, 65, 65), ys_font(26))
+    text_draw.text((241, 474),str(raw_data['stats']['precious_chest_number']), (65, 65, 65), ys_font(26))
+    text_draw.text((241, 516),str(raw_data['stats']['luxurious_chest_number']), (65, 65, 65), ys_font(26))
+
+    text_draw.text((241, 558),str(raw_data['stats']['avatar_number']),(65, 65, 65), ys_font(26))
+    text_draw.text((241, 600),str(raw_data['stats']['way_point_number']),(65, 65, 65), ys_font(26))
+    text_draw.text((241, 642),str(raw_data['stats']['domain_number']),(65, 65, 65), ys_font(26))
+
+    #蒙德
+    text_draw.text((480, 380),str(raw_data['world_explorations'][3]['exploration_percentage']/10) + '%',(65, 65, 65), ys_font(23))
+    text_draw.text((480, 410),'lv.' + str(raw_data['world_explorations'][3]['level']),(65, 65, 65), ys_font(23))
+    text_draw.text((505, 440), str(raw_data['stats']['anemoculus_number']), (65, 65, 65), ys_font(23))
+
+    #璃月
+    text_draw.text((715, 380),str(raw_data['world_explorations'][2]['exploration_percentage']/10) + '%',(65, 65, 65), ys_font(23))
+    text_draw.text((715, 410),'lv.' + str(raw_data['world_explorations'][2]['level']),(65, 65, 65), ys_font(23))
+    text_draw.text((740, 440), str(raw_data['stats']['geoculus_number']), (65, 65, 65), ys_font(23))
+
+    #雪山
+    text_draw.text((480, 522),str(raw_data['world_explorations'][1]['exploration_percentage']/10) + '%',(65, 65, 65), ys_font(23))
+    text_draw.text((480, 556),'lv.' + str(raw_data['world_explorations'][1]['level']),(65, 65, 65), ys_font(23))
+
+    #稻妻
+    text_draw.text((715, 497),str(raw_data['world_explorations'][0]['exploration_percentage']/10) + '%',(65, 65, 65), ys_font(23))
+    text_draw.text((715, 525),'lv.' + str(raw_data['world_explorations'][0]['level']),(65, 65, 65), ys_font(23))
+    text_draw.text((715, 553),'lv.' + str(raw_data['world_explorations'][0]['offerings'][0]['level']),(65, 65, 65), ys_font(23))
+    text_draw.text((740, 581), str(raw_data['stats']['electroculus_number']), (65, 65, 65), ys_font(23))
+
+    if len(raw_data['homes']):
+        text_draw.text((480, 622),'lv.' + str(raw_data['homes'][0]['level']),(65, 65, 65), ys_font(24))
+        text_draw.text((480, 653),str(raw_data['homes'][0]['visit_num']),(65, 65, 65), ys_font(24))
+        text_draw.text((715, 622),str(raw_data['homes'][0]['item_num']),(65, 65, 65), ys_font(24))
+        text_draw.text((715, 653),str(raw_data['homes'][0]['comfort_num']),(65, 65, 65), ys_font(24))
+    else:
+        text_draw.text((650, 640),'未开',(0, 0, 0), ys_font(26))
+
+    charpic_mask_path = os.path.join(TEXT_PATH,"charpic_mask.png")
+    weaponpic_mask_path = os.path.join(TEXT_PATH,"weaponpic_mask.png")
+    s5s1_path = os.path.join(TEXT_PATH,"5s_1.png")
+    s5s2_path = os.path.join(TEXT_PATH,"5s_2.png")
+    s5s3_path = os.path.join(TEXT_PATH,"5s_3.png")
+    s5s4_path = os.path.join(TEXT_PATH,"5s_4.png")
+    s4s1_path = os.path.join(TEXT_PATH,"4s_1.png")
+    s4s2_path = os.path.join(TEXT_PATH,"4s_2.png")
+    s4s3_path = os.path.join(TEXT_PATH,"4s_3.png")
+    s4s4_path = os.path.join(TEXT_PATH,"4s_4.png")
+
+    s3s3_path = os.path.join(TEXT_PATH,"3s_3.png")
+    s2s3_path = os.path.join(TEXT_PATH,"2s_3.png")
+    s1s3_path = os.path.join(TEXT_PATH,"1s_3.png")
+
+    charpic_mask = Image.open(charpic_mask_path)
+    weaponpic_mask = Image.open(weaponpic_mask_path)
+    s5s1=Image.open(s5s1_path)
+    s5s2=Image.open(s5s2_path)
+    s5s3=Image.open(s5s3_path)
+    s5s4=Image.open(s5s4_path)
+    s4s1=Image.open(s4s1_path)
+    s4s2=Image.open(s4s2_path)
+    s4s3=Image.open(s4s3_path)
+    s4s4=Image.open(s4s4_path)
+
+    s3s3=Image.open(s3s3_path)
+    s2s3=Image.open(s2s3_path)
+    s1s3=Image.open(s1s3_path)
 
     num = 0
+    char_datas.sort(key=lambda x: (-x['rarity'],-x['level'],-x['fetter']))
 
-    char_data.sort(key=lambda x: (-x['rarity'],-x['level'],-x['fetter']))
-
-    for i in char_data:
+    for i in char_datas:
         char_mingzuo = 0
         for k in i['constellations']:
             if  k['is_actived'] == True:
@@ -283,58 +378,283 @@ async def draw_char_pic(uid,nickname,image = None):
         char_rarity = i['rarity']
 
         char_weapon = i['weapon']
+        char_weapon_star = i['weapon']['rarity']
         char_weapon_name = i['weapon']['name']
         char_weapon_level = i['weapon']['level']
         char_weapon_jinglian = i['weapon']['affix_level']
         char_weapon_icon = i['weapon']['icon']
 
-        
-        char = os.path.join(CHAR_WEAPON_PATH,str(char_id) + ".png")
+        if not os.path.exists(os.path.join(WEAPON_PATH, str(char_weapon_icon.split('/')[-1]))):
+            get_weapon_pic(char_weapon_icon)
+        if not os.path.exists(os.path.join(CHAR_PATH,str(i['id']) + ".png")):
+            get_char_pic(i['id'],i['icon'])
+
+        char = os.path.join(CHAR_PATH,str(char_id) + ".png")
         weapon = os.path.join(WEAPON_PATH, str(char_weapon_icon.split('/')[-1]))
 
         char_img = Image.open(char)
+        char_img = char_img.resize((100,100),Image.ANTIALIAS)
         weapon_img = Image.open(weapon)
-        weapon_img.thumbnail((57, 57))
-        char_draw = ImageDraw.Draw(char_img)
+        weapon_img = weapon_img.resize((47,47),Image.ANTIALIAS)
 
-        char_draw.text((47,109),f'Lv.{str(char_level)}',(21,21,21),ys_font(18))
+        charpic = Image.new("RGBA", (125, 140))
 
-        char_draw.text((110,19.5),f'{str(char_mingzuo)}','white',ys_font(18))
+        if char_rarity == 5:
+            charpic.paste(s5s1,(0,0),s5s1)
+            baseda = Image.new("RGBA", (100, 100))
+            cc = Image.composite(char_img, baseda, charpic_mask)
+            charpic.paste(cc,(6,15),cc)
+            charpic.paste(s5s2,(0,0),s5s2)
+            if char_weapon_star == 5:
+                charpic.paste(s5s3,(0,0),s5s3)
+            elif char_weapon_star == 4:
+                charpic.paste(s4s3,(0,0),s4s3)
+            elif char_weapon_star == 3:
+                charpic.paste(s3s3,(0,0),s3s3)
+            elif char_weapon_star == 2:
+                charpic.paste(s2s3,(0,0),s2s3)
+            elif char_weapon_star == 1:
+                charpic.paste(s1s3,(0,0),s1s3)
+            basedb = Image.new("RGBA", (47, 47))
+            dd = Image.composite(weapon_img, basedb, weaponpic_mask)
+            charpic.paste(dd,(69,62),dd)
+            charpic.paste(s5s4,(0,0),s5s4)
 
-        if str(char_data[num]["fetter"]) == "10":
-            char_draw.text((110,41.5),"F",(21,21,21),ys_font(17))
         else:
-            char_draw.text((110,41.5),f'{str(char_fetter)}',(21,21,21),ys_font(18))
+            charpic.paste(s4s1,(0,0),s4s1)
+            baseda = Image.new("RGBA", (100, 100))
+            cc = Image.composite(char_img, baseda, charpic_mask)
+            charpic.paste(cc,(6,15),cc)
+            charpic.paste(s4s2,(0,0),s4s2)
+            if char_weapon_star == 5:
+                charpic.paste(s5s3,(0,0),s5s3)
+            elif char_weapon_star == 4:
+                charpic.paste(s4s3,(0,0),s4s3)
+            elif char_weapon_star == 3:
+                charpic.paste(s3s3,(0,0),s3s3)
+            elif char_weapon_star == 2:
+                charpic.paste(s2s3,(0,0),s2s3)
+            elif char_weapon_star == 1:
+                charpic.paste(s1s3,(0,0),s1s3)
+            basedb = Image.new("RGBA", (47, 47))
+            dd = Image.composite(weapon_img, basedb, weaponpic_mask)
+            charpic.paste(dd,(69,62),dd)
+            charpic.paste(s4s4,(0,0),s4s4)
 
-        char_img.paste(weapon_img,(70,52),weapon_img)
-
-        #if char_rarity == 4:
-        #    for j in range(0,char_weapon_jinglian):
-        #        char_img.paste(bar_4,(116,97-8*j),bar_4)
-        #elif char_rarity == 5:
-        #    for j in range(0,char_weapon_jinglian):
-        #        char_img.paste(bar_5,(116,97-8*j),bar_5)
-
-        if char_rarity == 4:
-            char_img.paste(bar_4,(110,92),bar_4)
-            char_draw.text((112,91),f'{str(char_weapon_jinglian)}','black',ys_font(14))
-        elif char_rarity == 5:
-            char_img.paste(bar_5,(110,92),bar_5)
-            char_draw.text((112,91),f'{str(char_weapon_jinglian)}','black',ys_font(14))
-
-        if num < 35:
-            char_crop = (53+137*(num%5),181+131*(num//5))
-            bg_img.paste(char_img,char_crop,char_img)
+        char_draw = ImageDraw.Draw(charpic)
+        char_draw.text((38,106),f'Lv.{str(char_level)}',(21,21,21),ys_font(18))
+        char_draw.text((104.5,91.5),f'{str(char_weapon_jinglian)}','white',ys_font(10))
+        char_draw.text((99,19.5),f'{str(char_mingzuo)}','white',ys_font(18))
+        if str(i["fetter"]) == "10":
+            char_draw.text((98,42),"♥",(21,21,21),ys_font(14))
         else:
-            break
+            char_draw.text((100,41),f'{str(char_fetter)}',(21,21,21),ys_font(16))
+        
+        char_crop = (68+129*(num%6),750+130*(num//6))
+        bg_img.paste(charpic,char_crop,charpic)
         num = num+1
 
+    bg_img = bg_img.convert('RGB')
     result_buffer = BytesIO()
-    bg_img.save(result_buffer, format='png')
+    bg_img.save(result_buffer, format='JPEG', subsampling=0, quality=100)
     imgmes = 'base64://' + b64encode(result_buffer.getvalue()).decode()
     resultmes = f"[CQ:image,file={imgmes}]"
-    #return 'base64://' + b64encode(result_buffer.getvalue()).decode()
     return resultmes
+
+async def draw_abyss_pic(uid,nickname,floor_num,image = None):
+    is_edit = False
+    if image != None:
+        image_file= image.group(1)
+        image_data = image.group(2)
+        urllib.request.urlretrieve(f'{image_data}', os.path.join(TEXT_PATH,nickname + '.png'))
+        is_edit = True
+
+    raw_data = await GetSpiralAbyssInfo(uid)
+    raw_char_data = await GetInfo(uid)
+
+    if (raw_data["retcode"] != 0):
+        if (raw_data["retcode"] == 10001):
+            return ("Cookie错误/过期，请重置Cookie")
+        elif (raw_data["retcode"] == 10101):
+            return ("当前cookies已达到30人上限！")
+        elif (raw_data["retcode"] == 10102):
+            return ("当前查询id已经设置了隐私，无法查询！")
+        return (
+            "Api报错，返回内容为：\r\n"
+            + str(raw_data) + "\r\n出现这种情况可能的UID输入错误 or 不存在"
+        )
+    else:
+        pass
+
+    raw_data = raw_data["data"]
+    raw_char_data = raw_char_data['data']["avatars"]
+
+    floors_data = raw_data['floors']
+
+    based_data = []
+    for i in floors_data:
+        if str(i['index']) == floor_num:
+            based_data = i
+
+    floor_star = based_data['star']
+    floors1_star = based_data['levels'][0]['star']
+    floors2_star = based_data['levels'][1]['star']
+    floors3_star = based_data['levels'][2]['star']
+    start_time1 = based_data['levels'][0]['battles'][0]['timestamp']
+    start_time2 = based_data['levels'][0]['battles'][1]['timestamp']
+
+    bg_list = ['bg_img_2.png','bg_img_3.png','bg_img_4.png','bg_img_5.png']
+    bg2_path = os.path.join(TEXT_PATH,random.choice(bg_list))
+
+    abyss1_path = os.path.join(TEXT_PATH,"abyss_1.png")
+    abyss2_path = os.path.join(TEXT_PATH,"abyss_2.png")
+    abyss3_path = os.path.join(TEXT_PATH,"abyss_3.png")
+    abyss_star0_path = os.path.join(TEXT_PATH,"abyss_star0.png")
+    abyss_star1_path = os.path.join(TEXT_PATH,"abyss_star1.png")
+
+    levels_num = len(based_data['levels'])
+
+    based_w = 800
+    based_h = 240+levels_num*340
+    based_scale = math.ceil(based_w/based_h)
+
+    if is_edit == True:
+        bg_path_edit = os.path.join(TEXT_PATH,f"{nickname}.png")
+    else:
+        bg_path_edit = bg2_path
+
+    edit_bg = Image.open(bg_path_edit)
+    w, h = edit_bg.size
+    scale_f = math.ceil(w / h)
+    new_w = math.ceil(based_w/float(scale_f))
+    new_h = math.ceil(based_h*float(scale_f))
+    if w > h:
+        bg_img2 = edit_bg.resize((new_h, based_h),Image.ANTIALIAS)
+    else:
+        if scale_f > based_scale:
+            bg_img2 = edit_bg.resize((900, new_h),Image.ANTIALIAS)
+        else:
+            bg_img2 = edit_bg.resize((900, new_h),Image.ANTIALIAS)
+
+    bg_img = bg_img2.crop((0, 0, based_w, based_h))
+
+    for i in range(0,len(based_data['levels'])):
+        x, y = 40, 220 + 340*i 
+        radius = 40
+        cropped_img = bg_img.crop((x, y, 760, 518+340*i))
+        blurred_img = cropped_img.filter(ImageFilter.GaussianBlur(5),).convert("RGBA")
+        bg_img.paste(blurred_img, (x, y), create_rounded_rectangle_mask(cropped_img,radius))
+
+    abyss1 = Image.open(abyss1_path)
+    abyss3 = Image.open(abyss3_path)
+    abyss_star0 = Image.open(abyss_star0_path)
+    abyss_star1 = Image.open(abyss_star1_path)
+
+    bg_img.paste(abyss1,(0,0),abyss1)
+
+    for j in range(0,len(based_data['levels'])):
+        abyss2 = Image.open(abyss2_path)
+        num_1 = 0
+        avatars = based_data['levels'][j]['battles'][0]['avatars'] + based_data['levels'][j]['battles'][1]['avatars']
+        for i in based_data['levels'][j]['battles'][0]['avatars']:
+            if not os.path.exists(os.path.join(CHAR_DONE_PATH,str(i['id']) + ".png")):
+                get_chardone_pic(char_data[num_1]['id'],char_data[num_1]['image'],char_data[num_1]['rarity'])
+            char = os.path.join(CHAR_DONE_PATH,str(i['id']) + ".png")
+            char_img = Image.open(char)
+            char_draw = ImageDraw.Draw(char_img)
+            for k in raw_char_data:
+                if k['id'] == i['id']:
+                    char_draw.text((40,108),f'Lv.{str(k["level"])}',(21,21,21),ys_font(18))
+                    char_draw.text((95.3,19),f'{str(k["actived_constellation_num"])}','white',ys_font(18))
+                    if str(k["fetter"]) == "10":
+                        char_draw.text((95.3,40.5),"F",(21,21,21),ys_font(17))
+                    else:
+                        char_draw.text((95.3,40.5),f'{str(k["fetter"])}',(21,21,21),ys_font(18))
+            char_crop = (41 + 125*(num_1%4),46)
+            abyss2.paste(char_img,char_crop,char_img)
+            num_1 = num_1 + 1
+        num_2 = 0
+        for i in based_data['levels'][j]['battles'][1]['avatars']:
+            if not os.path.exists(os.path.join(CHAR_DONE_PATH,str(i['id']) + ".png")):
+                get_chardone_pic(char_data[num_2]['id'],char_data[num_2]['image'],char_data[num_2]['rarity'])
+            char = os.path.join(CHAR_DONE_PATH,str(i['id']) + ".png")
+            char_img = Image.open(char)
+            char_draw = ImageDraw.Draw(char_img)
+            for k in raw_char_data:
+                if k['id'] == i['id']:
+                    char_draw.text((40,108),f'Lv.{str(k["level"])}',(21,21,21),ys_font(18))
+                    char_draw.text((95.3,19),f'{str(k["actived_constellation_num"])}','white',ys_font(18))
+                    if str(k["fetter"]) == "10":
+                        char_draw.text((95.3,40.5),"F",(21,21,21),ys_font(17))
+                    else:
+                        char_draw.text((95.3,40.5),f'{str(k["fetter"])}',(21,21,21),ys_font(18))
+            char_crop = (41 + 125*(num_2%4),180)
+            abyss2.paste(char_img,char_crop,char_img)
+            num_2 = num_2 + 1
+        star_num = based_data['levels'][j]['star']
+        if star_num == 1:
+            abyss2.paste(abyss_star1,(570,155),abyss_star1)
+            abyss2.paste(abyss_star0,(615,155),abyss_star0)
+            abyss2.paste(abyss_star0,(660,155),abyss_star0)
+        elif star_num == 0:
+            abyss2.paste(abyss_star0,(570,155),abyss_star0)
+            abyss2.paste(abyss_star0,(615,155),abyss_star0)
+            abyss2.paste(abyss_star0,(660,155),abyss_star0)
+        elif star_num == 2:
+            abyss2.paste(abyss_star1,(570,155),abyss_star1)
+            abyss2.paste(abyss_star1,(615,155),abyss_star1)
+            abyss2.paste(abyss_star0,(660,155),abyss_star0)
+        else:
+            abyss2.paste(abyss_star1,(570,155),abyss_star1)
+            abyss2.paste(abyss_star1,(615,155),abyss_star1)
+            abyss2.paste(abyss_star1,(660,155),abyss_star1)
+        abyss2_text_draw = ImageDraw.Draw(abyss2)
+        abyss2_text_draw.text((58,30),f"第{j+1}间", (20,20,20), ys_font(21))
+        timeStamp1 = int(based_data['levels'][j]['battles'][0]['timestamp'])
+        timeStamp2 = int(based_data['levels'][j]['battles'][1]['timestamp'])
+        timeArray1 = time.localtime(timeStamp1)
+        timeArray2 = time.localtime(timeStamp2)
+        otherStyleTime1 = time.strftime("%Y--%m--%d %H:%M:%S", timeArray1)
+        otherStyleTime2 = time.strftime("%Y--%m--%d %H:%M:%S", timeArray2)
+        abyss2_text_draw.text((138,33), f"{otherStyleTime1}/{otherStyleTime2}", (40,40,40), ys_font(19))
+        bg_img.paste(abyss2,(0,200+j*340),abyss2)
     
-async def get_char_data(uid,nickname,image = None):
-    pass
\ No newline at end of file
+    bg_img.paste(abyss3,(0,len(based_data['levels'])*340+200),abyss3)
+ 
+    text_draw = ImageDraw.Draw(bg_img)
+
+    text_draw.text((171.6,89.3), f"{nickname}", (217,217,217), ys_font(32))
+    text_draw.text((189.6, 126.3), 'UID ' + f"{uid}", (217,217,217), ys_font(14))
+    if floor_num == 9:
+        text_draw.text((642, 78), f"{floor_num}", (29,30,63), ys_font(60))
+    else:
+        text_draw.text((623.3, 76), f"{floor_num}", (29,30,63), ys_font(60))
+
+    bg_img = bg_img.convert('RGB')
+    result_buffer = BytesIO()
+    bg_img.save(result_buffer, format='JPEG', subsampling=0, quality=100)
+    #bg_img.save(result_buffer, format='PNG')
+    imgmes = 'base64://' + b64encode(result_buffer.getvalue()).decode()
+    resultmes = f"[CQ:image,file={imgmes}]"
+    return resultmes
+
+def create_rounded_rectangle_mask(rectangle, radius):
+    solid_fill =  (50,50,50,255) 
+    i = Image.new("RGBA",rectangle.size,(0,0,0,0))
+
+    corner = Image.new('RGBA', (radius, radius), (0, 0, 0, 0))
+    draw = ImageDraw.Draw(corner)
+    draw.pieslice((0, 0, radius * 2, radius * 2), 180, 270, fill = solid_fill)
+
+    mx,my = rectangle.size
+
+    i.paste(corner, (0, 0), corner)
+    i.paste(corner.rotate(90), (0, my - radius),corner.rotate(90))
+    i.paste(corner.rotate(180), (mx - radius,   my - radius),corner.rotate(180))
+    i.paste(corner.rotate(270), (mx - radius, 0),corner.rotate(270))
+
+    draw = ImageDraw.Draw(i)
+    draw.rectangle( [(radius,0),(mx-radius,my)],fill=solid_fill)
+    draw.rectangle( [(0,radius),(mx,my-radius)],fill=solid_fill)
+
+    return i
\ No newline at end of file
diff --git a/mys/char_done/10000002.png b/mys/char_done/10000002.png
new file mode 100644
index 00000000..096e190a
Binary files /dev/null and b/mys/char_done/10000002.png differ
diff --git a/mys/char_done/10000003.png b/mys/char_done/10000003.png
new file mode 100644
index 00000000..d73a8961
Binary files /dev/null and b/mys/char_done/10000003.png differ
diff --git a/mys/char_done/10000005.png b/mys/char_done/10000005.png
new file mode 100644
index 00000000..c4334085
Binary files /dev/null and b/mys/char_done/10000005.png differ
diff --git a/mys/char_done/10000006.png b/mys/char_done/10000006.png
new file mode 100644
index 00000000..2dd20349
Binary files /dev/null and b/mys/char_done/10000006.png differ
diff --git a/mys/char_done/10000007.png b/mys/char_done/10000007.png
new file mode 100644
index 00000000..b6fc84fc
Binary files /dev/null and b/mys/char_done/10000007.png differ
diff --git a/mys/char_done/10000014.png b/mys/char_done/10000014.png
new file mode 100644
index 00000000..faa193f8
Binary files /dev/null and b/mys/char_done/10000014.png differ
diff --git a/mys/char_done/10000015.png b/mys/char_done/10000015.png
new file mode 100644
index 00000000..389fcf4c
Binary files /dev/null and b/mys/char_done/10000015.png differ
diff --git a/mys/char_done/10000016.png b/mys/char_done/10000016.png
new file mode 100644
index 00000000..e8763b67
Binary files /dev/null and b/mys/char_done/10000016.png differ
diff --git a/mys/char_done/10000020.png b/mys/char_done/10000020.png
new file mode 100644
index 00000000..485d0d1d
Binary files /dev/null and b/mys/char_done/10000020.png differ
diff --git a/mys/char_done/10000021.png b/mys/char_done/10000021.png
new file mode 100644
index 00000000..7bf50476
Binary files /dev/null and b/mys/char_done/10000021.png differ
diff --git a/mys/char_done/10000022.png b/mys/char_done/10000022.png
new file mode 100644
index 00000000..be9f137a
Binary files /dev/null and b/mys/char_done/10000022.png differ
diff --git a/mys/char_done/10000023.png b/mys/char_done/10000023.png
new file mode 100644
index 00000000..7e0d28a8
Binary files /dev/null and b/mys/char_done/10000023.png differ
diff --git a/mys/char_done/10000024.png b/mys/char_done/10000024.png
new file mode 100644
index 00000000..80440b6b
Binary files /dev/null and b/mys/char_done/10000024.png differ
diff --git a/mys/char_done/10000025.png b/mys/char_done/10000025.png
new file mode 100644
index 00000000..c4bbc3c1
Binary files /dev/null and b/mys/char_done/10000025.png differ
diff --git a/mys/char_done/10000026.png b/mys/char_done/10000026.png
new file mode 100644
index 00000000..13ee9fd8
Binary files /dev/null and b/mys/char_done/10000026.png differ
diff --git a/mys/char_done/10000027.png b/mys/char_done/10000027.png
new file mode 100644
index 00000000..66d084bf
Binary files /dev/null and b/mys/char_done/10000027.png differ
diff --git a/mys/char_done/10000029.png b/mys/char_done/10000029.png
new file mode 100644
index 00000000..844862c1
Binary files /dev/null and b/mys/char_done/10000029.png differ
diff --git a/mys/char_done/10000030.png b/mys/char_done/10000030.png
new file mode 100644
index 00000000..440f6b74
Binary files /dev/null and b/mys/char_done/10000030.png differ
diff --git a/mys/char_done/10000031.png b/mys/char_done/10000031.png
new file mode 100644
index 00000000..0045003d
Binary files /dev/null and b/mys/char_done/10000031.png differ
diff --git a/mys/char_done/10000032.png b/mys/char_done/10000032.png
new file mode 100644
index 00000000..9ace75ff
Binary files /dev/null and b/mys/char_done/10000032.png differ
diff --git a/mys/char_done/10000033.png b/mys/char_done/10000033.png
new file mode 100644
index 00000000..18174a15
Binary files /dev/null and b/mys/char_done/10000033.png differ
diff --git a/mys/char_done/10000034.png b/mys/char_done/10000034.png
new file mode 100644
index 00000000..e0dd3605
Binary files /dev/null and b/mys/char_done/10000034.png differ
diff --git a/mys/char_done/10000035.png b/mys/char_done/10000035.png
new file mode 100644
index 00000000..b6ab9e5b
Binary files /dev/null and b/mys/char_done/10000035.png differ
diff --git a/mys/char_done/10000036.png b/mys/char_done/10000036.png
new file mode 100644
index 00000000..95d1e579
Binary files /dev/null and b/mys/char_done/10000036.png differ
diff --git a/mys/char_done/10000037.png b/mys/char_done/10000037.png
new file mode 100644
index 00000000..19932560
Binary files /dev/null and b/mys/char_done/10000037.png differ
diff --git a/mys/chars/10000038.png b/mys/char_done/10000038.png
similarity index 100%
rename from mys/chars/10000038.png
rename to mys/char_done/10000038.png
diff --git a/mys/char_done/10000039.png b/mys/char_done/10000039.png
new file mode 100644
index 00000000..58a37b23
Binary files /dev/null and b/mys/char_done/10000039.png differ
diff --git a/mys/char_done/10000041.png b/mys/char_done/10000041.png
new file mode 100644
index 00000000..28014055
Binary files /dev/null and b/mys/char_done/10000041.png differ
diff --git a/mys/char_done/10000042.png b/mys/char_done/10000042.png
new file mode 100644
index 00000000..36e5e269
Binary files /dev/null and b/mys/char_done/10000042.png differ
diff --git a/mys/char_done/10000043.png b/mys/char_done/10000043.png
new file mode 100644
index 00000000..34eb8a2a
Binary files /dev/null and b/mys/char_done/10000043.png differ
diff --git a/mys/char_done/10000044.png b/mys/char_done/10000044.png
new file mode 100644
index 00000000..32351d71
Binary files /dev/null and b/mys/char_done/10000044.png differ
diff --git a/mys/char_done/10000045.png b/mys/char_done/10000045.png
new file mode 100644
index 00000000..9838608b
Binary files /dev/null and b/mys/char_done/10000045.png differ
diff --git a/mys/char_done/10000046.png b/mys/char_done/10000046.png
new file mode 100644
index 00000000..dee1eb9b
Binary files /dev/null and b/mys/char_done/10000046.png differ
diff --git a/mys/char_done/10000047.png b/mys/char_done/10000047.png
new file mode 100644
index 00000000..9b522251
Binary files /dev/null and b/mys/char_done/10000047.png differ
diff --git a/mys/char_done/10000048.png b/mys/char_done/10000048.png
new file mode 100644
index 00000000..727f6b51
Binary files /dev/null and b/mys/char_done/10000048.png differ
diff --git a/mys/char_done/10000049.png b/mys/char_done/10000049.png
new file mode 100644
index 00000000..cff166a8
Binary files /dev/null and b/mys/char_done/10000049.png differ
diff --git a/mys/char_done/10000051.png b/mys/char_done/10000051.png
new file mode 100644
index 00000000..03590717
Binary files /dev/null and b/mys/char_done/10000051.png differ
diff --git a/mys/char_done/10000052.png b/mys/char_done/10000052.png
new file mode 100644
index 00000000..af0bdd34
Binary files /dev/null and b/mys/char_done/10000052.png differ
diff --git a/mys/char_done/10000053.png b/mys/char_done/10000053.png
new file mode 100644
index 00000000..7a5d316a
Binary files /dev/null and b/mys/char_done/10000053.png differ
diff --git a/mys/char_done/10000056.png b/mys/char_done/10000056.png
new file mode 100644
index 00000000..718def7f
Binary files /dev/null and b/mys/char_done/10000056.png differ
diff --git a/mys/char_done/10000062.png b/mys/char_done/10000062.png
new file mode 100644
index 00000000..2e555cf2
Binary files /dev/null and b/mys/char_done/10000062.png differ
diff --git a/mys/char_weapon/10000002.png b/mys/char_weapon/10000002.png
deleted file mode 100644
index 42e6ae45..00000000
Binary files a/mys/char_weapon/10000002.png and /dev/null differ
diff --git a/mys/char_weapon/10000003.png b/mys/char_weapon/10000003.png
deleted file mode 100644
index e58aaccb..00000000
Binary files a/mys/char_weapon/10000003.png and /dev/null differ
diff --git a/mys/char_weapon/10000005.png b/mys/char_weapon/10000005.png
deleted file mode 100644
index 29f6ec1e..00000000
Binary files a/mys/char_weapon/10000005.png and /dev/null differ
diff --git a/mys/char_weapon/10000006.png b/mys/char_weapon/10000006.png
deleted file mode 100644
index 1b870183..00000000
Binary files a/mys/char_weapon/10000006.png and /dev/null differ
diff --git a/mys/char_weapon/10000007.png b/mys/char_weapon/10000007.png
deleted file mode 100644
index 8391e563..00000000
Binary files a/mys/char_weapon/10000007.png and /dev/null differ
diff --git a/mys/char_weapon/10000014.png b/mys/char_weapon/10000014.png
deleted file mode 100644
index 1d6ace5a..00000000
Binary files a/mys/char_weapon/10000014.png and /dev/null differ
diff --git a/mys/char_weapon/10000015.png b/mys/char_weapon/10000015.png
deleted file mode 100644
index 12c9f458..00000000
Binary files a/mys/char_weapon/10000015.png and /dev/null differ
diff --git a/mys/char_weapon/10000016.png b/mys/char_weapon/10000016.png
deleted file mode 100644
index 89e11568..00000000
Binary files a/mys/char_weapon/10000016.png and /dev/null differ
diff --git a/mys/char_weapon/10000020.png b/mys/char_weapon/10000020.png
deleted file mode 100644
index e7cc707c..00000000
Binary files a/mys/char_weapon/10000020.png and /dev/null differ
diff --git a/mys/char_weapon/10000021.png b/mys/char_weapon/10000021.png
deleted file mode 100644
index ab7069e7..00000000
Binary files a/mys/char_weapon/10000021.png and /dev/null differ
diff --git a/mys/char_weapon/10000022.png b/mys/char_weapon/10000022.png
deleted file mode 100644
index 5e80af1a..00000000
Binary files a/mys/char_weapon/10000022.png and /dev/null differ
diff --git a/mys/char_weapon/10000023.png b/mys/char_weapon/10000023.png
deleted file mode 100644
index e102a6a5..00000000
Binary files a/mys/char_weapon/10000023.png and /dev/null differ
diff --git a/mys/char_weapon/10000024.png b/mys/char_weapon/10000024.png
deleted file mode 100644
index bfa75d9d..00000000
Binary files a/mys/char_weapon/10000024.png and /dev/null differ
diff --git a/mys/char_weapon/10000025.png b/mys/char_weapon/10000025.png
deleted file mode 100644
index e7b5a570..00000000
Binary files a/mys/char_weapon/10000025.png and /dev/null differ
diff --git a/mys/char_weapon/10000026.png b/mys/char_weapon/10000026.png
deleted file mode 100644
index 852a58ea..00000000
Binary files a/mys/char_weapon/10000026.png and /dev/null differ
diff --git a/mys/char_weapon/10000027.png b/mys/char_weapon/10000027.png
deleted file mode 100644
index c05b828b..00000000
Binary files a/mys/char_weapon/10000027.png and /dev/null differ
diff --git a/mys/char_weapon/10000029.png b/mys/char_weapon/10000029.png
deleted file mode 100644
index de69a6e4..00000000
Binary files a/mys/char_weapon/10000029.png and /dev/null differ
diff --git a/mys/char_weapon/10000030.png b/mys/char_weapon/10000030.png
deleted file mode 100644
index 39795eeb..00000000
Binary files a/mys/char_weapon/10000030.png and /dev/null differ
diff --git a/mys/char_weapon/10000031.png b/mys/char_weapon/10000031.png
deleted file mode 100644
index e1a4cd82..00000000
Binary files a/mys/char_weapon/10000031.png and /dev/null differ
diff --git a/mys/char_weapon/10000032.png b/mys/char_weapon/10000032.png
deleted file mode 100644
index b1ad51e9..00000000
Binary files a/mys/char_weapon/10000032.png and /dev/null differ
diff --git a/mys/char_weapon/10000033.png b/mys/char_weapon/10000033.png
deleted file mode 100644
index a622c155..00000000
Binary files a/mys/char_weapon/10000033.png and /dev/null differ
diff --git a/mys/char_weapon/10000034.png b/mys/char_weapon/10000034.png
deleted file mode 100644
index 263cedc1..00000000
Binary files a/mys/char_weapon/10000034.png and /dev/null differ
diff --git a/mys/char_weapon/10000035.png b/mys/char_weapon/10000035.png
deleted file mode 100644
index 05290785..00000000
Binary files a/mys/char_weapon/10000035.png and /dev/null differ
diff --git a/mys/char_weapon/10000036.png b/mys/char_weapon/10000036.png
deleted file mode 100644
index ef2f7e40..00000000
Binary files a/mys/char_weapon/10000036.png and /dev/null differ
diff --git a/mys/char_weapon/10000037.png b/mys/char_weapon/10000037.png
deleted file mode 100644
index 15877b25..00000000
Binary files a/mys/char_weapon/10000037.png and /dev/null differ
diff --git a/mys/char_weapon/10000038.png b/mys/char_weapon/10000038.png
deleted file mode 100644
index 20eb1429..00000000
Binary files a/mys/char_weapon/10000038.png and /dev/null differ
diff --git a/mys/char_weapon/10000039.png b/mys/char_weapon/10000039.png
deleted file mode 100644
index c7348617..00000000
Binary files a/mys/char_weapon/10000039.png and /dev/null differ
diff --git a/mys/char_weapon/10000041.png b/mys/char_weapon/10000041.png
deleted file mode 100644
index d85871ba..00000000
Binary files a/mys/char_weapon/10000041.png and /dev/null differ
diff --git a/mys/char_weapon/10000042.png b/mys/char_weapon/10000042.png
deleted file mode 100644
index c40f00e8..00000000
Binary files a/mys/char_weapon/10000042.png and /dev/null differ
diff --git a/mys/char_weapon/10000043.png b/mys/char_weapon/10000043.png
deleted file mode 100644
index a0ed531a..00000000
Binary files a/mys/char_weapon/10000043.png and /dev/null differ
diff --git a/mys/char_weapon/10000044.png b/mys/char_weapon/10000044.png
deleted file mode 100644
index 5e5bd5e9..00000000
Binary files a/mys/char_weapon/10000044.png and /dev/null differ
diff --git a/mys/char_weapon/10000045.png b/mys/char_weapon/10000045.png
deleted file mode 100644
index cbcd622c..00000000
Binary files a/mys/char_weapon/10000045.png and /dev/null differ
diff --git a/mys/char_weapon/10000046.png b/mys/char_weapon/10000046.png
deleted file mode 100644
index dcbe89c6..00000000
Binary files a/mys/char_weapon/10000046.png and /dev/null differ
diff --git a/mys/char_weapon/10000047.png b/mys/char_weapon/10000047.png
deleted file mode 100644
index 091319ff..00000000
Binary files a/mys/char_weapon/10000047.png and /dev/null differ
diff --git a/mys/char_weapon/10000048.png b/mys/char_weapon/10000048.png
deleted file mode 100644
index c166b087..00000000
Binary files a/mys/char_weapon/10000048.png and /dev/null differ
diff --git a/mys/char_weapon/10000049.png b/mys/char_weapon/10000049.png
deleted file mode 100644
index f2924853..00000000
Binary files a/mys/char_weapon/10000049.png and /dev/null differ
diff --git a/mys/char_weapon/10000051.png b/mys/char_weapon/10000051.png
deleted file mode 100644
index 70f75fcb..00000000
Binary files a/mys/char_weapon/10000051.png and /dev/null differ
diff --git a/mys/char_weapon/10000053.png b/mys/char_weapon/10000053.png
deleted file mode 100644
index 07d02898..00000000
Binary files a/mys/char_weapon/10000053.png and /dev/null differ
diff --git a/mys/chars/10000002.png b/mys/chars/10000002.png
index 096e190a..ccb1b44a 100644
Binary files a/mys/chars/10000002.png and b/mys/chars/10000002.png differ
diff --git a/mys/chars/10000003.png b/mys/chars/10000003.png
index d73a8961..ae6eab54 100644
Binary files a/mys/chars/10000003.png and b/mys/chars/10000003.png differ
diff --git a/mys/chars/10000005.png b/mys/chars/10000005.png
index c4334085..bdea303a 100644
Binary files a/mys/chars/10000005.png and b/mys/chars/10000005.png differ
diff --git a/mys/chars/10000006.png b/mys/chars/10000006.png
index 2dd20349..bbb04a67 100644
Binary files a/mys/chars/10000006.png and b/mys/chars/10000006.png differ
diff --git a/mys/chars/10000007.png b/mys/chars/10000007.png
index b6fc84fc..b3294257 100644
Binary files a/mys/chars/10000007.png and b/mys/chars/10000007.png differ
diff --git a/mys/chars/10000014.png b/mys/chars/10000014.png
index faa193f8..7a6cc4d2 100644
Binary files a/mys/chars/10000014.png and b/mys/chars/10000014.png differ
diff --git a/mys/chars/10000015.png b/mys/chars/10000015.png
index 389fcf4c..890539ab 100644
Binary files a/mys/chars/10000015.png and b/mys/chars/10000015.png differ
diff --git a/mys/chars/10000016.png b/mys/chars/10000016.png
index e8763b67..1539860c 100644
Binary files a/mys/chars/10000016.png and b/mys/chars/10000016.png differ
diff --git a/mys/chars/10000020.png b/mys/chars/10000020.png
index 485d0d1d..df3ccc95 100644
Binary files a/mys/chars/10000020.png and b/mys/chars/10000020.png differ
diff --git a/mys/chars/10000021.png b/mys/chars/10000021.png
index 7bf50476..48a405b8 100644
Binary files a/mys/chars/10000021.png and b/mys/chars/10000021.png differ
diff --git a/mys/chars/10000022.png b/mys/chars/10000022.png
index be9f137a..f05317f4 100644
Binary files a/mys/chars/10000022.png and b/mys/chars/10000022.png differ
diff --git a/mys/chars/10000023.png b/mys/chars/10000023.png
index 7e0d28a8..151cf5d2 100644
Binary files a/mys/chars/10000023.png and b/mys/chars/10000023.png differ
diff --git a/mys/chars/10000024.png b/mys/chars/10000024.png
index 80440b6b..b593ce11 100644
Binary files a/mys/chars/10000024.png and b/mys/chars/10000024.png differ
diff --git a/mys/chars/10000025.png b/mys/chars/10000025.png
index c4bbc3c1..3793fd44 100644
Binary files a/mys/chars/10000025.png and b/mys/chars/10000025.png differ
diff --git a/mys/chars/10000026.png b/mys/chars/10000026.png
index 13ee9fd8..cc7d7d62 100644
Binary files a/mys/chars/10000026.png and b/mys/chars/10000026.png differ
diff --git a/mys/chars/10000027.png b/mys/chars/10000027.png
index 66d084bf..36b9eef1 100644
Binary files a/mys/chars/10000027.png and b/mys/chars/10000027.png differ
diff --git a/mys/chars/10000029.png b/mys/chars/10000029.png
index 844862c1..e151f141 100644
Binary files a/mys/chars/10000029.png and b/mys/chars/10000029.png differ
diff --git a/mys/chars/10000030.png b/mys/chars/10000030.png
index 440f6b74..91189917 100644
Binary files a/mys/chars/10000030.png and b/mys/chars/10000030.png differ
diff --git a/mys/chars/10000031.png b/mys/chars/10000031.png
index 0045003d..b9c4d1a0 100644
Binary files a/mys/chars/10000031.png and b/mys/chars/10000031.png differ
diff --git a/mys/chars/10000032.png b/mys/chars/10000032.png
index 9ace75ff..8a9ef694 100644
Binary files a/mys/chars/10000032.png and b/mys/chars/10000032.png differ
diff --git a/mys/chars/10000033.png b/mys/chars/10000033.png
index 18174a15..7fc538ff 100644
Binary files a/mys/chars/10000033.png and b/mys/chars/10000033.png differ
diff --git a/mys/chars/10000034.png b/mys/chars/10000034.png
index e0dd3605..09aa4b24 100644
Binary files a/mys/chars/10000034.png and b/mys/chars/10000034.png differ
diff --git a/mys/chars/10000035.png b/mys/chars/10000035.png
index b6ab9e5b..af654b1e 100644
Binary files a/mys/chars/10000035.png and b/mys/chars/10000035.png differ
diff --git a/mys/chars/10000036.png b/mys/chars/10000036.png
index 95d1e579..dbad18e4 100644
Binary files a/mys/chars/10000036.png and b/mys/chars/10000036.png differ
diff --git a/mys/chars/10000037.png b/mys/chars/10000037.png
index 19932560..375a2ed8 100644
Binary files a/mys/chars/10000037.png and b/mys/chars/10000037.png differ
diff --git a/mys/chars/10000039.png b/mys/chars/10000039.png
index 58a37b23..53656d47 100644
Binary files a/mys/chars/10000039.png and b/mys/chars/10000039.png differ
diff --git a/mys/chars/10000041.png b/mys/chars/10000041.png
index 28014055..c1d04836 100644
Binary files a/mys/chars/10000041.png and b/mys/chars/10000041.png differ
diff --git a/mys/chars/10000042.png b/mys/chars/10000042.png
index 36e5e269..80d12631 100644
Binary files a/mys/chars/10000042.png and b/mys/chars/10000042.png differ
diff --git a/mys/chars/10000043.png b/mys/chars/10000043.png
index 34eb8a2a..cd29e228 100644
Binary files a/mys/chars/10000043.png and b/mys/chars/10000043.png differ
diff --git a/mys/chars/10000044.png b/mys/chars/10000044.png
index 32351d71..8ac1a307 100644
Binary files a/mys/chars/10000044.png and b/mys/chars/10000044.png differ
diff --git a/mys/chars/10000045.png b/mys/chars/10000045.png
index 9838608b..9b29a616 100644
Binary files a/mys/chars/10000045.png and b/mys/chars/10000045.png differ
diff --git a/mys/chars/10000046.png b/mys/chars/10000046.png
index dee1eb9b..9d9d8575 100644
Binary files a/mys/chars/10000046.png and b/mys/chars/10000046.png differ
diff --git a/mys/chars/10000047.png b/mys/chars/10000047.png
index 9b522251..ba03efae 100644
Binary files a/mys/chars/10000047.png and b/mys/chars/10000047.png differ
diff --git a/mys/chars/10000048.png b/mys/chars/10000048.png
index 727f6b51..d3506d79 100644
Binary files a/mys/chars/10000048.png and b/mys/chars/10000048.png differ
diff --git a/mys/chars/10000049.png b/mys/chars/10000049.png
index cff166a8..8cd1bcde 100644
Binary files a/mys/chars/10000049.png and b/mys/chars/10000049.png differ
diff --git a/mys/chars/10000051.png b/mys/chars/10000051.png
index 03590717..19cc3d1b 100644
Binary files a/mys/chars/10000051.png and b/mys/chars/10000051.png differ
diff --git a/mys/chars/10000052.png b/mys/chars/10000052.png
new file mode 100644
index 00000000..5adee7f5
Binary files /dev/null and b/mys/chars/10000052.png differ
diff --git a/mys/chars/10000053.png b/mys/chars/10000053.png
index 7a5d316a..eb147b4b 100644
Binary files a/mys/chars/10000053.png and b/mys/chars/10000053.png differ
diff --git a/mys/chars/10000056.png b/mys/chars/10000056.png
new file mode 100644
index 00000000..9ca737b9
Binary files /dev/null and b/mys/chars/10000056.png differ
diff --git a/mys/chars/10000062.png b/mys/chars/10000062.png
new file mode 100644
index 00000000..233d8faf
Binary files /dev/null and b/mys/chars/10000062.png differ
diff --git a/mys/chars/__init__.py b/mys/chars/__init__.py
new file mode 100644
index 00000000..57bdd1c7
--- /dev/null
+++ b/mys/chars/__init__.py
@@ -0,0 +1,73 @@
+import re
+
+#from nonebot import on_command
+#from nonebot.adapters.cqhttp import Event, Bot, Message
+
+from .getImg import draw_pic,draw_char_pic,new_draw_pic,draw_abyss_pic
+
+from nonebot import *
+import json
+from random import randint
+import requests,random,os,json,re
+from hoshino import Service,R,priv,util
+from hoshino.typing import MessageSegment,CQEvent, HoshinoBot
+from hoshino.util import FreqLimiter,pic2b64
+import hoshino
+import asyncio
+import time
+import string
+import random
+import hashlib
+import requests
+import os
+from  PIL  import   Image,ImageFont,ImageDraw
+from io import BytesIO
+import base64
+
+import urllib
+
+sv = Service('genshinuid')
+bot = get_bot()
+
+FILE_PATH = os.path.dirname(__file__)
+FILE2_PATH = os.path.join(FILE_PATH,'mys')
+Texture_PATH = os.path.join(FILE2_PATH,'texture2d')
+
+@sv.on_prefix('uid')
+async def _(bot:HoshinoBot,  ev: CQEvent):
+    image = re.search(r"\[CQ:image,file=(.*),url=(.*)\]", str(ev.message))
+    message = ev.message.extract_plain_text()
+    uid = re.findall(r"\d+", message)[0]  # str
+    m = ''.join(re.findall('[\u4e00-\u9fa5]',message))
+    if m == "角色":
+        #try:
+        im = await draw_char_pic(uid,ev.sender['nickname'],image)
+        await bot.send(ev, im, at_sender=True)
+        #except:
+        #    await bot.send(ev,'输入也许错误！')
+    elif m == "深渊":
+        try:
+            floor_num = re.findall(r"\d+", message)[1]
+            im = await draw_abyss_pic(uid,ev.sender['nickname'],floor_num,image)
+            await bot.send(ev, im, at_sender=True)
+        except:
+            await bot.send(ev,'深渊输入错误！')
+    else:
+        #try:
+        im = await new_draw_pic(uid,ev.sender['nickname'],image)
+        await bot.send(ev, im, at_sender=True)
+        #except:
+        #    await bot.send(ev,'输入错误！')
+
+
+@sv.on_prefix('UID')
+async def _(bot:HoshinoBot,  ev: CQEvent):
+    image = re.search(r"\[CQ:image,file=(.*),url=(.*)\]", str(ev.message))
+    message = ev.message.extract_plain_text()
+    uid = re.findall(r"\d+", message)[0]  # str
+    try:
+        im = await draw_pic(uid,ev.sender['nickname'],image)
+        await bot.send(ev, im, at_sender=True)
+    except:
+        await bot.send(ev,'输入错误！')
+
diff --git a/mys/texture2d/1s_3.png b/mys/texture2d/1s_3.png
new file mode 100644
index 00000000..26ef7645
Binary files /dev/null and b/mys/texture2d/1s_3.png differ
diff --git a/mys/texture2d/2s_3.png b/mys/texture2d/2s_3.png
new file mode 100644
index 00000000..a74545af
Binary files /dev/null and b/mys/texture2d/2s_3.png differ
diff --git a/mys/texture2d/3s_3.png b/mys/texture2d/3s_3.png
new file mode 100644
index 00000000..2b28d50a
Binary files /dev/null and b/mys/texture2d/3s_3.png differ
diff --git a/mys/texture2d/4s_1.png b/mys/texture2d/4s_1.png
new file mode 100644
index 00000000..1c8f1346
Binary files /dev/null and b/mys/texture2d/4s_1.png differ
diff --git a/mys/texture2d/4s_2.png b/mys/texture2d/4s_2.png
new file mode 100644
index 00000000..d016cb2f
Binary files /dev/null and b/mys/texture2d/4s_2.png differ
diff --git a/mys/texture2d/4s_3.png b/mys/texture2d/4s_3.png
new file mode 100644
index 00000000..45931e79
Binary files /dev/null and b/mys/texture2d/4s_3.png differ
diff --git a/mys/texture2d/4s_4.png b/mys/texture2d/4s_4.png
new file mode 100644
index 00000000..d28f1d71
Binary files /dev/null and b/mys/texture2d/4s_4.png differ
diff --git a/mys/texture2d/4star_1.png b/mys/texture2d/4star_1.png
new file mode 100644
index 00000000..24023d45
Binary files /dev/null and b/mys/texture2d/4star_1.png differ
diff --git a/mys/texture2d/4star_2.png b/mys/texture2d/4star_2.png
new file mode 100644
index 00000000..2d036bd0
Binary files /dev/null and b/mys/texture2d/4star_2.png differ
diff --git a/mys/texture2d/5s_1.png b/mys/texture2d/5s_1.png
new file mode 100644
index 00000000..48eeb7a8
Binary files /dev/null and b/mys/texture2d/5s_1.png differ
diff --git a/mys/texture2d/5s_2.png b/mys/texture2d/5s_2.png
new file mode 100644
index 00000000..7ac2881b
Binary files /dev/null and b/mys/texture2d/5s_2.png differ
diff --git a/mys/texture2d/5s_3.png b/mys/texture2d/5s_3.png
new file mode 100644
index 00000000..66a32fb8
Binary files /dev/null and b/mys/texture2d/5s_3.png differ
diff --git a/mys/texture2d/5s_4.png b/mys/texture2d/5s_4.png
new file mode 100644
index 00000000..be1ff0c5
Binary files /dev/null and b/mys/texture2d/5s_4.png differ
diff --git a/mys/texture2d/5star_1.png b/mys/texture2d/5star_1.png
new file mode 100644
index 00000000..d82163e6
Binary files /dev/null and b/mys/texture2d/5star_1.png differ
diff --git a/mys/texture2d/5star_2.png b/mys/texture2d/5star_2.png
new file mode 100644
index 00000000..84aa27d6
Binary files /dev/null and b/mys/texture2d/5star_2.png differ
diff --git a/mys/texture2d/abyss_1.png b/mys/texture2d/abyss_1.png
new file mode 100644
index 00000000..341e0179
Binary files /dev/null and b/mys/texture2d/abyss_1.png differ
diff --git a/mys/texture2d/abyss_2.png b/mys/texture2d/abyss_2.png
new file mode 100644
index 00000000..3777a7a0
Binary files /dev/null and b/mys/texture2d/abyss_2.png differ
diff --git a/mys/texture2d/abyss_3.png b/mys/texture2d/abyss_3.png
new file mode 100644
index 00000000..a28bae59
Binary files /dev/null and b/mys/texture2d/abyss_3.png differ
diff --git a/mys/texture2d/abyss_star0.png b/mys/texture2d/abyss_star0.png
new file mode 100644
index 00000000..b53467e6
Binary files /dev/null and b/mys/texture2d/abyss_star0.png differ
diff --git a/mys/texture2d/abyss_star1.png b/mys/texture2d/abyss_star1.png
new file mode 100644
index 00000000..9090d5f5
Binary files /dev/null and b/mys/texture2d/abyss_star1.png differ
diff --git a/mys/texture2d/bg_img_4.png b/mys/texture2d/bg_img_4.png
new file mode 100644
index 00000000..66150dd7
Binary files /dev/null and b/mys/texture2d/bg_img_4.png differ
diff --git a/mys/texture2d/bg_img_5.png b/mys/texture2d/bg_img_5.png
new file mode 100644
index 00000000..551a3c6c
Binary files /dev/null and b/mys/texture2d/bg_img_5.png differ
diff --git a/mys/texture2d/charpic_mask.png b/mys/texture2d/charpic_mask.png
new file mode 100644
index 00000000..21841914
Binary files /dev/null and b/mys/texture2d/charpic_mask.png differ
diff --git a/mys/texture2d/panle_1.png b/mys/texture2d/panle_1.png
new file mode 100644
index 00000000..4a403ffb
Binary files /dev/null and b/mys/texture2d/panle_1.png differ
diff --git a/mys/texture2d/panle_2.png b/mys/texture2d/panle_2.png
new file mode 100644
index 00000000..d30c0136
Binary files /dev/null and b/mys/texture2d/panle_2.png differ
diff --git a/mys/texture2d/panle_3.png b/mys/texture2d/panle_3.png
new file mode 100644
index 00000000..979978f2
Binary files /dev/null and b/mys/texture2d/panle_3.png differ
diff --git a/mys/texture2d/weaponpic_mask.png b/mys/texture2d/weaponpic_mask.png
new file mode 100644
index 00000000..949a9dd8
Binary files /dev/null and b/mys/texture2d/weaponpic_mask.png differ
diff --git a/readme/7.PNG b/readme/7.PNG
new file mode 100644
index 00000000..36ec385a
Binary files /dev/null and b/readme/7.PNG differ
diff --git a/readme/8.PNG b/readme/8.PNG
new file mode 100644
index 00000000..c2260391
Binary files /dev/null and b/readme/8.PNG differ
diff --git a/readme/9.PNG b/readme/9.PNG
new file mode 100644
index 00000000..1c7e1f36
Binary files /dev/null and b/readme/9.PNG differ