From 1b0f9bbf6d3c03f8359058de4da4d12cafa734b0 Mon Sep 17 00:00:00 2001 From: unknwonsno Date: Sun, 21 Aug 2022 23:48:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BF=83=E6=B5=B7=E6=B2=BB?= =?UTF-8?q?=E7=96=97=E9=87=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Paimon_Info/damage_cal/common.py | 2 +- Paimon_Info/damage_cal/damage.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Paimon_Info/damage_cal/common.py b/Paimon_Info/damage_cal/common.py index bad5791..3b37dc0 100644 --- a/Paimon_Info/damage_cal/common.py +++ b/Paimon_Info/damage_cal/common.py @@ -322,7 +322,7 @@ def weapon_common_fix(data: dict): extra_e['增伤'] += 3 * (0.09 + 0.03 * weapon['精炼等级']) data['伤害描述'].append('神乐满层') elif weapon['名称'] == '不灭月华': - attr['治疗加成'] += 0.075 + 0.025 * weapon['精炼等级'] + # attr['治疗加成'] += 0.075 + 0.025 * weapon['精炼等级'] extra_a['普攻额外倍率'] += (0.005 + 0.005 * weapon['精炼等级']) * (attr['基础生命'] + attr['额外生命']) elif weapon['名称'] == '白辰之环': for i, k in enumerate(attr['伤害加成']): diff --git a/Paimon_Info/damage_cal/damage.py b/Paimon_Info/damage_cal/damage.py index 09f6384..4faff27 100644 --- a/Paimon_Info/damage_cal/damage.py +++ b/Paimon_Info/damage_cal/damage.py @@ -71,8 +71,8 @@ def get_role_dmg(data: dict): dmg_data['开大普攻第一段'] = (str(int(ab[0]) + int(aq[0])), str(int(ab[1]) + int(aq[1]))) dmg_data['开大战技伤害'] = udc(dm['水母伤害'] * attack + dm['E伤害提升'] * health, (cr + ve['暴击率'], cd), db[3] + ve['增伤'], level_role) dmg_data['大招释放伤害'] = udc(dm['大招伤害'] * health, (cr + vq['暴击率'], cd), db[3] + vq['增伤'], level_role) - dmg_data['开大普攻治疗量'] = (str(int((float(dm['大招治疗量'][0].replace('%生命值上限', '')) / 100.0 * health + float(dm['大招治疗量'][1]) * (1 + data['属性']['治疗加成'])))),) - dmg_data['战技治疗量'] = (str(int((float(dm['水母治疗量'][0].replace('%生命值上限', '')) / 100.0 * health + float(dm['水母治疗量'][1]) * (1 + data['属性']['治疗加成'])))),) + dmg_data['开大普攻治疗量'] = (str(int((float(dm['大招治疗量'][0].replace('%生命值上限', '')) / 100.0 * health + float(dm['大招治疗量'][1])) * (1 + data['属性']['治疗加成']))),) + dmg_data['战技治疗量'] = (str(int((float(dm['水母治疗量'][0].replace('%生命值上限', '')) / 100.0 * health + float(dm['水母治疗量'][1])) * (1 + data['属性']['治疗加成']))),) else: dmg_data = get_dmg_data(data, dm, va, ve, vq) if data['伤害描述']: