From a9ebc7345f33d86e8022ebd61b729111f435b00d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Mon, 12 Oct 2020 11:49:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- languages/zh-CN.js | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/languages/zh-CN.js b/languages/zh-CN.js index 33d14c1c..56886a26 100644 --- a/languages/zh-CN.js +++ b/languages/zh-CN.js @@ -850,6 +850,7 @@ function parseSkillDescription(skill) case 166: str = `${sk[0]}连击时,所有宠物的`; strArr = []; + let scale_diff = sk[5] - sk[0]; if (sk[1]==sk[2] && sk[3] == sk[4]) { strArr.push(`攻击力和回复力×${sk[1]/100}倍`); @@ -857,34 +858,34 @@ function parseSkillDescription(skill) { strArr.push(`每多1种属性+${sk[3]/100}倍`); } - if (sk[5]>sk[0]) + if (scale_diff) { - strArr.push(`最大${sk[5]}种属性时×${((sk[5]-sk[0])*sk[1]+sk[3])/100}倍`); + strArr.push(`最大${sk[5]}种属性时×${(scale_diff*sk[1]+sk[3])/100}倍`); } }else { - if (sk[1]>0) + if (sk[1] && sk[1] !== 100) { strArr.push(`攻击力×${sk[1]/100}倍`); if (sk[3]>0) { strArr.push(`每多1种属性+${sk[3]/100}倍`); } - if (sk[5]>sk[0]) + if (scale_diff) { - strArr.push(`最大${sk[5]}种属性时×${((sk[5]-sk[0])*sk[1]+sk[3])/100}倍`); + strArr.push(`最大${sk[5]}种属性时×${(scale_diff*sk[1]+sk[3])/100}倍`); } } - if (sk[2]>0) + if (sk[2] && sk[2] !== 100) { strArr.push(`回复力×${sk[2]/100}倍`); if (sk[4]>0) { strArr.push(`每多1种属性+${sk[4]/100}倍`); } - if (sk[5]>sk[0]) + if (scale_diff) { - strArr.push(`最大${sk[5]}种属性时×${((sk[5]-sk[0])*sk[2]+sk[4])/100}倍`); + strArr.push(`最大${sk[5]}种属性时×${(scale_diff*sk[2]+sk[4])/100}倍`); } } } @@ -907,7 +908,7 @@ function parseSkillDescription(skill) } }else { - if (sk[2]>0) + if (sk[2] && sk[2] !== 100) { strArr.push(`攻击力×${sk[2]/100}倍`); if (sk[4]>0) @@ -919,7 +920,7 @@ function parseSkillDescription(skill) strArr.push(`最大${sk[6]}个时×${(sk[2]+sk[4]*(sk[6]-sk[1]))/100}倍`); } } - if (sk[3]>0) + if (sk[3] && sk[3] !== 100) { strArr.push(`回复力×${sk[3]/100}倍`); if (sk[5]>0)