From 3d57a8287c43ccc3b6de6b0fb5dddc4c23125480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Fri, 2 Apr 2021 23:50:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B8=88=E9=BE=99=E9=98=9F?= =?UTF-8?q?=E9=95=BF=E6=8A=80HP=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script-universal_function.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script-universal_function.js b/script-universal_function.js index 2dca55c8..487e4fb1 100644 --- a/script-universal_function.js +++ b/script-universal_function.js @@ -615,12 +615,12 @@ function countTeamHp(memberArr, leader1id, leader2id, solo, noAwoken = false) { scale = needMonIdArr.every(mid => memberIdArr.includes(mid)) ? sk[5] / 100 : 1; break; case 136: - scale = hpMul({ attrs: flags(sk[0]) }, sk[1]) * - sk[4] ? hpMul({ attrs: flags(sk[4]) }, sk[5]) : 1; + scale = hpMul({ attrs: flags(sk[0]) }, sk[1]); + if (sk[4]) scale *= hpMul({ attrs: flags(sk[4]) }, sk[5]); break; case 137: - scale = hpMul({ types: flags(sk[0]) }, sk[1]) * - sk[4] ? hpMul({ types: flags(sk[4]) }, sk[5]) : 1; + scale = hpMul({ types: flags(sk[0]) }, sk[1]); + if (sk[4]) scale *= hpMul({ types: flags(sk[4]) }, sk[5]); break; case 155: scale = solo ? 1 : hpMul({ attrs: flags(sk[0]), types: flags(sk[1]) }, sk[2]);