From 82041aa7a50b3a972ce448ca2db1adc5a681c277 Mon Sep 17 00:00:00 2001
From: qwerdvd <2450899274@qq.com>
Date: Tue, 30 May 2023 09:14:49 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=E6=B7=BB=E5=8A=A0=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 StarRailUID/starrailuid_damagecal/cal_damage.py  | 7 +++++--
 StarRailUID/starrailuid_damagecal/effect/Role.py | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

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