From 45aaa308957b8c1afc5ec1d9d7cdf215f67966ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Wed, 6 May 2020 14:11:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E4=B9=8B=E5=89=8D=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=98=E8=AE=B0=E6=8F=90=E4=BA=A4=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script-json_data.js | 12 ++++++------ script.js | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/script-json_data.js b/script-json_data.js index a0cc626c..bddf9238 100644 --- a/script-json_data.js +++ b/script-json_data.js @@ -78,16 +78,16 @@ if (!solo) { const multiSort = [ {tag:"sort_hpMax110_Multi",name:"最大协力攻击(Lv110)",function:(a,b)=> - a.atk.max * (1 + a.limitBreakIncr/100) * Math.pow(1.5, a.awakenings.filter(ak=>ak===30).length) - - b.atk.max * (1 + b.limitBreakIncr/100) * Math.pow(1.5, b.awakenings.filter(ak=>ak===30).length) + (a.atk.max * (1 + a.limitBreakIncr/100) + (a.overlay || a.types[0] == 15 && a.types[1] == -1) ? 0 : 495) * Math.pow(1.5, a.awakenings.filter(ak=>ak===30).length) - + (b.atk.max * (1 + b.limitBreakIncr/100) + (b.overlay || b.types[0] == 15 && b.types[1] == -1) ? 0 : 495) * Math.pow(1.5, b.awakenings.filter(ak=>ak===30).length) }, {tag:"sort_hpMax110_Multi",name:"最大协力HP(Lv110)",function:(a,b)=> - a.hp.max * (1 + a.limitBreakIncr/100) * Math.pow(1.5, a.awakenings.filter(ak=>ak===30).length) - - b.hp.max * (1 + b.limitBreakIncr/100) * Math.pow(1.5, b.awakenings.filter(ak=>ak===30).length) + (a.hp.max * (1 + a.limitBreakIncr/100) + (a.overlay || a.types[0] == 15 && a.types[1] == -1) ? 0 : 990) * Math.pow(1.5, a.awakenings.filter(ak=>ak===30).length) - + (b.hp.max * (1 + b.limitBreakIncr/100) + (b.overlay || b.types[0] == 15 && b.types[1] == -1) ? 0 : 990) * Math.pow(1.5, b.awakenings.filter(ak=>ak===30).length) }, {tag:"sort_hpMax110_Multi",name:"最大协力回复(Lv110)",function:(a,b)=> - a.rcv.max * (1 + a.limitBreakIncr/100) * Math.pow(1.5, a.awakenings.filter(ak=>ak===30).length) - - b.rcv.max * (1 + b.limitBreakIncr/100) * Math.pow(1.5, b.awakenings.filter(ak=>ak===30).length) + (a.rcv.max * (1 + a.limitBreakIncr/100) + ((a.overlay || a.types[0] == 15 && a.types[1] == -1) ? 0 : 297)) * Math.pow(1.5, a.awakenings.filter(ak=>ak===30).length) - + (b.rcv.max * (1 + b.limitBreakIncr/100) + ((b.overlay || b.types[0] == 15 && b.types[1] == -1) ? 0 : 297)) * Math.pow(1.5, b.awakenings.filter(ak=>ak===30).length) }, ]; sort_function_list.push(...multiSort); diff --git a/script.js b/script.js index d7f30876..1841afc1 100644 --- a/script.js +++ b/script.js @@ -2134,6 +2134,10 @@ function editBoxChangeMonId(id) if (card.overlay || card.types[0] == 15 && card.types[1] == -1) { //当可以叠加时，不能打297和潜觉 rowPlus.classList.add("disabled"); + rowPlus.querySelector(".m-plus-hp").value = 0; + rowPlus.querySelector(".m-plus-atk").value = 0; + rowPlus.querySelector(".m-plus-rcv").value = 0; + rowLatent.classList.add("disabled"); skillLevel.setAttribute("readonly",true); }else