增加阴阳同时生效的地下城强化设定

multi.html

@@ -1043,8 +1043,9 @@ const teamsCount = 2;
 						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="124"></button><!--大光串--></li>
 						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="125"></button><!--大暗串--></li>
 						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="127" data-max-count="1"></button><!--三维--></li>
-						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="128" data-max-count="1"></button><!--养殖加护--></li>
-						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="129" data-max-count="1"></button><!--音质加护--></li>
+						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="128" data-max-count="1"></button><!--阳之加护--></li>
+						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="129" data-max-count="1"></button><!--阴之加护--></li>
+						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="130" data-max-count="1"></button><!--熟成--></li>
 					</ul>
 				</div>
 				<details class="sawoken-detail"><!--超觉醒列表-->
@@ -1177,8 +1178,9 @@ const teamsCount = 2;
 						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="124" id="search-awoken-124" /><label class="awoken-icon" data-awoken-icon="124" for="search-awoken-124"></label><!--大光串--></li>
 						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="125" id="search-awoken-125" /><label class="awoken-icon" data-awoken-icon="125" for="search-awoken-125"></label><!--大暗串--></li>
 						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="127" id="search-awoken-127" /><label class="awoken-icon" data-awoken-icon="127" for="search-awoken-127"></label><!--三维--></li>
-						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="128" id="search-awoken-128" /><label class="awoken-icon" data-awoken-icon="128" for="search-awoken-128"></label><!--养殖加护--></li>
-						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="129" id="search-awoken-129" /><label class="awoken-icon" data-awoken-icon="129" for="search-awoken-129"></label><!--音质加护--></li>
+						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="128" id="search-awoken-128" /><label class="awoken-icon" data-awoken-icon="128" for="search-awoken-128"></label><!--阳之加护--></li>
+						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="129" id="search-awoken-129" /><label class="awoken-icon" data-awoken-icon="129" for="search-awoken-129"></label><!--阴之加护--></li>
+						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="130" id="search-awoken-130" /><label class="awoken-icon" data-awoken-icon="130" for="search-awoken-130"></label><!--熟成--></li>
 					</ul>
 				</details>
 			</div>
@@ -1540,8 +1542,9 @@ const teamsCount = 2;
 			</ul>
 			<ul class="benefit-list"><!--阴阳加护-->
 				<li><input type="radio" class="benefit-check" name="dungeon-benefit" value="0" id="dungeon-benefit-0" /><label class="awoken-icon" data-awoken-icon="0" for="dungeon-benefit-0"></label></li><!--无-->
-				<li><input type="radio" class="benefit-check" name="dungeon-benefit" value="1" id="dungeon-benefit-1" /><label class="awoken-icon" data-awoken-icon="128" for="dungeon-benefit-1"></label></li><!--养殖-->
-				<li><input type="radio" class="benefit-check" name="dungeon-benefit" value="2" id="dungeon-benefit-2" /><label class="awoken-icon" data-awoken-icon="129" for="dungeon-benefit-2"></label></li><!--音质-->
+				<li><input type="radio" class="benefit-check" name="dungeon-benefit" value="1" id="dungeon-benefit-1" /><label class="awoken-icon" data-awoken-icon="128" for="dungeon-benefit-1"></label></li><!--阳-->
+				<li><input type="radio" class="benefit-check" name="dungeon-benefit" value="2" id="dungeon-benefit-2" /><label class="awoken-icon" data-awoken-icon="129" for="dungeon-benefit-2"></label></li><!--阴-->
+				<li><input type="radio" class="benefit-check" name="dungeon-benefit" value="3" id="dungeon-benefit-3" /><label class="awoken-icon yinyang" data-awoken-icon="128" for="dungeon-benefit-3"></label></li><!--阴阳-->
 			</ul>
 		</div>
 		<div class="dialog-control"><button class="dialog-clear brown-button"></button><button class="dialog-close brown-button"></button><button class="dialog-confirm brown-button"></button></div>

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) => {

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);
 		}
 

