From 46e8c354c6686922320232c0899d172dcd82b138 Mon Sep 17 00:00:00 2001
From: qwerdvd <2450899274@qq.com>
Date: Mon, 11 Sep 2023 02:44:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=AA=E7=8E=AF=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 StarRailUID/starrailuid_charinfo/cal_damage.py    | 10 +++++++++-
 StarRailUID/starrailuid_charinfo/draw_char_img.py | 11 +----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/StarRailUID/starrailuid_charinfo/cal_damage.py b/StarRailUID/starrailuid_charinfo/cal_damage.py
index 1fab00d..65c0b91 100644
--- a/StarRailUID/starrailuid_charinfo/cal_damage.py
+++ b/StarRailUID/starrailuid_charinfo/cal_damage.py
@@ -1,7 +1,15 @@
 from typing import Dict
 
-from .draw_char_img import cal_char_info
 from .effect.Role import RoleInstance
+from .mono.Character import Character
+
+
+async def cal_char_info(char_data: Dict):
+    char: Character = Character(char_data)
+    await char.get_equipment_info()
+    await char.get_char_attribute_bonus()
+    await char.get_relic_info()
+    return char
 
 
 async def cal(char_data: Dict):
diff --git a/StarRailUID/starrailuid_charinfo/draw_char_img.py b/StarRailUID/starrailuid_charinfo/draw_char_img.py
index 88a636b..9e68187 100644
--- a/StarRailUID/starrailuid_charinfo/draw_char_img.py
+++ b/StarRailUID/starrailuid_charinfo/draw_char_img.py
@@ -36,8 +36,7 @@ from ..utils.resource.RESOURCE_PATH import (
     SKILL_PATH,
     WEAPON_PATH,
 )
-from .cal_damage import cal
-from .mono.Character import Character
+from .cal_damage import cal, cal_char_info
 from .to_data import api_to_dict
 
 Excel_path = Path(__file__).parent / 'effect'
@@ -679,14 +678,6 @@ async def draw_char_info_img(raw_mes: str, sr_uid: str):
     return res
 
 
-async def cal_char_info(char_data: Dict):
-    char: Character = Character(char_data)
-    await char.get_equipment_info()
-    await char.get_char_attribute_bonus()
-    await char.get_relic_info()
-    return char
-
-
 async def get_char_data(
     sr_uid: str, char_name: str, enable_self: bool = True
 ) -> Union[Dict, str]: