Yunzai-Plugin/ZZZ-Plugin
1
0
Fork 0
mirror of https://github.com/ZZZure/ZZZ-Plugin.git synced 2025-12-16 05:07:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix：伤害计算连携技倍率错误

Browse source
This commit is contained in:
UCPr 2025-01-06 02:07:09 +08:00
parent e307554fba
commit 548d9950f8
3 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

16
model/damage/avatar.js
View file

@ -409,8 +409,8 @@ export const avatar_ability = (data, base_detail, bonus_detail) => {
damagelist.push(damage3);
/** 计算连携技伤害 */
const skill_multiplier4 = getskilllevelnum(data.id, data.skills, 'L', 'L');
const damagelist4 = calculate_damage(base_detail, bonus_detail, 'L', 'L', 'Fire', skill_multiplier4, data.level);
const skill_multiplier4 = getskilllevelnum(data.id, data.skills, 'R', 'RL');
const damagelist4 = calculate_damage(base_detail, bonus_detail, 'RL', 'RL', 'Fire', skill_multiplier4, data.level);
const damage4 = {
title: '连携技：昂扬烈焰',
value: damagelist4,
@ -492,8 +492,8 @@ export const avatar_ability = (data, base_detail, bonus_detail) => {
damagelist.push(damage3);
/** 计算连携技伤害 */
const skill_multiplier4 = getskilllevelnum(data.id, data.skills, 'L', 'L');
const damagelist4 = calculate_damage(base_detail, bonus_detail, 'L', 'L', 'Electric', skill_multiplier4, data.level);
const skill_multiplier4 = getskilllevelnum(data.id, data.skills, 'R', 'RL');
const damagelist4 = calculate_damage(base_detail, bonus_detail, 'RL', 'RL', 'Electric', skill_multiplier4, data.level);
const damage4 = {
title: '连携技：太平令',
value: damagelist4,
@ -563,8 +563,8 @@ export const avatar_ability = (data, base_detail, bonus_detail) => {
damagelist.push(damage3);
/** 计算连携技伤害 */
const skill_multiplier4 = getskilllevelnum(data.id, data.skills, 'L', 'L');
const damagelist4 = calculate_damage(base_detail, bonus_detail, 'L', 'L', 'Physical', skill_multiplier4, data.level);
const skill_multiplier4 = getskilllevelnum(data.id, data.skills, 'R', 'RL');
const damagelist4 = calculate_damage(base_detail, bonus_detail, 'RL', 'RL', 'Physical', skill_multiplier4, data.level);
const damage4 = {
title: '连携技：刃爪挥击',
value: damagelist4,
@ -641,8 +641,8 @@ export const avatar_ability = (data, base_detail, bonus_detail) => {
damagelist.push(damage3);
/** 计算连携技伤害 */
const skill_multiplier4 = getskilllevelnum(data.id, data.skills, 'L', 'L');
const damagelist4 = calculate_damage(base_detail, bonus_detail, 'L', 'L', 'Electric', skill_multiplier4, data.level);
const skill_multiplier4 = getskilllevelnum(data.id, data.skills, 'R', 'RL');
const damagelist4 = calculate_damage(base_detail, bonus_detail, 'RL', 'RL', 'Electric', skill_multiplier4, data.level);
const damage4 = {
title: '连携技：转转转！',
value: damagelist4,

42
model/damage/role.js
View file

@ -13,26 +13,29 @@ export const calculate_damage = (
logger.debug('merged_attr', merged_attr);
logger.debug(logger.green(skill_type + `（${add_skill_type}）伤害乘区计算：`));
logger.debug('倍率', skill_multiplier);
const attack = merged_attr.attack;
logger.debug('攻击区', attack);
logger.debug('攻击力', attack);
logger.debug('技能倍率', skill_multiplier);
const defence_multiplier = get_defence_multiplier(
merged_attr,
level,
skill_type,
add_skill_type,
);
logger.debug('防御区', defence_multiplier);
const resistance_area = get_resistance_area(
const critical_chance_base = get_critical_chance_base(
merged_attr,
skill_type,
add_skill_type,
avatar_element
);
logger.debug('抗性区', resistance_area);
logger.debug('暴击率', critical_chance_base);
const critical_damage_base = get_critical_damage_base(
merged_attr,
skill_type,
add_skill_type,
avatar_element
);
logger.debug('暴击伤害', critical_damage_base);
const qiwang_damage = critical_chance_base * (critical_damage_base - 1) + 1;
logger.debug('暴击期望', qiwang_damage);
const injury_area = get_injury_area(
merged_attr,
@ -50,24 +53,21 @@ export const calculate_damage = (
);
logger.debug('易伤区', damage_ratio);
const critical_damage_base = get_critical_damage_base(
const resistance_area = get_resistance_area(
merged_attr,
skill_type,
add_skill_type,
avatar_element
);
logger.debug('爆伤区', critical_damage_base);
logger.debug('抗性区', resistance_area);
const critical_chance_base = get_critical_chance_base(
const defence_multiplier = get_defence_multiplier(
merged_attr,
level,
skill_type,
add_skill_type,
avatar_element
);
logger.debug('暴击区', critical_chance_base);
const qiwang_damage = critical_chance_base * (critical_damage_base - 1) + 1;
logger.debug('暴击期望', qiwang_damage);
logger.debug('防御区', defence_multiplier);
const damage_cd =
attack *

8
resources/map/SkillData.json
View file

@ -52,7 +52,7 @@
"E": [
6.75, 7.364, 7.978, 8.592, 9.206, 9.82, 10.434, 11.048, 11.662, 12.276, 12.89, 13.504, 14.118, 14.732, 15.346, 15.96
],
"L": [
"RL": [
6.325, 6.9, 7.475, 8.05, 8.625, 9.2, 9.775, 10.35, 10.925, 11.5, 12.075, 12.65, 13.225, 13.8, 14.375, 14.95
],
"R": [
@ -72,7 +72,7 @@
"E": [
6.028,6.577,7.126,7.675,8.224,8.773,9.322,9.871,10.42,10.969,11.518,12.067,12.616,13.165,13.714,14.263
],
"L": [
"RL": [
6.479, 7.068, 7.657, 8.246, 8.835, 9.424, 10.013, 10.602, 11.191, 11.78, 12.369, 12.958, 13.547, 14.136, 14.725, 15.314
],
"R": [
@ -92,7 +92,7 @@
"E": [
5.397, 5.888, 6.379, 6.87, 7.361, 7.852, 8.343, 8.834, 9.325, 9.816, 10.307, 10.798, 11.289, 11.78, 12.271, 12.762
],
"L": [
"RL": [
5.362, 5.85, 6.338, 6.826, 7.314, 7.802, 8.29, 8.778, 9.266, 9.754, 10.242, 10.73, 11.218, 11.706, 12.194, 12.682
],
"R": [
@ -112,7 +112,7 @@
"E": [
2.314, 2.525, 2.736, 2.947, 3.158, 3.369, 3.58, 3.791, 4.002, 4.213, 4.424, 4.635, 4.846, 5.057, 5.268, 5.479
],
"L": [
"RL": [
6.407, 6.99, 7.573, 8.156, 8.739, 9.322, 9.905, 10.488, 11.071, 11.654, 12.237, 12.82, 13.403, 13.986, 14.569, 15.152
],
"R": [