solo.html

@@ -807,8 +807,9 @@ const teamsCount = 1;
 						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="124"></button><!--大光串--></li>
 						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="125"></button><!--大暗串--></li>
 						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="127" data-max-count="1"></button><!--三维--></li>
-						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="128" data-max-count="1"></button><!--养殖加护--></li>
-						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="129" data-max-count="1"></button><!--音质加护--></li>
+						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="128" data-max-count="1"></button><!--阳之加护--></li>
+						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="129" data-max-count="1"></button><!--阴之加护--></li>
+						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="130" data-max-count="1"></button><!--熟成--></li>
 					</ul>
 				</div>
 				<details class="sawoken-detail"><!--超觉醒列表-->
@@ -941,8 +942,9 @@ const teamsCount = 1;
 						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="124" id="search-awoken-124" /><label class="awoken-icon" data-awoken-icon="124" for="search-awoken-124"></label><!--大光串--></li>
 						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="125" id="search-awoken-125" /><label class="awoken-icon" data-awoken-icon="125" for="search-awoken-125"></label><!--大暗串--></li>
 						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="127" id="search-awoken-127" /><label class="awoken-icon" data-awoken-icon="127" for="search-awoken-127"></label><!--三维--></li>
-						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="128" id="search-awoken-128" /><label class="awoken-icon" data-awoken-icon="128" for="search-awoken-128"></label><!--养殖加护--></li>
-						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="129" id="search-awoken-129" /><label class="awoken-icon" data-awoken-icon="129" for="search-awoken-129"></label><!--音质加护--></li>
+						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="128" id="search-awoken-128" /><label class="awoken-icon" data-awoken-icon="128" for="search-awoken-128"></label><!--阳之加护--></li>
+						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="129" id="search-awoken-129" /><label class="awoken-icon" data-awoken-icon="129" for="search-awoken-129"></label><!--阴之加护--></li>
+						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="130" id="search-awoken-130" /><label class="awoken-icon" data-awoken-icon="130" for="search-awoken-130"></label><!--熟成--></li>
 					</ul>
 				</details>
 			</div>
@@ -1304,8 +1306,9 @@ const teamsCount = 1;
 			</ul>
 			<ul class="benefit-list"><!--阴阳加护-->
 				<li><input type="radio" class="benefit-check" name="dungeon-benefit" value="0" id="dungeon-benefit-0" /><label class="awoken-icon" data-awoken-icon="0" for="dungeon-benefit-0"></label></li><!--无-->
-				<li><input type="radio" class="benefit-check" name="dungeon-benefit" value="1" id="dungeon-benefit-1" /><label class="awoken-icon" data-awoken-icon="128" for="dungeon-benefit-1"></label></li><!--养殖-->
-				<li><input type="radio" class="benefit-check" name="dungeon-benefit" value="2" id="dungeon-benefit-2" /><label class="awoken-icon" data-awoken-icon="129" for="dungeon-benefit-2"></label></li><!--音质-->
+				<li><input type="radio" class="benefit-check" name="dungeon-benefit" value="1" id="dungeon-benefit-1" /><label class="awoken-icon" data-awoken-icon="128" for="dungeon-benefit-1"></label></li><!--阳-->
+				<li><input type="radio" class="benefit-check" name="dungeon-benefit" value="2" id="dungeon-benefit-2" /><label class="awoken-icon" data-awoken-icon="129" for="dungeon-benefit-2"></label></li><!--阴-->
+				<li><input type="radio" class="benefit-check" name="dungeon-benefit" value="3" id="dungeon-benefit-3" /><label class="awoken-icon yinyang" data-awoken-icon="128" for="dungeon-benefit-3"></label></li><!--阴阳-->
 			</ul>
 		</div>
 		<div class="dialog-control"><button class="dialog-clear brown-button"></button><button class="dialog-close brown-button"></button><button class="dialog-confirm brown-button"></button></div>

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'],

