diff --git a/languages/en.css b/languages/en.css index 539c8602..681b93a9 100644 --- a/languages/en.css +++ b/languages/en.css @@ -255,6 +255,9 @@ label[for="show-member-skill-cd"]::after{ label[for="show-member-ability"]::after{ content:"โš”๏ธMember's Ability"; } +label[for="show-member-types"]::after{ + content:"Member's Types"; +} label[for="show-member-awoken"]::after{ content:"๐Ÿ‘๏ธMember's Awoken"; } diff --git a/languages/ja.css b/languages/ja.css index 6c733265..246e585c 100644 --- a/languages/ja.css +++ b/languages/ja.css @@ -252,6 +252,9 @@ label[for="show-member-skill-cd"]::after{ label[for="show-member-ability"]::after{ content:"โš”๏ธใƒกใƒณใƒใƒผใฎ่ƒฝๅŠ›"; } +label[for="show-member-types"]::after{ + content:"ใƒกใƒณใƒใƒผใฎใ‚ฟใ‚คใƒ—"; +} label[for="show-member-awoken"]::after{ content:"๐Ÿ‘๏ธใƒกใƒณใƒใƒผใฎ่ฆš้†’"; } diff --git a/languages/ko.css b/languages/ko.css index 04f8a139..210d2925 100644 --- a/languages/ko.css +++ b/languages/ko.css @@ -247,8 +247,11 @@ label[for="show-member-skill-cd"]::after{ label[for="show-member-ability"]::after{ content:"โš”๏ธํšŒ์›์˜ ๋Šฅ๋ ฅ"; } +label[for="show-member-types"]::after{ + content:"๋ฉค๋ฒ„์˜ ํƒ€์ž…"; +} label[for="show-member-awoken"]::after{ - content:"๐Ÿ‘๏ธํšŒ์›์ด ๊นจ์–ด๋‚ฌ๋‹ค"; + content:"๐Ÿ‘๏ธ๋ฉค๋ฒ„์˜ ์œ ํ˜•"; } label[for="show-team-total-info"]::after{ content:"ํŒ€์˜ HP ์ •๋ณด"; diff --git a/languages/zh-TW.css b/languages/zh-TW.css index 81b31e29..856f6525 100644 --- a/languages/zh-TW.css +++ b/languages/zh-TW.css @@ -254,6 +254,9 @@ label[for="show-member-skill-cd"]::after{ label[for="show-member-ability"]::after{ content:"โš”๏ธ้šŠๅ“ก่ƒฝๅŠ›ๅ€ผ"; } +label[for="show-member-types"]::after{ + content:"้šŠๅ“ก้กžๅž‹"; +} label[for="show-member-awoken"]::after{ content:"๐Ÿ‘๏ธ้šŠๅ“ก่ฆบ้†’"; } diff --git a/languages/zh.css b/languages/zh.css index f37275cf..76997708 100644 --- a/languages/zh.css +++ b/languages/zh.css @@ -253,6 +253,9 @@ label[for="show-member-skill-cd"]::after{ label[for="show-member-ability"]::after{ content:"โš”๏ธ้˜Ÿๅ‘˜่ƒฝๅŠ›ๅ€ผ"; } +label[for="show-member-types"]::after{ + content:"้˜Ÿๅ‘˜็ฑปๅž‹"; +} label[for="show-member-awoken"]::after{ content:"๐Ÿ‘๏ธ้˜Ÿๅ‘˜่ง‰้†’"; } diff --git a/multi.html b/multi.html index 2f483ddc..7aad0c82 100644 --- a/multi.html +++ b/multi.html @@ -74,11 +74,13 @@ const teamsCount = 2; + +
diff --git a/script-skill-parser.js b/script-skill-parser.js index 4b63a6bf..889b83d7 100644 --- a/script-skill-parser.js +++ b/script-skill-parser.js @@ -1720,29 +1720,6 @@ const skillObjectParsers = { }, }; - -function renderSkillTitle(skillId, { showTurns } = {}) { - const skill = Skills[skillId]; - 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; - 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; -} - function renderSkillEntry(skills) { //ๆŒ‰ไฝCtrl็‚นๅ‡ปๆŠ€่ƒฝๅœจๆŽงๅˆถๅฐ่พ“ๅ‡บๆŠ€่ƒฝ็š„ๅฏน่ฑก @@ -1888,6 +1865,32 @@ function createSkillIcon(iconType, className){ function renderSkill(skill, option = {}) { + function renderSkillTitle(skillId, { showTurns } = {}) { + const skill = Skills[skillId]; + 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; + 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; + } + } + const originalSkill = document.createElement("div"); + originalSkill.className = "skill-datail-original"; + originalSkill.append(parseSkillDescription(skill)); + + return [div, originalSkill].nodeJoin(); + } + const frg = document.createDocumentFragment(); if (typeof localTranslating == "undefined") return frg; const tsp = localTranslating.skill_parse; diff --git a/script.js b/script.js index d2a9a9e1..83813154 100644 --- a/script.js +++ b/script.js @@ -4468,7 +4468,7 @@ function initialize() { //ๅˆๅนถๆŠ€่ƒฝๅผ€ๅ…ณ const mergeSill = document.getElementById("merge-skill"); - mergeSill.checked = localStorage_getBoolean(cfgPrefix + mergeSill.id); + mergeSill.checked = localStorage_getBoolean(cfgPrefix + mergeSill.id, true); mergeSill.onchange = function(event){ if (event) localStorage.setItem(cfgPrefix + this.id, Number(this.checked)); merge_skill = this.checked; diff --git a/solo.html b/solo.html index 84fed418..b5e2ee12 100644 --- a/solo.html +++ b/solo.html @@ -56,6 +56,7 @@ const teamsCount = 1; + diff --git a/style.css b/style.css index a443cc85..15fc4ebd 100644 --- a/style.css +++ b/style.css @@ -722,7 +722,8 @@ body:not(.show-card-id) .monster .id, /*ๅก็‰‡id*/ body:not(.show-card-rarity) .monster .rarity, /*ๅก็‰‡็จ€ๆœ‰ๅบฆ*/ body:not(.show-member-skill-cd) .monster .skill-cd.max-skill, /*้˜Ÿๅ‘˜CD*/ body:not(.show-member-ability) .team-ability, /*้˜Ÿๅ‘˜ไธ‰็ปด*/ -body:not(.show-member-awoken) :where(.team-assist-awoken , .team-member-awoken, .team-member-types), /*ๆญฆๅ™จ่ง‰้†’ใ€้˜Ÿๅ‘˜่ง‰้†’ใ€้˜Ÿๅ‘˜็ฑปๅž‹*/ +body:not(.show-member-types) .team-member-types, /*ๆญฆๅ™จ่ง‰้†’ใ€้˜Ÿๅ‘˜่ง‰้†’ใ€้˜Ÿๅ‘˜็ฑปๅž‹*/ +body:not(.show-member-awoken) :where(.team-assist-awoken , .team-member-awoken), /*ๆญฆๅ™จ่ง‰้†’ใ€้˜Ÿๅ‘˜่ง‰้†’ใ€้˜Ÿๅ‘˜็ฑปๅž‹*/ body:not(.show-team-awoken-count) .team-awoken, /*้˜Ÿไผ่ง‰้†’็ปŸ่ฎก*/ body:not(.show-team-attrtype-count) .tIf-addition-info, /*็จ€ๆœ‰ๅบฆใ€ๅฑžๆ€งไธŽ็ฑปๅž‹่ฎกๆ•ฐ*/ body:not(.show-team-awoken-effect) .team-awoken-effect, /*้˜Ÿไผ่ง‰้†’ๆ•ˆๆžœ็ปŸ่ฎก*/ @@ -2737,6 +2738,8 @@ body:not(.solo) .awoken-icon[data-awoken-icon="64"]::after .skill-datail-original { border-bottom: #9C743E solid 2px; + font-family: var(--game-font-family); + font-weight: normal; } .skill-datail-parsed .detail-search::before{ content: "๐Ÿ”"; diff --git a/triple.html b/triple.html index 5816acf6..097b2e6a 100644 --- a/triple.html +++ b/triple.html @@ -67,11 +67,13 @@ const teamsCount = 3; + +