From e780c8725bb613f03469c1e014c7ce3a14a79ed6 Mon Sep 17 00:00:00 2001
From: KimigaiiWuyi <444835641@qq.com>
Date: Mon, 9 Oct 2023 00:29:05 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=B1=20=E8=A1=A5=E5=85=85=E6=96=B0?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=9A=84=E6=9C=89=E6=95=88=E8=AF=8D=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GenshinUID/genshinuid_enka/__init__.py        | 16 ++++++----
 .../genshinuid_enka/effect/value_attr.json    | 32 +++++++++++++++++--
 GenshinUID/utils/database.py                  |  6 ----
 3 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/GenshinUID/genshinuid_enka/__init__.py b/GenshinUID/genshinuid_enka/__init__.py
index b2c3adde..171cd86c 100644
--- a/GenshinUID/genshinuid_enka/__init__.py
+++ b/GenshinUID/genshinuid_enka/__init__.py
@@ -1,6 +1,6 @@
 import re
 import json
-from typing import List, Tuple
+from typing import Tuple
 
 import aiofiles
 from PIL import Image
@@ -150,20 +150,22 @@ async def contrast_char_info(bot: Bot, ev: Event):
     elif len(contrast_list) >= 4:
         return await bot.send('不支持对比四个及以上的面板...')
 
-    img_list: List[Image.Image] = []
+    img_list = []
     max_y = 0
     for i in contrast_list:
         im = await _get_char_info(bot, ev, i)
         if isinstance(im, str):
             return await bot.send(im)
         elif isinstance(im, Tuple):
-            if isinstance(im[0], bytes):
+            data = im[0]
+            if isinstance(data, bytes):
                 return await bot.send('输入了错误的格式...参考格式: 对比面板 公子 公子换可莉圣遗物')
-            elif isinstance(im[0], str):
-                return await bot.send(im[0])
+            elif isinstance(data, str):
+                return await bot.send(data)
             else:
-                img_list.append(im[0])
-                max_y = max(max_y, im[0].size[1])
+                assert isinstance(data, Image.Image)
+                img_list.append(data)
+                max_y = max(max_y, data.size[1])
 
     base_img = Image.new('RGBA', (950 * len(img_list), max_y))
     for index, img in enumerate(img_list):
diff --git a/GenshinUID/genshinuid_enka/effect/value_attr.json b/GenshinUID/genshinuid_enka/effect/value_attr.json
index 5419ceac..ef63f6cb 100644
--- a/GenshinUID/genshinuid_enka/effect/value_attr.json
+++ b/GenshinUID/genshinuid_enka/effect/value_attr.json
@@ -350,15 +350,43 @@
   "白术": [
     "血量",
     "元素充能效率",
-    "精通",
+    "元素精通",
     "暴击率",
     "暴击伤害"
   ],
   "卡维": [
     "元素充能效率",
-    "精通",
+    "元素精通",
     "暴击率",
     "暴击伤害",
     "攻击力"
+  ],
+  "绮良良": [
+    "元素充能效率",
+    "元素精通",
+    "血量"
+  ],
+  "琳妮特": [
+    "元素精通",
+    "暴击率",
+    "暴击伤害",
+    "元素充能效率"
+  ],
+  "林尼": [
+    "攻击力",
+    "暴击率",
+    "暴击伤害"
+  ],
+  "菲米尼": [
+    "攻击力",
+    "暴击率",
+    "暴击伤害",
+    "元素充能效率"
+  ],
+  "那维莱特": [
+    "血量",
+    "暴击率",
+    "暴击伤害",
+    "元素充能效率"
   ]
 }    
\ No newline at end of file
diff --git a/GenshinUID/utils/database.py b/GenshinUID/utils/database.py
index f2b9f386..29315e15 100644
--- a/GenshinUID/utils/database.py
+++ b/GenshinUID/utils/database.py
@@ -1,9 +1,3 @@
-from typing import Dict
-
 from gsuid_core.data_store import get_res_path
-from gsuid_core.utils.database.dal import SQLA
 
-is_wal = False
-
-active_sqla: Dict[str, SQLA] = {}
 db_url = str(get_res_path().parent / 'GsData.db')