triple.html

@@ -1797,8 +1797,9 @@ const teamsCount = 3;
 						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="124"></button><!--大光串--></li>
 						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="125"></button><!--大暗串--></li>
 						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="127" data-max-count="1"></button><!--三维--></li>
-						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="128" data-max-count="1"></button><!--养殖加护--></li>
-						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="129" data-max-count="1"></button><!--音质加护--></li>
+						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="128" data-max-count="1"></button><!--阳之加护--></li>
+						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="129" data-max-count="1"></button><!--阴之加护--></li>
+						<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="130" data-max-count="1"></button><!--熟成--></li>
 					</ul>
 				</div>
 				<details class="sawoken-detail"><!--超觉醒列表-->
@@ -1931,8 +1932,9 @@ const teamsCount = 3;
 						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="124" id="search-awoken-124" /><label class="awoken-icon" data-awoken-icon="124" for="search-awoken-124"></label><!--大光串--></li>
 						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="125" id="search-awoken-125" /><label class="awoken-icon" data-awoken-icon="125" for="search-awoken-125"></label><!--大暗串--></li>
 						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="127" id="search-awoken-127" /><label class="awoken-icon" data-awoken-icon="127" for="search-awoken-127"></label><!--三维--></li>
-						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="128" id="search-awoken-128" /><label class="awoken-icon" data-awoken-icon="128" for="search-awoken-128"></label><!--养殖加护--></li>
-						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="129" id="search-awoken-129" /><label class="awoken-icon" data-awoken-icon="129" for="search-awoken-129"></label><!--音质加护--></li>
+						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="128" id="search-awoken-128" /><label class="awoken-icon" data-awoken-icon="128" for="search-awoken-128"></label><!--阳之加护--></li>
+						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="129" id="search-awoken-129" /><label class="awoken-icon" data-awoken-icon="129" for="search-awoken-129"></label><!--阴之加护--></li>
+						<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="130" id="search-awoken-130" /><label class="awoken-icon" data-awoken-icon="130" for="search-awoken-130"></label><!--熟成--></li>
 					</ul>
 				</details>
 			</div>
@@ -2294,8 +2296,9 @@ const teamsCount = 3;
 			</ul>
 			<ul class="benefit-list"><!--阴阳加护-->
 				<li><input type="radio" class="benefit-check" name="dungeon-benefit" value="0" id="dungeon-benefit-0" /><label class="awoken-icon" data-awoken-icon="0" for="dungeon-benefit-0"></label></li><!--无-->
-				<li><input type="radio" class="benefit-check" name="dungeon-benefit" value="1" id="dungeon-benefit-1" /><label class="awoken-icon" data-awoken-icon="128" for="dungeon-benefit-1"></label></li><!--养殖-->
-				<li><input type="radio" class="benefit-check" name="dungeon-benefit" value="2" id="dungeon-benefit-2" /><label class="awoken-icon" data-awoken-icon="129" for="dungeon-benefit-2"></label></li><!--音质-->
+				<li><input type="radio" class="benefit-check" name="dungeon-benefit" value="1" id="dungeon-benefit-1" /><label class="awoken-icon" data-awoken-icon="128" for="dungeon-benefit-1"></label></li><!--阳-->
+				<li><input type="radio" class="benefit-check" name="dungeon-benefit" value="2" id="dungeon-benefit-2" /><label class="awoken-icon" data-awoken-icon="129" for="dungeon-benefit-2"></label></li><!--阴-->
+				<li><input type="radio" class="benefit-check" name="dungeon-benefit" value="3" id="dungeon-benefit-3" /><label class="awoken-icon yinyang" data-awoken-icon="128" for="dungeon-benefit-3"></label></li><!--阴阳-->
 			</ul>
 		</div>
 		<div class="dialog-control"><button class="dialog-clear brown-button"></button><button class="dialog-close brown-button"></button><button class="dialog-confirm brown-button"></button></div>