diff --git a/script-universal_function.js b/script-universal_function.js index fa20eb2e..e51e5d40 100644 --- a/script-universal_function.js +++ b/script-universal_function.js @@ -230,7 +230,7 @@ function awokenCountInTeam(team,awokenIndex,solo,teamsCount) } if (assistCard && assistCard.enabled && assistCard.awakenings.includes(49)) { //如果卡片未启用 - enableAwoken = enableAwoken.concat(assistCard.awakenings); + enableAwoken = enableAwoken.concat(assistCard.awakenings.slice(0, assist.awoken)); } //相同的觉醒数 diff --git a/script.js b/script.js index 9d86cbc6..cbb0c4c3 100644 --- a/script.js +++ b/script.js @@ -1622,7 +1622,7 @@ function changeid(mon, monDom, latentDom) { { awokenIcon.classList.add(className_displayNone); awokenIcon.innerHTML = ""; - } else if (mon.awoken > 1) //如果提供了觉醒 + } else if (mon.awoken > 0) //如果提供了觉醒 { awokenIcon.classList.remove(className_displayNone); awokenIcon.innerHTML = mon.awoken; @@ -1790,7 +1790,7 @@ function editMon(teamNum, isAssist, indexInTeam) { editBoxTitle.classList.add("edit-box-title-assist"); } editBox.reCalculateExp(); - if (mon.awoken > 0 && monEditAwokens[mon.awoken]) + if (mon.awoken !== undefined && monEditAwokens[mon.awoken]) monEditAwokens[mon.awoken].click(); //涉及到觉醒数字的显示,所以需要点一下 else editBox.reCalculateAbility();