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]: