diff --git a/StarRailUID/starrailuid_damagecal/cal_damage.py b/StarRailUID/starrailuid_damagecal/cal_damage.py index c538c72..60a1344 100644 --- a/StarRailUID/starrailuid_damagecal/cal_damage.py +++ b/StarRailUID/starrailuid_damagecal/cal_damage.py @@ -30,8 +30,11 @@ async def cal(char_data: Dict): raw_data['skill'] = char.char_skill + im = [] + for skill_type in ['Normal', 'BPSkill', 'Ultra']: role = RoleInstance(raw_data) print(role) - await role.cal_damage(skill_type) - return '还没写完呢' + im_tmp = await role.cal_damage(skill_type) + im.append(im_tmp) + return im diff --git a/StarRailUID/starrailuid_damagecal/effect/Role.py b/StarRailUID/starrailuid_damagecal/effect/Role.py index bc8b3aa..18b3454 100644 --- a/StarRailUID/starrailuid_damagecal/effect/Role.py +++ b/StarRailUID/starrailuid_damagecal/effect/Role.py @@ -228,4 +228,6 @@ class RoleInstance: * damage_reduction * critical_damage ) + im = f'{skill_type} 伤害: {damage}' logger.info(f'{skill_type} 伤害: {damage}') + return im