diff --git a/package.json b/package.json index 26e2864..87d884f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jx3box-player", - "version": "0.0.1", + "version": "0.1.0", "description": "玩家角色信息", "main": "index.js", "repository": { diff --git a/readme.md b/readme.md index 82448fc..979e315 100644 --- a/readme.md +++ b/readme.md @@ -4,6 +4,7 @@ ## 装分计算 ```装备分数 = 品质 * 品质系数 * 部位系数``` +藏剑：(轻剑+重剑)/2 ### 品质系数 diff --git a/src/App.vue b/src/App.vue index 043c9c6..6d2287f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -13,25 +13,35 @@ export default { return { role : "浮烟@长安城", + // 输出 // playerId: '31864485', //筱儿 // playerId: "26522940", //浮烟七秀 // playerId: "10105521", //浮烟长歌 // playerId: "33065480", //和尚 // playerId: "33065534", //霸刀 // playerId: "33146204", //藏剑 - playerId: "33154610", //醉栩蓬莱 + // playerId: "33154610", //醉栩蓬莱 + // playerId: "17217706", //醉栩凌雪 + // playerId: "2382163", //yyz + playerId: "10105523", //浮烟藏剑 + + // 坦克 // playerId: "17806618", //醉栩天策 // playerId: "32287076", //牧空和尚 // playerId: "10537412", //醉栩苍云 // playerId: "5291324", //醉栩明教 闪躲还有一点问题 - // playerId: "17217706", //醉栩凌雪 - // playerId: "2382163", //yyz - // playerId: "31346115", //凉子奶毒 - // playerId: "13525363", // 凉子七秀 + // server: '斗转星移', + + + // 奶妈 // playerId: "31864485", // 子璇七秀 + // playerId: "13525363", // 凉子七秀 + // playerId: "31346115", //凉子奶毒 + // playerId: "26522945", //浮烟奶花 + // playerId: "10105521", //浮烟奶歌 server: '蝶恋花', // server: '唯我独尊', - // server: '斗转星移', + // playerId: "21041450", // server: "唯我独尊", diff --git a/src/Player.vue b/src/Player.vue index 71da703..0116429 100644 --- a/src/Player.vue +++ b/src/Player.vue @@ -14,10 +14,9 @@ :data="equip_data" :showEquipName="showEquipName" :showPosition="showPosition" - :mount="mount_id" + :mount="mount_pinyin" :body="body_id" /> - @@ -37,7 +36,14 @@ import rolename from "@/assets/data/role.json"; import { getGS } from "@/service/gs.js"; export default { name: "Player", - props: ["playerId", "server", "role",'darkMode',"showPosition","showEquipName"], + props: [ + "playerId", + "server", + "role", + "darkMode", + "showPosition", + "showEquipName", + ], data: function () { return { data: "", @@ -62,9 +68,12 @@ export default { return this.data && this.data; }, gs: function () { - return getGS(this.equip_data); + return getGS(this.equip_data, this.mount_id); + }, + mount_id : function (){ + return ~~this.data?.Kungfu?.KungfuID }, - mount_id: function () { + mount_pinyin: function () { const name = this.roleName(this.roleName(this.data.Kungfu.Name)); return this.data && this.data.Kungfu && name; }, diff --git a/src/assets/css/attrs.less b/src/assets/css/attrs.less index 5fca5e7..88f462c 100644 --- a/src/assets/css/attrs.less +++ b/src/assets/css/attrs.less @@ -49,6 +49,17 @@ .bold; .fz(20px); } + .u-extra{ + .fz(12px); + color:#888; + &::before{ + content:"(" + } + &::after{ + content:")" + } + .ml(3px); + } } .darkMode{ diff --git a/src/assets/data/mount_attrs.js b/src/assets/data/mount_attrs.js index eeb0231..8b886fc 100644 --- a/src/assets/data/mount_attrs.js +++ b/src/assets/data/mount_attrs.js @@ -1,60 +1,56 @@ - const xfAttr = { - "10028": ["heal", "atSpiritBase", "crit", "critEffect", "haste", "surplus", "health", "toughness", "huajing"], // 离经 - "10080": ["heal", "atSpiritBase", "crit", "critEffect", "haste", "surplus", "health", "toughness", "huajing"], // 云裳 - "10176": ["heal", "atSpiritBase", "crit", "critEffect", "haste", "surplus", "health", "toughness", "huajing"], // 补天 - "10448": ["heal", "atSpiritBase", "crit", "critEffect", "haste", "surplus", "health", "toughness", "huajing"], // 相知 - "10002": ["atVitalityBase", "haste", "surplus", "physicsShield", "magicShield", "health", "dodge", "toughness", "parryBase", "parryValue"], // 洗髓 - "10062": ["atVitalityBase", "haste", "surplus", "physicsShield", "magicShield", "health", "dodge", "toughness", "parryBase", "parryValue"], // 铁牢 - "10243": ["atVitalityBase", "haste", "surplus", "physicsShield", "magicShield", "health", "dodge", "toughness", "parryBase", "parryValue"], // 明尊 - "10389": ["atVitalityBase", "haste", "surplus", "physicsShield", "magicShield", "health", "dodge", "toughness", "parryBase", "parryValue"], // 铁骨 - "10003": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 易筋经 - "10014": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 紫霞功 - "10015": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 太虚剑意 - "10021": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 花间游 - "10026": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 傲血战意 - "10533": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 凌海诀 - "10144": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 冰心诀 - "10145": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 问水诀 - "10175": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 山居剑意 - "10003": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 毒经 - "10224": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 惊羽诀 - "10225": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 田螺诡道 - "10242": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 焚影圣诀 - "10268": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 笑尘诀 - "10390": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 分山劲 - "10447": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 莫问 - "10464": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 北傲诀 - "10585": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 隐龙诀 - "10615": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 太玄经 -} + "10028": ["heal", "atSpiritBase", "crit", "critEffect", "haste", "health", "toughness", "huajing"], // 离经 + "10080": ["heal", "atSpiritBase", "crit", "critEffect", "haste", "health", "toughness", "huajing"], // 云裳 + "10176": ["heal", "atSpiritBase", "crit", "critEffect", "haste", "health", "toughness", "huajing"], // 补天 + "10448": ["heal", "atSpiritBase", "crit", "critEffect", "haste", "health", "toughness", "huajing"], // 相知 + "10002": ["atVitalityBase", "haste", "surplus", "physicsShield", "magicShield", "health", "dodge", "toughness", "parryBase", "parryValue"], // 洗髓 + "10062": ["atVitalityBase", "haste", "surplus", "physicsShield", "magicShield", "health", "dodge", "toughness", "parryBase", "parryValue"], // 铁牢 + "10243": ["atVitalityBase", "haste", "surplus", "physicsShield", "magicShield", "health", "dodge", "toughness", "parryBase", "parryValue"], // 明尊 + "10389": ["atVitalityBase", "haste", "surplus", "physicsShield", "magicShield", "health", "dodge", "toughness", "parryBase", "parryValue"], // 铁骨 + "10003": ["baseAttack", "attack", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 易筋经 + "10014": ["baseAttack", "attack", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 紫霞功 + "10015": ["baseAttack", "attack", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 太虚剑意 + "10021": ["baseAttack", "attack", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 花间游 + "10026": ["baseAttack", "attack", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 傲血战意 + "10533": ["baseAttack", "attack", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 凌海诀 + "10144": ["baseAttack", "attack", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 冰心诀 + "10145": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 问水诀 + "10175": ["baseAttack", "attack", "weaponDamage", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 山居剑意 + "10003": ["baseAttack", "attack", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 毒经 + "10224": ["baseAttack", "attack", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 惊羽诀 + "10225": ["baseAttack", "attack", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 田螺诡道 + "10242": ["baseAttack", "attack", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 焚影圣诀 + "10268": ["baseAttack", "attack", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 笑尘诀 + "10390": ["baseAttack", "attack", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 分山劲 + "10447": ["baseAttack", "attack", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 莫问 + "10464": ["baseAttack", "attack", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 北傲诀 + "10585": ["baseAttack", "attack", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 隐龙诀 + "10615": ["baseAttack", "attack", "surplus", "haste", "crit", "critEffect", "overcome", "strain", "health"], // 太玄经 +}; const attrMaps = { - "baseAttack": "基础攻击", - "attack": "面板攻击", - "heal": "面板治疗量", - "weaponDamage": "武器伤害", - "surplus": "破招", - "haste": "加速", - "crit": "会心", - "critEffect": "会效", - "overcome": "破防", - "strain": "无双", - "health": "气血", - "physicsShield": "外防", - "magicShield": "内防", - "dodge": "闪避", - "toughness": "御劲", - "huajing": "化劲", - "parryBase": "招架", - "parryValue": "拆招", - "atVitalityBase": "体质", - "atSpunkBase": "元气", - "atSpiritBase": "根骨", - "atStrengthBase": "力道", - "atAgilityBase": "身法" -} + baseAttack: "基础攻击", + attack: "面板攻击", + heal: "面板治疗量", + weaponDamage: "武器伤害", + surplus: "破招", + haste: "加速", + crit: "会心", + critEffect: "会效", + overcome: "破防", + strain: "无双", + health: "气血", + physicsShield: "外防", + magicShield: "内防", + dodge: "闪避", + toughness: "御劲", + huajing: "化劲", + parryBase: "招架", + parryValue: "拆招", + atVitalityBase: "体质", + atSpunkBase: "元气", + atSpiritBase: "根骨", + atStrengthBase: "力道", + atAgilityBase: "身法", +}; -export { - xfAttr, - attrMaps -} \ No newline at end of file +export { xfAttr, attrMaps }; diff --git a/src/assets/data/role.json b/src/assets/data/role.json index 13f41f6..bc5a1b4 100644 --- a/src/assets/data/role.json +++ b/src/assets/data/role.json @@ -70,6 +70,6 @@ "10464": "北傲诀", "10533": "凌海诀", "10615": "太玄经", - "0": "通用", - "10585": "隐龙诀" + "10585": "隐龙诀", + "0": "通用" } diff --git a/src/assets/data/role_attr.js b/src/assets/data/role_attr.js index 398efeb..3d33ae2 100644 --- a/src/assets/data/role_attr.js +++ b/src/assets/data/role_attr.js @@ -44,11 +44,15 @@ const VALUE_MAP = { atLunarOvercomeBase: PRE_DEFINED_EMBED_VALUES.secondaryAttribute, // 阴性破防 atSolarOvercomeBase: PRE_DEFINED_EMBED_VALUES.secondaryAttribute, // 阳性破防 - atPhysicsCriticalDamagePowerBase: PRE_DEFINED_EMBED_VALUES.secondaryAttribute, // 外功会效 + atPhysicsCriticalDamagePowerBase: + PRE_DEFINED_EMBED_VALUES.secondaryAttribute, // 外功会效 atMagicCriticalDamagePowerBase: PRE_DEFINED_EMBED_VALUES.secondaryAttribute, // 内功会效 - atNeutralCriticalDamagePowerBase: PRE_DEFINED_EMBED_VALUES.secondaryAttribute, // 混元内功会效 - atPoisonCriticalDamagePowerBase: PRE_DEFINED_EMBED_VALUES.secondaryAttribute, // 毒性会效 - atSolarAndLunarCriticalDamagePowerBase: PRE_DEFINED_EMBED_VALUES.secondaryAttribute, // 阴阳会效 + atNeutralCriticalDamagePowerBase: + PRE_DEFINED_EMBED_VALUES.secondaryAttribute, // 混元内功会效 + atPoisonCriticalDamagePowerBase: + PRE_DEFINED_EMBED_VALUES.secondaryAttribute, // 毒性会效 + atSolarAndLunarCriticalDamagePowerBase: + PRE_DEFINED_EMBED_VALUES.secondaryAttribute, // 阴阳会效 atLunarCriticalDamagePowerBase: PRE_DEFINED_EMBED_VALUES.secondaryAttribute, // 阴会效 atSolarCriticalDamagePowerBase: PRE_DEFINED_EMBED_VALUES.secondaryAttribute, // 阳会效 @@ -65,421 +69,446 @@ const VALUE_MAP = { healthRecover: PRE_DEFINED_EMBED_VALUES.recover, mana: PRE_DEFINED_EMBED_VALUES.healthMana, manaRecover: PRE_DEFINED_EMBED_VALUES.recover, -} +}; const XF_FACTOR = { - '10003': { // 易筋经 + "10003": { + // 易筋经 attack: 1.85, // 攻击力 crit: 0.38, // 会心 base: { health_override: 1.34, // 基础气血加成 physicsShield: 400, // 外防 - magicShield: 400 // 内防 + magicShield: 400, // 内防 }, huajing: 1725, // 化劲 physicsShield: 265, // 外防 magicShield: 312, // 内防 - primaryAttr: 'atSpunkBase', // 主属性 - attackType: 'atSolarAttackPowerBase', // 攻击属性 - critType: 'atSolarCriticalStrike', // 会心类型 - critEffectType: 'atSolarCriticalDamagePowerBase', // 会效类型 - overcomeType: 'atSolarOvercomeBase' // 破防类型 + primaryAttr: "atSpunkBase", // 主属性 + attackType: "atSolarAttackPowerBase", // 攻击属性 + critType: "atSolarCriticalStrike", // 会心类型 + critEffectType: "atSolarCriticalDamagePowerBase", // 会效类型 + overcomeType: "atSolarOvercomeBase", // 破防类型 }, - "10014": { // 紫霞功 + "10014": { + // 紫霞功 attack: 1.75, crit: 0.56, base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, huajing: 1725, physicsShield: 0, magicShield: 346, - primaryAttr: 'atSpiritBase', - attackType: 'atNeutralAttackPowerBase', - critType: 'atNeutralCriticalStrike', - critEffectType: 'atNeutralCriticalDamagePowerBase', - overcomeType: 'atNeutralOvercomeBase' + primaryAttr: "atSpiritBase", + attackType: "atNeutralAttackPowerBase", + critType: "atNeutralCriticalStrike", + critEffectType: "atNeutralCriticalDamagePowerBase", + overcomeType: "atNeutralOvercomeBase", }, - '10015': { // 太虚剑意 + "10015": { + // 太虚剑意 attack: 1.45, crit: 0.58, base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, huajing: 1725, physicsShield: 0, magicShield: 0, - primaryAttr: 'atAgilityBase', - attackType: 'atPhysicsAttackPowerBase', - critType: 'atPhysicsCriticalStrike', - critEffectType: 'atPhysicsCriticalDamagePowerBase', - overcomeType: 'atPhysicsOvercomeBase' + primaryAttr: "atAgilityBase", + attackType: "atPhysicsAttackPowerBase", + critType: "atPhysicsCriticalStrike", + critEffectType: "atPhysicsCriticalDamagePowerBase", + overcomeType: "atPhysicsOvercomeBase", }, - '10021': { // 花间游 + "10021": { + // 花间游 attack: 1.95, overcome: 0.19, // 破防 base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, huajing: 1725, physicsShield: 0, magicShield: 231, - primaryAttr: 'atSpunkBase', - attackType: 'atNeutralAttackPowerBase', - critType: 'atNeutralCriticalStrike', - critEffectType: 'atNeutralCriticalDamagePowerBase', - overcomeType: 'atNeutralOvercomeBase' + primaryAttr: "atSpunkBase", + attackType: "atNeutralAttackPowerBase", + critType: "atNeutralCriticalStrike", + critEffectType: "atNeutralCriticalDamagePowerBase", + overcomeType: "atNeutralOvercomeBase", }, - '10026': { // 傲血战意 + "10026": { + // 傲血战意 attack: 1.6, overcome: 0.25, base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, huajing: 1725, // 化劲 physicsShield: 408, magicShield: 0, - primaryAttr: 'atStrengthBase', - attackType: 'atPhysicsAttackPowerBase', - critType: 'atPhysicsCriticalStrike', - critEffectType: 'atPhysicsCriticalDamagePowerBase', - overcomeType: 'atPhysicsOvercomeBase' + primaryAttr: "atStrengthBase", + attackType: "atPhysicsAttackPowerBase", + critType: "atPhysicsCriticalStrike", + critEffectType: "atPhysicsCriticalDamagePowerBase", + overcomeType: "atPhysicsOvercomeBase", }, - '10533': { // 凌海诀 + "10533": { + // 凌海诀 attack: 1.55, // 每点身法额外攻击力 crit: 0.36, // 每点身法额外会心等级 base: { health_override: 1.22, // 基础气血提高 physicsShield: 400, - magicShield: 400 + magicShield: 400, }, huajing: 1725, // 化劲 - primaryAttr: 'atAgilityBase', - attackType: 'atPhysicsAttackPowerBase', - critType: 'atPhysicsCriticalStrike', - critEffectType: 'atPhysicsCriticalDamagePowerBase', - overcomeType: 'atPhysicsOvercomeBase' + primaryAttr: "atAgilityBase", + attackType: "atPhysicsAttackPowerBase", + critType: "atPhysicsCriticalStrike", + critEffectType: "atPhysicsCriticalDamagePowerBase", + overcomeType: "atPhysicsOvercomeBase", }, - "10081": { // 冰心诀 + "10081": { + // 冰心诀 attack: 1.9, crit: 0.28, base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, physicsShield: 254, physicsShield_addtional: 0, magicShield: 323, magicShield_addtional: 0, huajing: 1725, - primaryAttr: 'atSpiritBase', - attackType: 'atLunarAttackPowerBase', - critType: 'atLunarCriticalStrike', - critEffectType: 'atLunarCriticalDamagePowerBase', - overcomeType: 'atLunarOvercomeBase' + primaryAttr: "atSpiritBase", + attackType: "atLunarAttackPowerBase", + critType: "atLunarCriticalStrike", + critEffectType: "atLunarCriticalDamagePowerBase", + overcomeType: "atLunarOvercomeBase", }, - '10144': { // 问水诀 + "10144": { + // 问水诀 attack: 1.6, // 每点身法额外攻击力 overcome: 0.25, base: { health_override: 1.22, // 基础气血提高 physicsShield: 400, - magicShield: 400 + magicShield: 400, }, huajing: 1725, // 化劲 - primaryAttr: 'atAgilityBase', - attackType: 'atPhysicsAttackPowerBase', - critType: 'atPhysicsCriticalStrike', - critEffectType: 'atPhysicsCriticalDamagePowerBase', - overcomeType: 'atPhysicsOvercomeBase' + primaryAttr: "atAgilityBase", + attackType: "atPhysicsAttackPowerBase", + critType: "atPhysicsCriticalStrike", + critEffectType: "atPhysicsCriticalDamagePowerBase", + overcomeType: "atPhysicsOvercomeBase", }, - '10145': { // 山居剑意 + "10145": { + // 山居剑意 attack: 1.6, // 每点身法额外攻击力 overcome: 0.25, base: { health_override: 1.22, // 基础气血提高 physicsShield: 400, - magicShield: 400 + magicShield: 400, }, huajing: 1725, // 化劲 - primaryAttr: 'atAgilityBase', - attackType: 'atPhysicsAttackPowerBase', - critType: 'atPhysicsCriticalStrike', - critEffectType: 'atPhysicsCriticalDamagePowerBase', - overcomeType: 'atPhysicsOvercomeBase' + primaryAttr: "atAgilityBase", + attackType: "atPhysicsAttackPowerBase", + critType: "atPhysicsCriticalStrike", + critEffectType: "atPhysicsCriticalDamagePowerBase", + overcomeType: "atPhysicsOvercomeBase", }, - '10175': { // 毒经 + "10175": { + // 毒经 attack: 1.95, overcome: 0.19, base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, huajing: 1725, physicsShield: 0, magicShield: 578, - primaryAttr: 'atSpiritBase', - attackType: 'atPoisonAttackPowerBase', - critType: 'atPoisonCriticalStrike', - critEffectType: 'atPoisonCriticalDamagePowerBase', - overcomeType: 'atPoisonOvercomeBase' + primaryAttr: "atSpiritBase", + attackType: "atPoisonAttackPowerBase", + critType: "atPoisonCriticalStrike", + critEffectType: "atPoisonCriticalDamagePowerBase", + overcomeType: "atPoisonOvercomeBase", }, - '10224': { // 惊羽诀 + "10224": { + // 惊羽诀 attack: 1.45, crit: 0.59, base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, huajing: 1725, // 化劲 physicsShield: 408, magicShield: 0, - primaryAttr: 'atStrengthBase', - attackType: 'atPhysicsAttackPowerBase', - critType: 'atPhysicsCriticalStrike', - critEffectType: 'atPhysicsCriticalDamagePowerBase', - overcomeType: 'atPhysicsOvercomeBase' + primaryAttr: "atStrengthBase", + attackType: "atPhysicsAttackPowerBase", + critType: "atPhysicsCriticalStrike", + critEffectType: "atPhysicsCriticalDamagePowerBase", + overcomeType: "atPhysicsOvercomeBase", }, - '10225': { // 田螺诡道 + "10225": { + // 田螺诡道 attack: 1.75, crit: 0.57, base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, huajing: 1725, physicsShield: 0, magicShield: 462, - primaryAttr: 'atSpunkBase', - attackType: 'atPoisonAttackPowerBase', - critType: 'atPhysicsCriticalStrike', - critEffectType: 'atPhysicsCriticalDamagePowerBase', - overcomeType: 'atPoisonOvercomeBase' + primaryAttr: "atSpunkBase", + attackType: "atPoisonAttackPowerBase", + critType: "atPhysicsCriticalStrike", + critEffectType: "atPhysicsCriticalDamagePowerBase", + overcomeType: "atPoisonOvercomeBase", }, - '10242': { // 焚影圣诀 + "10242": { + // 焚影圣诀 attack: 1.9, crit: 0.29, base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, huajing: 1725, physicsShield: 0, magicShield: 493, - primaryAttr: 'atSpunkBase', - attackType: 'atSolarAndLunarAttackPowerBase', - critType: 'atSolarAndLunarCriticalStrike', - critEffectType: 'atSolarAndLunarCriticalDamagePowerBase', - overcomeType: 'atSolarAndLunarOvercomeBase' + primaryAttr: "atSpunkBase", + attackType: "atSolarAndLunarAttackPowerBase", + critType: "atSolarAndLunarCriticalStrike", + critEffectType: "atSolarAndLunarCriticalDamagePowerBase", + overcomeType: "atSolarAndLunarOvercomeBase", }, - '10268': { // 笑尘诀 + "10268": { + // 笑尘诀 attack: 1.5, overcome: 0.47, base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, huajing: 1725, // 化劲 physicsShield: 493, magicShield: 0, - primaryAttr: 'atStrengthBase', - attackType: 'atPhysicsAttackPowerBase', - critType: 'atPhysicsCriticalStrike', - critEffectType: 'atPhysicsCriticalDamagePowerBase', - overcomeType: 'atPhysicsOvercomeBase' + primaryAttr: "atStrengthBase", + attackType: "atPhysicsAttackPowerBase", + critType: "atPhysicsCriticalStrike", + critEffectType: "atPhysicsCriticalDamagePowerBase", + overcomeType: "atPhysicsOvercomeBase", }, - '10390': { // 分山劲 + "10390": { + // 分山劲 attack: 1.71, parryBase: 0.1, parryValue: 1, base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, huajing: 1725, - primaryAttr: 'atAgilityBase', - attackType: 'atPhysicsAttackPowerBase', - critType: 'atPhysicsCriticalStrike', - critEffectType: 'atPhysicsCriticalDamagePowerBase', - overcomeType: 'atPhysicsOvercomeBase' + primaryAttr: "atAgilityBase", + attackType: "atPhysicsAttackPowerBase", + critType: "atPhysicsCriticalStrike", + critEffectType: "atPhysicsCriticalDamagePowerBase", + overcomeType: "atPhysicsOvercomeBase", }, - '10447': { // 莫问 + "10447": { + // 莫问 attack: 1.85, crit: 0.38, base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, physicsShield: 0, physicsShield_addtional: 0, magicShield: 462, magicShield_addtional: 0, huajing: 1725, - primaryAttr: 'atSpiritBase', - attackType: 'atLunarAttackPowerBase', - critType: 'atLunarCriticalStrike', - critEffectType: 'atLunarCriticalDamagePowerBase', - overcomeType: 'atLunarOvercomeBase' + primaryAttr: "atSpiritBase", + attackType: "atLunarAttackPowerBase", + critType: "atLunarCriticalStrike", + critEffectType: "atLunarCriticalDamagePowerBase", + overcomeType: "atLunarOvercomeBase", }, - '10464': { // 北傲诀 + "10464": { + // 北傲诀 attack: 1.55, overcome: 0.36, base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, huajing: 1725, // 化劲 physicsShield: 442, magicShield: 0, - primaryAttr: 'atStrengthBase', - attackType: 'atPhysicsAttackPowerBase', - critType: 'atPhysicsCriticalStrike', - critEffectType: 'atPhysicsCriticalDamagePowerBase', - overcomeType: 'atPhysicsOvercomeBase' + primaryAttr: "atStrengthBase", + attackType: "atPhysicsAttackPowerBase", + critType: "atPhysicsCriticalStrike", + critEffectType: "atPhysicsCriticalDamagePowerBase", + overcomeType: "atPhysicsOvercomeBase", }, - '10585': { // 隐龙诀 + "10585": { + // 隐龙诀 attack: 1.5, overcome: 0.47, base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, huajing: 1725, - primaryAttr: 'atAgilityBase', - attackType: 'atPhysicsAttackPowerBase', - critType: 'atPhysicsCriticalStrike', - critEffectType: 'atPhysicsCriticalDamagePowerBase', - overcomeType: 'atPhysicsOvercomeBase' + primaryAttr: "atAgilityBase", + attackType: "atPhysicsAttackPowerBase", + critType: "atPhysicsCriticalStrike", + critEffectType: "atPhysicsCriticalDamagePowerBase", + overcomeType: "atPhysicsOvercomeBase", }, - '10615': { // 太玄经 + "10615": { + // 太玄经 attack: 1.8, crit: 0.47, base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, huajing: 1725, physicsShield: 0, magicShield: 231, - primaryAttr: 'atSpunkBase', - attackType: 'atNeutralAttackPowerBase', - critType: 'atNeutralCriticalStrike', - critEffectType: 'atNeutralCriticalDamagePowerBase', - overcomeType: 'atNeutralOvercomeBase' + primaryAttr: "atSpunkBase", + attackType: "atNeutralAttackPowerBase", + critType: "atNeutralCriticalStrike", + critEffectType: "atNeutralCriticalDamagePowerBase", + overcomeType: "atNeutralOvercomeBase", }, - '10028': { // 离经易道 + "10028": { + // 离经易道 heal: 1.85, crit: 0.38, base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, physicsShield: 578, physicsShield_addtional: 0, magicShield: 578, magicShield_addtional: 0, huajing: 1725, - primaryAttr: 'atSpiritBase', - attackType: 'atNeutralAttackPowerBase', - critType: 'atNeutralCriticalStrike', - critEffectType: 'atNeutralCriticalDamagePowerBase', - overcomeType: 'atNeutralOvercomeBase' + primaryAttr: "atSpiritBase", + attackType: "atNeutralAttackPowerBase", + critType: "atNeutralCriticalStrike", + critEffectType: "atNeutralCriticalDamagePowerBase", + overcomeType: "atNeutralOvercomeBase", }, - '10080': { // 云裳心经 + "10080": { + // 云裳心经 heal: 1.75, crit: 0.21, base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, physicsShield: 578, physicsShield_addtional: 0, magicShield: 578, magicShield_addtional: 0, huajing: 1725, - primaryAttr: 'atSpiritBase', - attackType: 'atLunarAttackPowerBase', - critType: 'atLunarCriticalStrike', - critEffectType: 'atLunarCriticalDamagePowerBase', - overcomeType: 'atLunarOvercomeBase' + primaryAttr: "atSpiritBase", + attackType: "atLunarAttackPowerBase", + critType: "atLunarCriticalStrike", + critEffectType: "atLunarCriticalDamagePowerBase", + overcomeType: "atLunarOvercomeBase", }, - '10176': { // 补天诀 + "10176": { + // 补天诀 heal: 1.85, base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, physicsShield: 0, physicsShield_addtional: 0, magicShield: 578, magicShield_addtional: 0, huajing: 1725, - primaryAttr: 'atSpiritBase', - attackType: 'atPoisonAttackPowerBase', - critType: 'atPoisonCriticalStrike', - critEffectType: 'atPoisonCriticalDamagePowerBase', - overcomeType: 'atPoisonOvercomeBase' + primaryAttr: "atSpiritBase", + attackType: "atPoisonAttackPowerBase", + critType: "atPoisonCriticalStrike", + critEffectType: "atPoisonCriticalDamagePowerBase", + overcomeType: "atPoisonOvercomeBase", }, - '10448': { // 相知 + "10448": { + // 相知 heal: 1.7, crit: 0.31, base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, physicsShield: 0, physicsShield_addtional: 0, magicShield: 578, magicShield_addtional: 0, huajing: 1725, - primaryAttr: 'atSpiritBase', - attackType: 'atLunarAttackPowerBase', - critType: 'atLunarCriticalStrike', - critEffectType: 'atLunarCriticalDamagePowerBase', - overcomeType: 'atLunarOvercomeBase' + primaryAttr: "atSpiritBase", + attackType: "atLunarAttackPowerBase", + critType: "atLunarCriticalStrike", + critEffectType: "atLunarCriticalDamagePowerBase", + overcomeType: "atLunarOvercomeBase", }, - '10002': { // 洗髓经 + "10002": { + // 洗髓经 health: 2.5, attack: 0.05, base: { health_override: 1.34, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, physicsShield: 548, magicShield: 914, magicShield_addtional: 0.1, // 每点体质增加内防 huajing: 1725, - primaryAttr: 'atVitalityBase', - attackType: 'atSolarAttackPowerBase', - critType: 'atSolarCriticalStrike', - critEffectType: 'atSolarCriticalDamagePowerBase', - overcomeType: 'atSolarOvercomeBase' + primaryAttr: "atVitalityBase", + attackType: "atSolarAttackPowerBase", + critType: "atSolarCriticalStrike", + critEffectType: "atSolarCriticalDamagePowerBase", + overcomeType: "atSolarOvercomeBase", }, - '10062': { // 铁牢律 + "10062": { + // 铁牢律 health: 1.5, attack: 0.04, parryBase: 548, @@ -488,20 +517,21 @@ const XF_FACTOR = { base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, physicsShield: 914, physicsShield_addtional: 0.1, // 每点体质增加外防 magicShield: 0, magicShield_addtional: 0, huajing: 1725, - primaryAttr: 'atVitalityBase', - attackType: 'atPhysicsAttackPowerBase', - critType: 'atPhysicsCriticalStrike', - critEffectType: 'atPhysicsCriticalDamagePowerBase', - overcomeType: 'atPhysicsOvercomeBase' + primaryAttr: "atVitalityBase", + attackType: "atPhysicsAttackPowerBase", + critType: "atPhysicsCriticalStrike", + critEffectType: "atPhysicsCriticalDamagePowerBase", + overcomeType: "atPhysicsOvercomeBase", }, - '10243': { // 明尊琉璃体 + "10243": { + // 明尊琉璃体 health: 1.25, attack: 0.05, // parryBase: 0.1, @@ -510,20 +540,21 @@ const XF_FACTOR = { base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, physicsShield: 457, physicsShield_addtional: 0.1, magicShield: 457, magicShield_addtional: 0, huajing: 1725, - primaryAttr: 'atVitalityBase', - attackType: 'atSolarAndLunarAttackPowerBase', - critType: 'atSolarAndLunarCriticalStrike', - critEffectType: 'atSolarAndLunarCriticalDamagePowerBase', - overcomeType: 'atSolarAndLunarOvercomeBase' + primaryAttr: "atVitalityBase", + attackType: "atSolarAndLunarAttackPowerBase", + critType: "atSolarAndLunarCriticalStrike", + critEffectType: "atSolarAndLunarCriticalDamagePowerBase", + overcomeType: "atSolarAndLunarOvercomeBase", }, - '10389': { // 铁骨衣 + "10389": { + // 铁骨衣 health: 2.2, attack: 0.04, parryValue: 2114, @@ -533,229 +564,255 @@ const XF_FACTOR = { base: { health_override: 1.22, physicsShield: 400, - magicShield: 400 + magicShield: 400, }, physicsShield: 548, physicsShield_addtional: 0, magicShield: 0, magicShield_addtional: 0, huajing: 1725, - primaryAttr: 'atVitalityBase', - attackType: 'atPhysicsAttackPowerBase', - critType: 'atPhysicsCriticalStrike', - critEffectType: 'atPhysicsCriticalDamagePowerBase', - overcomeType: 'atPhysicsOvercomeBase' - } -} + primaryAttr: "atVitalityBase", + attackType: "atPhysicsAttackPowerBase", + critType: "atPhysicsCriticalStrike", + critEffectType: "atPhysicsCriticalDamagePowerBase", + overcomeType: "atPhysicsOvercomeBase", + }, +}; const XF_DECORATOR = { - "10003": [ // 易筋经 + "10003": [ + // 易筋经 ["attack", "MAGIC"], ["hit", "MAGIC"], ["crit", "MAGIC"], ["critEffect", "MAGIC"], - ["overcome", "MAGIC"] + ["overcome", "MAGIC"], ], - "10014": [ // 紫霞功 + "10014": [ + // 紫霞功 ["attack", "MAGIC"], ["hit", "MAGIC"], ["crit", "MAGIC"], ["critEffect", "MAGIC"], - ["overcome", "MAGIC"] + ["overcome", "MAGIC"], ], - "10015": [ // 太虚剑意 + "10015": [ + // 太虚剑意 ["attack", "PHYSICS"], ["hit", "PHYSICS"], ["crit", "PHYSICS"], ["critEffect", "PHYSICS"], - ["overcome", "PHYSICS"] + ["overcome", "PHYSICS"], ], - "10021": [ // 花间 + "10021": [ + // 花间 ["attack", "MAGIC"], ["hit", "MAGIC"], ["crit", "MAGIC"], ["critEffect", "MAGIC"], - ["overcome", "MAGIC"] + ["overcome", "MAGIC"], ], - '10026': [ // 傲血战意 + "10026": [ + // 傲血战意 ["attack", "PHYSICS"], ["hit", "PHYSICS"], ["crit", "PHYSICS"], ["critEffect", "PHYSICS"], - ["overcome", "PHYSICS"] + ["overcome", "PHYSICS"], ], - "10533": [ // 凌海诀 + "10533": [ + // 凌海诀 ["attack", "PHYSICS"], ["hit", "PHYSICS"], ["crit", "PHYSICS"], ["critEffect", "PHYSICS"], - ["overcome", "PHYSICS"] + ["overcome", "PHYSICS"], ], - "10144": [ // 问水诀 + "10144": [ + // 问水诀 ["attack", "PHYSICS"], ["hit", "PHYSICS"], ["crit", "PHYSICS"], ["critEffect", "PHYSICS"], - ["overcome", "PHYSICS"] + ["overcome", "PHYSICS"], ], - "10145": [ // 山居剑意 + "10145": [ + // 山居剑意 ["attack", "PHYSICS"], ["hit", "PHYSICS"], ["crit", "PHYSICS"], ["critEffect", "PHYSICS"], - ["overcome", "PHYSICS"] + ["overcome", "PHYSICS"], ], - "10390": [ // 分山劲 + "10390": [ + // 分山劲 ["attack", "PHYSICS"], ["hit", "PHYSICS"], ["crit", "PHYSICS"], ["critEffect", "PHYSICS"], - ["overcome", "PHYSICS"] + ["overcome", "PHYSICS"], ], - "10081": [ // 冰心诀 + "10081": [ + // 冰心诀 ["attack", "MAGIC"], ["hit", "MAGIC"], ["crit", "MAGIC"], ["critEffect", "MAGIC"], - ["overcome", "MAGIC"] + ["overcome", "MAGIC"], ], - "10175": [ // 毒经 + "10175": [ + // 毒经 ["attack", "MAGIC"], ["hit", "MAGIC"], ["crit", "MAGIC"], ["critEffect", "MAGIC"], - ["overcome", "MAGIC"] + ["overcome", "MAGIC"], ], - "10242": [ // 焚影圣诀 + "10242": [ + // 焚影圣诀 ["attack", "MAGIC"], ["hit", "MAGIC"], ["crit", "MAGIC"], ["critEffect", "MAGIC"], - ["overcome", "MAGIC"] + ["overcome", "MAGIC"], ], - "10447": [ // 莫问 + "10447": [ + // 莫问 ["attack", "MAGIC"], ["hit", "MAGIC"], ["crit", "MAGIC"], ["critEffect", "MAGIC"], - ["overcome", "MAGIC"] + ["overcome", "MAGIC"], ], - "10028": [ // 离经易道 + "10028": [ + // 离经易道 ["attack", "MAGIC"], ["hit", "MAGIC"], ["crit", "MAGIC"], ["critEffect", "MAGIC"], - ["overcome", "MAGIC"] + ["overcome", "MAGIC"], ], - "10080": [ // 云裳心经 + "10080": [ + // 云裳心经 ["attack", "MAGIC"], ["hit", "MAGIC"], ["crit", "MAGIC"], ["critEffect", "MAGIC"], - ["overcome", "MAGIC"] + ["overcome", "MAGIC"], ], - "10176": [ // 补天诀 + "10176": [ + // 补天诀 ["attack", "MAGIC"], ["hit", "MAGIC"], ["crit", "MAGIC"], ["critEffect", "MAGIC"], - ["overcome", "MAGIC"] + ["overcome", "MAGIC"], ], - "10448": [ // 相知 + "10448": [ + // 相知 ["attack", "MAGIC"], ["hit", "MAGIC"], ["crit", "MAGIC"], ["critEffect", "MAGIC"], - ["overcome", "MAGIC"] + ["overcome", "MAGIC"], ], - "10002": [ // 洗髓经 + "10002": [ + // 洗髓经 ["attack", "MAGIC"], ["hit", "MAGIC"], ["crit", "MAGIC"], ["critEffect", "MAGIC"], - ["overcome", "MAGIC"] + ["overcome", "MAGIC"], ], - "10615": [ // 太玄经 + "10615": [ + // 太玄经 ["attack", "MAGIC"], ["hit", "MAGIC"], ["crit", "MAGIC"], ["critEffect", "MAGIC"], - ["overcome", "MAGIC"] + ["overcome", "MAGIC"], ], - "10243": [ // 明尊琉璃体 + "10243": [ + // 明尊琉璃体 ["attack", "MAGIC"], ["hit", "MAGIC"], ["crit", "MAGIC"], ["critEffect", "MAGIC"], - ["overcome", "MAGIC"] + ["overcome", "MAGIC"], ], - "10585": [ // 隐龙诀 + "10585": [ + // 隐龙诀 ["attack", "PHYSICS"], ["hit", "PHYSICS"], ["crit", "PHYSICS"], ["critEffect", "PHYSICS"], - ["overcome", "PHYSICS"] + ["overcome", "PHYSICS"], ], - "10224": [ // 惊羽诀 + "10224": [ + // 惊羽诀 ["attack", "PHYSICS"], ["hit", "PHYSICS"], ["crit", "PHYSICS"], ["critEffect", "PHYSICS"], - ["overcome", "PHYSICS"] + ["overcome", "PHYSICS"], ], - "10268": [ // 笑尘诀 + "10268": [ + // 笑尘诀 ["attack", "PHYSICS"], ["hit", "PHYSICS"], ["crit", "PHYSICS"], ["critEffect", "PHYSICS"], - ["overcome", "PHYSICS"] + ["overcome", "PHYSICS"], ], - "10464": [ // 北傲诀 + "10464": [ + // 北傲诀 ["attack", "PHYSICS"], ["hit", "PHYSICS"], ["crit", "PHYSICS"], ["critEffect", "PHYSICS"], - ["overcome", "PHYSICS"] + ["overcome", "PHYSICS"], ], - "10062": [ // 铁牢律 + "10062": [ + // 铁牢律 ["attack", "PHYSICS"], ["hit", "PHYSICS"], ["crit", "PHYSICS"], ["critEffect", "PHYSICS"], - ["overcome", "PHYSICS"] + ["overcome", "PHYSICS"], ], - "10389": [ // 铁骨衣 + "10389": [ + // 铁骨衣 ["attack", "PHYSICS"], ["hit", "PHYSICS"], ["crit", "PHYSICS"], ["critEffect", "PHYSICS"], - ["overcome", "PHYSICS"] + ["overcome", "PHYSICS"], ], - "10225": [ // 田螺诡道 + "10225": [ + // 田螺诡道 ["attack", "MAGIC"], ["hit", "MAGIC"], ["crit", "PHYSICS"], ["critEffect", "PHYSICS"], - ["overcome", "MAGIC"] + ["overcome", "MAGIC"], ], -} +}; const QIXUE = { - 'primary': ['6566', '21285', '14903', '6822', '16728', '22583', '25066'], // 七秀霜风 傲血关山月 分山活脉 笑尘贞固 北傲星火 隐龙王师 太玄神元 - 'health': ['5930', '6898', '5695'], // 易筋经明王身 明尊超凡 铁牢望西京 - 'heal': [], - 'shield': ['5679', '5921'], // 天策勤王 洗髓生缘 - 'atVitality': ['6566', '21285', '14903', '13124', '6822', '16728', '25066'], // 七秀霜风 傲血关山月 分山活脉 铁骨活血 笑尘贞固 北傲星火 太玄神元 - 'haste': [] -} + primary: ["6566", "21285", "14903", "6822", "16728", "22583", "25066"], // 七秀霜风 傲血关山月 分山活脉 笑尘贞固 北傲星火 隐龙王师 太玄神元 + health: ["5930", "6898", "5695"], // 易筋经明王身 明尊超凡 铁牢望西京 + heal: [], + shield: ["5679", "5921"], // 天策勤王 洗髓生缘 + atVitality: ["6566", "21285", "14903", "13124", "6822", "16728", "25066"], // 七秀霜风 傲血关山月 分山活脉 铁骨活血 笑尘贞固 北傲星火 太玄神元 + haste: [], +}; // 大附魔增加数值 const ENCHANTS = { - '山市鬼冢·伤·衣': [291, 243], // 内外攻击 - '山市鬼船·伤·衣': [357, 298], // 内外攻击 - '山市鬼冢·伤·帽': [406, 406], // 破防 - '山市鬼船·伤·帽': [496, 496], // 破防 - -} + "山市鬼冢·伤·衣": [291, 243], // 内外攻击 + "山市鬼船·伤·衣": [357, 298], // 内外攻击 + "山市鬼冢·伤·帽": [406, 406], // 破防 + "山市鬼船·伤·帽": [496, 496], // 破防 +}; export { PRE_DEFINED_EMBED_VALUES, @@ -763,5 +820,5 @@ export { XF_DECORATOR, XF_FACTOR, QIXUE, - ENCHANTS -} \ No newline at end of file + ENCHANTS, +}; diff --git a/src/components/attrs.vue b/src/components/attrs.vue index 2e41634..a038d5a 100644 --- a/src/components/attrs.vue +++ b/src/components/attrs.vue @@ -13,7 +13,9 @@ - 过滤属性 + + 过滤属性 + @@ -21,7 +23,7 @@
{{ item.key | showAttrName }} - {{ item.val }} + {{ item.val }}{{item.extra}}
@@ -29,9 +31,9 @@ diff --git a/src/service/attr.js b/src/service/attr.js index 55e56e1..f4cf47c 100644 --- a/src/service/attr.js +++ b/src/service/attr.js @@ -537,7 +537,7 @@ class RoleAttribute { // 主属性闪躲加成 const primaryDodge = this.primaryAttrVal * (XF_FACTOR[kungfu.KungfuID]['dodge_addtional'] || 0); - console.log('dodge', primaryDodge, equipDodge, (XF_FACTOR[kungfu.KungfuID]['dodge'] || 0)) + // console.log('dodge', primaryDodge, equipDodge, (XF_FACTOR[kungfu.KungfuID]['dodge'] || 0)) return Math.round(equipDodge + primaryDodge + (XF_FACTOR[kungfu.KungfuID]['dodge'] || 0)) } @@ -556,7 +556,7 @@ class RoleAttribute { // 主属性 const primaryParryBase = this.primaryAttrVal * (XF_FACTOR[kungfu.KungfuID]['parryBase_addtional'] || 0); - console.log('parryBase', equipParryBase, primaryParryBase, (XF_FACTOR[kungfu.KungfuID]['parryBase'] || 0)); + // console.log('parryBase', equipParryBase, primaryParryBase, (XF_FACTOR[kungfu.KungfuID]['parryBase'] || 0)); return Math.round(equipParryBase + primaryParryBase + (XF_FACTOR[kungfu.KungfuID]['parryBase'] || 0)); } diff --git a/src/service/gs.js b/src/service/gs.js index 3f3fa63..b0af43c 100644 --- a/src/service/gs.js +++ b/src/service/gs.js @@ -1,16 +1,14 @@ -import { - equipment_quality_coefficients, - equipment_position_coefficients, - stoneScore, -} from "@/assets/data/gs.json"; +import { equipment_quality_coefficients, equipment_position_coefficients, stoneScore } from "@/assets/data/gs.json"; // 装备分数 = 品质 * 品质系数 * 部位系数 -function getEquipOriginScore(quality, color, position) { - return ~~( - Number(quality) * - Number(equipment_quality_coefficients[color]) * - Number(equipment_position_coefficients[position]) - ); +function getEquipOriginScore(quality, color, position, mount_id) { + const isCJ = [10144, 10145].includes(mount_id); + let isWeapon = position == "0" || position == "1"; + // 藏剑武器折半 + if (isCJ && isWeapon) { + return ~~((Number(quality) * Number(equipment_quality_coefficients[color]) * Number(equipment_position_coefficients[position])) / 2); + } + return ~~(Number(quality) * Number(equipment_quality_coefficients[color]) * Number(equipment_position_coefficients[position])); } // 五彩石分数 @@ -24,46 +22,38 @@ function getFiveStoneScore(stone_level) { } // 精炼分数|属性成长 -function getGrowScore(base,strength) { - return Math.round((~~base * ~~strength * (0.007 + ~~strength * 0.003)) / 2) +function getGrowScore(base, strength) { + return Math.round((~~base * ~~strength * (0.007 + ~~strength * 0.003)) / 2); } // 总分数 = 五行石插孔、五彩石、精炼分数 + 装备分数 -function getGS(equip_data) { - let total_gs = 0 +function getGS(equip_data, mount_id) { + let total_gs = 0; equip_data.forEach((item) => { - if(item){ - + if (item) { // 装备分数 - let equip_gs = getEquipOriginScore(item.Quality,item.Color,item.UcPos) - total_gs += equip_gs + let equip_gs = getEquipOriginScore(item.Quality, item.Color, item.UcPos, mount_id); + total_gs += equip_gs; // 精炼分数 - total_gs += getGrowScore(equip_gs,~~item.StrengthLevel) + total_gs += getGrowScore(equip_gs, ~~item.StrengthLevel); // 五行石插孔 - if(item.FiveStone){ + if (item.FiveStone) { item.FiveStone.forEach((stone) => { - total_gs += getFiveStoneScore(~~stone.Level) - }) + total_gs += getFiveStoneScore(~~stone.Level); + }); } // 五彩石 - if(item.ColorStone){ - total_gs += getColorStoneScore(~~item.ColorStone.Level) + if (item.ColorStone) { + total_gs += getColorStoneScore(~~item.ColorStone.Level); } - } - }) + }); - return Math.floor(total_gs) + return Math.floor(total_gs); } -export { - getEquipOriginScore, - getFiveStoneScore, - getColorStoneScore, - getGrowScore, - getGS, -}; +export { getEquipOriginScore, getFiveStoneScore, getColorStoneScore, getGrowScore, getGS };