diff --git a/Paimon_Info/damage_cal/common.py b/Paimon_Info/damage_cal/common.py index 7977829..a4a128e 100644 --- a/Paimon_Info/damage_cal/common.py +++ b/Paimon_Info/damage_cal/common.py @@ -694,7 +694,7 @@ def get_damage_multipiler(data: dict) -> dict: 'A-e岩:普攻第一段': float(skill_data['普通攻击·西风剑术·女仆']['数值']['一段伤害'][level_a].replace('%', '')) / 100.0, 'T:Q攻击力提高:': int( (float(skill_data['大扫除']['数值']['攻击力提高'][level_q].replace('%防御力', '')) / 100.0 + extra) * defense), - 'T:E盾值': int(float(e[0].replace('%防御力', '')) / 100.0 * defense + float(e[1])), + 'T:E盾值': int(float(e[0].replace('%防御力', '')) / 100.0 * defense + float(e[1]) * 1.5), 'T:普攻治疗量/概率': str(int((float(ez[0].replace('%防御力', '')) / 100.0 * defense + float(ez[1])) * ( 1 + data['属性']['治疗加成']))) + '/' + skill_data['护心铠']['数值']['治疗触发几率'][level_e] } diff --git a/Paimon_Info/damage_cal/damage.py b/Paimon_Info/damage_cal/damage.py index 1b4e8d4..fe351dc 100644 --- a/Paimon_Info/damage_cal/damage.py +++ b/Paimon_Info/damage_cal/damage.py @@ -24,7 +24,7 @@ def get_role_dmg(data: dict): if data['名称'] == '钟离': health = data['属性']['基础生命'] + data['属性']['额外生命'] data['伤害描述'].insert(0, '护盾减抗') - dmg_data['玉璋护盾'] = (str(int((health * dm['玉璋护盾'][0] + dm['玉璋护盾'][1]) * (1 + data['属性']['护盾强效']))),) + dmg_data['玉璋护盾'] = (str(int((health * dm['玉璋护盾'][0] + dm['玉璋护盾'][1]) * (1 + data['属性']['护盾强效']) * 1.5)),) dmg_data['原岩共鸣'] = udc(dm['原岩共鸣'] * attack + (health * 0.019) if level_role >= 70 else 0, (cr + ve['暴击率'], cd), db[6] + ve['增伤'], level_role, rcd=0.2) dmg_data['天星伤害'] = udc(dm['天星'] * attack + (health * 0.33) if level_role >= 70 else 0, (cr + vq['暴击率'], cd), diff --git a/README.md b/README.md index f780025..8dc02e5 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,8 @@ - 增加`诺艾尔、烟绯、珊瑚宫心海`伤害计算 + 7.14 - ysd支持`鹿野院平藏`,增加`枫原万叶、鹿野院平藏`伤害计算 ++ 7.15 + - 增加新武器的攻略,修复`ysd`命座天赋加成以及岩元素护盾数值 ## 丨功能列表 diff --git a/UPDATE_LOG.md b/UPDATE_LOG.md index 0f6d2a9..e16e725 100644 --- a/UPDATE_LOG.md +++ b/UPDATE_LOG.md @@ -82,4 +82,5 @@ - 增加`诺艾尔、烟绯、珊瑚宫心海`伤害计算 + 7.14 - ysd支持`鹿野院平藏`,增加`枫原万叶、鹿野院平藏`伤害计算 - ++ 7.15 + - 增加新武器的攻略,修复`ysd`命座天赋加成以及岩元素护盾数值 diff --git a/utils/enka_util.py b/utils/enka_util.py index bad669e..3384a0b 100644 --- a/utils/enka_util.py +++ b/utils/enka_util.py @@ -49,6 +49,12 @@ class PlayerInfo: else: role_info['元素'] = role_element[role_name] + if 'talentIdList' in data: + if len(data['talentIdList']) >= 3: + data['skillLevelMap'][list(data['skillLevelMap'].keys())[ra_score['Talent'][role_name][0]]] += 3 + if len(data['talentIdList']) >= 5: + data['skillLevelMap'][list(data['skillLevelMap'].keys())[ra_score['Talent'][role_name][1]]] += 3 + role_info['天赋'] = [] for skill in data['skillLevelMap']: skill_detail = {'名称': role_skill['Name'][skill], '等级': data['skillLevelMap'][skill], @@ -67,10 +73,6 @@ class PlayerInfo: role_info['命座'] = [] if 'talentIdList' in data: - if len(data['talentIdList']) >= 3: - data['skillLevelMap'][list(data['skillLevelMap'].keys())[ra_score['Talent'][role_name][0]]] += 3 - if len(data['talentIdList']) >= 5: - data['skillLevelMap'][list(data['skillLevelMap'].keys())[ra_score['Talent'][role_name][1]]] += 3 for talent in data['talentIdList']: talent_detail = {'名称': role_talent['Name'][str(talent)], '图标': role_talent['Icon'][str(talent)]} role_info['命座'].append(talent_detail) diff --git a/utils/json_data/alias.json b/utils/json_data/alias.json index dbd3ef3..76b7586 100644 --- a/utils/json_data/alias.json +++ b/utils/json_data/alias.json @@ -586,6 +586,11 @@ ], "龙脊长枪": [ "龙脊长枪" + ], + "笼钓瓶一心": [ + "笼钓瓶一心", + "万叶刀", + "一心传名刀" ] }, "monsters": [