diff --git a/script-json_data.js b/script-json_data.js index 99357a83..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) + 495) * Math.pow(1.5, a.awakenings.filter(ak=>ak===30).length) - - (b.atk.max * (1 + b.limitBreakIncr/100) + 495) * 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) + 990) * Math.pow(1.5, a.awakenings.filter(ak=>ak===30).length) - - (b.hp.max * (1 + b.limitBreakIncr/100) + 990) * 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) + 99) * Math.pow(1.5, a.awakenings.filter(ak=>ak===30).length) - - (b.rcv.max * (1 + b.limitBreakIncr/100) + 99) * 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 f3180bdb..7614afd0 100644 --- a/script.js +++ b/script.js @@ -2152,6 +2152,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