diff --git a/images/awoken.png b/images/awoken.png index 97bfbe7b..64b3d4b5 100644 Binary files a/images/awoken.png and b/images/awoken.png differ diff --git a/images/project file/awoken.fw.png b/images/project file/awoken.fw.png index e623e496..6348cbe2 100644 Binary files a/images/project file/awoken.fw.png and b/images/project file/awoken.fw.png differ diff --git a/script.js b/script.js index 9e948aca..614e0981 100644 --- a/script.js +++ b/script.js @@ -4669,6 +4669,14 @@ function initialize() { { const sakUl = awokenPreview.appendChild(creatAwokenList(card.superAwakenings)); //添加超觉醒 sakUl.classList.add("awoken-preview-superAwakenings"); + if (card.syncAwakening) { + const li = sakUl.insertAdjacentElement("afterbegin",document.createElement("li")); + const icon = li.appendChild(document.createElement("icon")); + icon.className = "awoken-icon sync-awakening"; + icon.setAttribute("data-awoken-icon", 0); + + } + sakUl.classList.toggle("sync-awakening", Boolean(card.syncAwakening)); } } @@ -5652,6 +5660,8 @@ function initialize() { }; const abilitys = calculateAbility(tempMon, null, solo, teamsCount); + + mSAwokenIcon.classList.toggle("super-awoken-locked", level <= 99 || plus.some(p=>p<99)); monEditLatentUl.classList.toggle("level-super-break", level > 110);; //切换潜觉为120级 monEditHpValue.textContent = abilitys ? abilitys[0][0].toLocaleString() : 0; @@ -6351,6 +6361,8 @@ function editBoxChangeMonId(id) { //超觉醒 const mSAwokenIcon = monEditOuterAwokensRow.querySelector("#current-super-awoken-icon"); + mSAwokenIcon.classList.toggle("sync-awakening", Boolean(card.syncAwakening)); + const monEditSAwokensRow = monEditOuterAwokensRow.querySelector(".row-mon-super-awoken"); const monEditSAwokensUl = monEditSAwokensRow.querySelector(".awoken-ul"); //获得之前的所有超觉醒 @@ -6358,24 +6370,26 @@ function editBoxChangeMonId(id) { function setSAwoken() { const sawoken = parseInt(this.getAttribute("data-awoken-icon"), 10) || 0; + + if (mSAwokenIcon.classList.contains("super-awoken-locked") && !mSAwokenIcon.classList.contains("sync-awakening")) return; mSAwokenIcon.setAttribute("data-awoken-icon", sawoken); - const level = settingBox.querySelector(".row-mon-level .m-level"); - const plusArr = [...settingBox.querySelectorAll(".row-mon-plus input[type='number']")]; - if (sawoken > 0 && sawoken !== card.syncAwakening) { - //自动100级 - if (parseInt(level.value, 10)<100) - { - console.debug("点亮超觉醒,自动设定100级"); - level.value = 100; - } - //自动打上297 - if (plusArr.some(ipt=>parseInt(ipt.value, 10)<99)) - { - console.debug("点亮超觉醒,自动设定297"); - plusArr.forEach(ipt=>ipt.value=99); - } - } + // const level = settingBox.querySelector(".row-mon-level .m-level"); + // const plusArr = [...settingBox.querySelectorAll(".row-mon-plus input[type='number']")]; + // if (sawoken > 0 && sawoken !== card.syncAwakening) { + // //自动100级 + // if (parseInt(level.value, 10)<100) + // { + // console.debug("点亮超觉醒,自动设定100级"); + // level.value = 100; + // } + // //自动打上297 + // if (plusArr.some(ipt=>parseInt(ipt.value, 10)<99)) + // { + // console.debug("点亮超觉醒,自动设定297"); + // plusArr.forEach(ipt=>ipt.value=99); + // } + // } editBox.reCalculateAbility(); } //怪物没有超觉醒时隐藏超觉醒 diff --git a/service-worker.js b/service-worker.js index f7be265d..a002808c 100644 --- a/service-worker.js +++ b/service-worker.js @@ -27603,7 +27603,7 @@ const cachesMap = new Map([ ], [ "script.js", - "d48fe06d0abde6cc324c31ea5feb2b46" + "6bc01d0d3dd1a16a2652bd17bc04532f" ], [ "solo.html", @@ -27611,11 +27611,11 @@ const cachesMap = new Map([ ], [ "style-monsterimages.css", - "bcfc033040f4cbe3a2cf3cd4c1389a3c" + "ba8540c1326db9e1ba3f0cb4894a7628" ], [ "style.css", - "839c434cacaed4ba4866e59c617c913b" + "422f4ee07beebce7698f9ea55978721a" ], [ "temp.js", @@ -27683,7 +27683,7 @@ const cachesMap = new Map([ ], [ "images/awoken.png", - "3caf45cacc010bd9f8bfe04e4f3ee2ea" + "16fda1df8fa5518d7a90ff8d486eb62c" ], [ "images/badge-bg.png", diff --git a/style-monsterimages.css b/style-monsterimages.css index 0c013721..597e25fa 100644 --- a/style-monsterimages.css +++ b/style-monsterimages.css @@ -681,6 +681,12 @@ .awoken-icon[data-awoken-icon='0']{/*问号*/ background-position-y:calc(-32px * 0); } +.awoken-icon.super-awoken-locked[data-awoken-icon='0']{/*未满足超觉醒条件*/ + background-position-x:calc(-32px * 1); +} +.awoken-icon.sync-awakening[data-awoken-icon='0']{/*同步觉醒未启用*/ + background-position-x:calc(-32px * 2); +} .awoken-icon[data-awoken-icon='1']{/*HP+*/ background-position-y:calc(-32px * 1); } diff --git a/style.css b/style.css index ad1bdbd8..ad4122b2 100644 --- a/style.css +++ b/style.css @@ -1608,9 +1608,10 @@ label[for="search-string"]::before { margin-top:3px; background-color: #432; } -.awoken-preview .awoken-preview-superAwakenings .awoken-icon{ +.awoken-preview .awoken-preview-superAwakenings .awoken-icon:not(.sync-awakening){ opacity: 0.6; } + .awoken-preview .awoken-ul>li, .custom-addition .awoken-ul>li {