diff --git a/script-skill-parser.js b/script-skill-parser.js index ddcfe7d2..6b09e492 100644 --- a/script-skill-parser.js +++ b/script-skill-parser.js @@ -1640,24 +1640,25 @@ const skillObjectParsers = { }; -function renderSkillTitle(skillId) { +function renderSkillTitle(skillId, { showTurns } = {}) { const skill = Skills[skillId]; - const div = document.createElement("div"); + const div = document.createElement("summary"); div.className = "evolved-skill-title"; const name = div.appendChild(document.createElement("span")); name.className = "skill-name"; name.textContent = skill.name; name.setAttribute("data-skillid", skillId); - name.onclick = fastShowSkill; - const cd = div.appendChild(document.createElement("span")); - cd.className = "skill-cd"; - cd.textContent = skill.initialCooldown - skill.maxLevel + 1; - if (skill.maxLevel > 1) { - const level = div.appendChild(document.createElement("span")); - level.className = "skill-level-label"; - level.textContent = skill.maxLevel; + //name.onclick = fastShowSkill; + if (showTurns) { + const cd = div.appendChild(document.createElement("span")); + cd.className = "skill-cd"; + cd.textContent = skill.initialCooldown - skill.maxLevel + 1; + if (skill.maxLevel > 1) { + const level = div.appendChild(document.createElement("span")); + level.className = "skill-level-label"; + level.textContent = skill.maxLevel; + } } - return div; } @@ -1831,9 +1832,12 @@ function renderSkill(skill, option = {}) let skills = skill.skills; const ul = document.createElement("ul"); ul.className = "random-active-skill"; - skills.forEach(subSkill=>{ + skills.forEach((subSkill, idx)=>{ const li = ul.appendChild(document.createElement("li")); - li.appendChild(renderSkillEntry(subSkill)); + const details = li.appendChild(document.createElement("details")); + details.className = "skill-details"; + details.appendChild(renderSkillTitle(skill.params[idx])); + details.appendChild(renderSkillEntry(subSkill)); }); let dict = { skills: ul, @@ -1847,19 +1851,16 @@ function renderSkill(skill, option = {}) ul.className = "evolved-active-skill"; skills.forEach((subSkill, idx)=>{ const li = ul.appendChild(document.createElement("li")); - li.appendChild(renderSkillTitle(skill.params[idx])); - li.appendChild(renderSkillEntry(subSkill)); + const details = li.appendChild(document.createElement("details")); + details.className = "skill-details"; + details.appendChild(renderSkillTitle(skill.params[idx], { showTurns:true })); + details.appendChild(renderSkillEntry(subSkill)); }); let dict = { skills: ul, }; frg.ap(tsp.skill.evolved_skills(dict)); - if (loop) { - let dict2 = { - icon: createIcon("evolved-skill-loop"), - } - frg.ap(tsp.skill.evolved_skills_loop(dict2)); - } + if (loop) frg.ap(tsp.skill.evolved_skills_loop({icon: createIcon("evolved-skill-loop")})); break; } case SkillKinds.Delay: { //威吓 diff --git a/script.js b/script.js index 6e3cc50e..f1233a1a 100644 --- a/script.js +++ b/script.js @@ -4438,7 +4438,8 @@ function editBoxChangeMonId(id) { mAwokenIpt[card.awakenings.length].click(); //选择最后一个觉醒 //超觉醒 - const monEditSAwokensUl = settingBox.querySelector(".row-mon-super-awoken .awoken-ul"); + const monEditSAwokensRow = settingBox.querySelector(".row-mon-super-awoken"); + const monEditSAwokensUl = monEditSAwokensRow.querySelector(".awoken-ul"); const monEditSAwokensIcons = Array.from(monEditSAwokensUl.querySelectorAll(".awoken-icon")); const noSAwokenRadio = settingBox.querySelector("#sawoken-choice-nosawoken"); //不选超觉醒的选项 //获得之前的所有超觉醒 @@ -4475,6 +4476,8 @@ function editBoxChangeMonId(id) { } } } + //怪物没有超觉醒时隐藏超觉醒 + monEditSAwokensRow.classList.toggle(className_displayNone, card.superAwakenings.length == 0); if (card.superAwakenings.length == prevSAwokens.length && card.superAwakenings.every((sak, idx)=>sak===prevSAwokens[idx]) ) diff --git a/style.css b/style.css index ad762b86..07404695 100644 --- a/style.css +++ b/style.css @@ -71,6 +71,9 @@ body{ pointer-events: none; opacity: 0.5; } +details>summary { + cursor: pointer; +} .help-link::before{ content: "ℹ️Help & Tips"; }