From 13ae082984a8fbff61a45f3c3765320a1deedc20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Mon, 19 Feb 2024 13:37:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=98=B4=E9=98=B3=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E7=94=9F=E6=95=88=E7=9A=84=E5=9C=B0=E4=B8=8B=E5=9F=8E?= =?UTF-8?q?=E5=BC=BA=E5=8C=96=E8=AE=BE=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- multi.html | 15 +++++++++------ script-universal_function.js | 11 +++++++---- script.js | 8 ++++---- solo.html | 15 +++++++++------ style-monsterimages.css | 6 ++++++ triple.html | 15 +++++++++------ 6 files changed, 44 insertions(+), 26 deletions(-) diff --git a/multi.html b/multi.html index 761109a9..a253424a 100644 --- a/multi.html +++ b/multi.html @@ -1043,8 +1043,9 @@ const teamsCount = 2;
    • -
    • -
    • +
    • +
    • +
    • @@ -1177,8 +1178,9 @@ const teamsCount = 2;
    • -
    • -
    • +
    • +
    • +
    • @@ -1540,8 +1542,9 @@ const teamsCount = 2;
    diff --git a/script-universal_function.js b/script-universal_function.js index d43c7ee4..44c1bb93 100644 --- a/script-universal_function.js +++ b/script-universal_function.js @@ -745,10 +745,13 @@ function calculateAbility(member, assist = null, solo = true, teamsCount = 1) { //地下城阴阳加护强化 if (dge.benefit) { //当存在加护 - const benefitAwoken = dge.benefit == 1 ? 128 : 129; //得到加护觉醒编号 - latterAwokenScale[0].push({ index: benefitAwoken, scale: 1.2 }); //HP - latterAwokenScale[1].push({ index: benefitAwoken, scale: 5 }); //ATK - latterAwokenScale[2].push({ index: benefitAwoken, scale: 1.2 }); //RCV + const benefitAwokens = [128 , 129]; //0b1是阳，0b10是阴，可以两者都强化 + flags(dge.benefit).forEach(idx=>{ + const benefitAwoken = benefitAwokens[idx]; //得到加护觉醒编号 + latterAwokenScale[0].push({ index: benefitAwoken, scale: 1.2 }); //HP + latterAwokenScale[1].push({ index: benefitAwoken, scale: 5 }); //ATK + latterAwokenScale[2].push({ index: benefitAwoken, scale: 1.2 }); //RCV + }); } const abilitys = memberCurves.map((ab, idx) => { diff --git a/script.js b/script.js index d08d0289..a4ba1264 100644 --- a/script.js +++ b/script.js @@ -3221,12 +3221,11 @@ function initialize() { const gachaIdIpt = dialogContent.querySelector("#dungeon-gacha-id"); const benefitDoms = Array.from(dialogContent.querySelectorAll(".benefit-list .benefit-check")); const benefit0 = benefitDoms.find(dom=>parseInt(dom.value, 10) == 0); - const benefitNot0 = benefitDoms.filter(dom=>dom != benefit0); + /*const benefitNot0 = benefitDoms.filter(dom=>dom != benefit0); const notChecked = function(e){ - console.log(this.checked,e); } - benefitNot0.forEach(dom=>dom.onclick=notChecked); + benefitNot0.forEach(dom=>dom.onclick=notChecked);*/ dungeonEnchanceDialog.initialing = function(formation){ const dge = formation.dungeonEnchance; @@ -5435,10 +5434,11 @@ function refreshAll(formationData) { dungeonEnchanceDom.appendChild(renderSkill(skill)); if (dge?.benefit) { //添加阴阳 - const benefitAwoken = dge.benefit == 1 ? 128 : 129; + const benefitAwoken = (dge.benefit & 0b1) ? 128 : 129; const icon = document.createElement("icon"); icon.className ="awoken-icon"; icon.setAttribute("data-awoken-icon", benefitAwoken); + if (dge.benefit & 0b10) icon.classList.add("yinyang") dungeonEnchanceDom.appendChild(icon); } diff --git a/solo.html b/solo.html index 452acad9..0e674466 100644 --- a/solo.html +++ b/solo.html @@ -807,8 +807,9 @@ const teamsCount = 1;
    • -
    • -
    • +
    • +
    • +
    • @@ -941,8 +942,9 @@ const teamsCount = 1;
    • -
    • -
    • +
    • +
    • +
    • @@ -1304,8 +1306,9 @@ const teamsCount = 1;
    diff --git a/style-monsterimages.css b/style-monsterimages.css index d8c70a25..db3e6ef1 100644 --- a/style-monsterimages.css +++ b/style-monsterimages.css @@ -1068,9 +1068,15 @@ .awoken-icon[data-awoken-icon='128']{/*阳之加护*/ background-position-y:calc(-32px * 128); } +.awoken-icon[data-awoken-icon='128'].yinyang{/*同时阴阳*/ + background-position-x: -32px; +} .awoken-icon[data-awoken-icon='129']{/*阴之加护*/ background-position-y:calc(-32px * 129); } +.awoken-icon[data-awoken-icon='130']{/*熟成*/ + background-position-y:calc(-32px * 130); +} :lang(zh) .awoken-icon:where( [data-awoken-icon='46'], [data-awoken-icon='47'], diff --git a/triple.html b/triple.html index 21b58835..8f9a1d14 100644 --- a/triple.html +++ b/triple.html @@ -1797,8 +1797,9 @@ const teamsCount = 3;
    • -
    • -
    • +
    • +
    • +
    • @@ -1931,8 +1932,9 @@ const teamsCount = 3;
    • -
    • -
    • +
    • +
    • +
    • @@ -2294,8 +2296,9 @@ const teamsCount = 3;