From d77db758d4ff23055b477559e03209d6a61887e5 Mon Sep 17 00:00:00 2001
From: KimigaiiWuyi <444835641@qq.com>
Date: Thu, 8 May 2025 10:17:44 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=E4=BC=98=E5=8C=96`=E5=BC=BA?=
 =?UTF-8?q?=E5=88=B6=E5=88=B7=E6=96=B0`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GenshinUID/genshinuid_enka/__init__.py        |  1 -
 .../genshinuid_enka/effect/weapon_effect.json | 31 +++++++++++++++++++
 GenshinUID/genshinuid_enka/to_card.py         | 10 +++---
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/GenshinUID/genshinuid_enka/__init__.py b/GenshinUID/genshinuid_enka/__init__.py
index e94d18d0..af9476ac 100644
--- a/GenshinUID/genshinuid_enka/__init__.py
+++ b/GenshinUID/genshinuid_enka/__init__.py
@@ -343,7 +343,6 @@ async def send_card_info(bot: Bot, ev: Event):
             im = await enka_to_card(uid)
     else:
         im = await enka_to_card(uid)
-    logger.info(f'UID{uid}获取角色数据成功！')
 
     if isinstance(im, Tuple):
         buttons = [
diff --git a/GenshinUID/genshinuid_enka/effect/weapon_effect.json b/GenshinUID/genshinuid_enka/effect/weapon_effect.json
index ab4ac66f..f2122502 100644
--- a/GenshinUID/genshinuid_enka/effect/weapon_effect.json
+++ b/GenshinUID/genshinuid_enka/effect/weapon_effect.json
@@ -30,6 +30,37 @@
       }
     }
   },
+  "柔灯挽歌": {
+    "normal": {
+      "normal_effect": {
+        "1": "addAtk+15",
+        "2": "addAtk+19",
+        "3": "addAtk+23",
+        "4": "addAtk+27",
+        "5": "addAtk+31"
+      }
+    },
+    "fight": {
+      "fight_effect": {
+        "1": "dmgBonus+36",
+        "2": "dmgBonus+46",
+        "3": "dmgBonus+56",
+        "4": "dmgBonus+66",
+        "5": "dmgBonus+76"
+      },
+      "group_effect": {
+        "1": "",
+        "2": "",
+        "3": "",
+        "4": "",
+        "5": ""
+      },
+      "time": 8,
+      "extra": {
+        
+      }
+    }
+  },
   "冷寂迸音": {
     "normal": {
       "normal_effect": {
diff --git a/GenshinUID/genshinuid_enka/to_card.py b/GenshinUID/genshinuid_enka/to_card.py
index 3c6a37f7..bd1c9e5f 100644
--- a/GenshinUID/genshinuid_enka/to_card.py
+++ b/GenshinUID/genshinuid_enka/to_card.py
@@ -3,6 +3,7 @@ from pathlib import Path
 from typing import Dict, List, Tuple, Union, Optional
 
 from PIL import Image, ImageDraw
+from gsuid_core.logger import logger
 from gsuid_core.utils.api.enka.models import EnkaData
 
 from .to_data import enka_to_dict
@@ -42,6 +43,7 @@ async def enka_to_card(
             return await convert_img(pic_500)
 
     img = await draw_enka_card(uid=uid, char_data_list=char_data_list)
+    logger.info(f'UID{uid}获取角色数据成功！')
     return img, char_data_list
 
 
@@ -72,8 +74,8 @@ async def draw_enka_card(
     if char_num <= 8:
         based_w, based_h = 1000, 240 + ((char_num + 3) // 4) * 220
     else:
-        based_w, based_h = 1200, 660 + (char_num - 5) // 5 * 110
-        if (char_num - 5) % 5 >= 4:
+        based_w, based_h = 1200, 660 + (char_num - 6) // 6 * 110
+        if (char_num - 6) % 6 >= 1:
             based_h += 110
 
     img = Image.open(TEXT_PATH / 'shin-w.jpg').resize((based_w, based_h))
@@ -151,9 +153,9 @@ async def draw_enka_char(index: int, img: Image.Image, char_data: dict):
     else:
         _i = index - 13
         x, y = 50 + (_i % 9) * 220, 512 + (_i // 9) * 220
-        if _i % 9 >= 5:
+        if _i % 9 >= 6:
             y += 110
-            x = 160 + ((_i - 5) % 9) * 220
+            x = 160 + ((_i - 6) % 9) * 220
         img.paste(
             char_card,
             (x, y),