恶搞功能加入心属性，修改为可以取消恶搞功能

multi.html

@@ -866,6 +866,7 @@ const teamsCount = 2;
 						<li><input type="checkbox" name="attr-1" value="2" id="search-attr-1-2" /><label for="search-attr-1-2"><span class="attr" data-attr-icon="2"></span></label></li><!--木-->
 						<li><input type="checkbox" name="attr-1" value="3" id="search-attr-1-3" /><label for="search-attr-1-3"><span class="attr" data-attr-icon="3"></span></label></li><!--光-->
 						<li><input type="checkbox" name="attr-1" value="4" id="search-attr-1-4" /><label for="search-attr-1-4"><span class="attr" data-attr-icon="4"></span></label></li><!--暗-->
+						<li class="display-none"><input type="checkbox" name="attr-1" value="5" id="search-attr-1-5" /><label for="search-attr-1-5"><span class="attr" data-attr-icon="5"></span></label></li><!--心-->
 						<li><input type="checkbox" name="attr-1" value="6" id="search-attr-1-6" /><label for="search-attr-1-6"><span class="attr" data-attr-icon="6"></span></label></li><!--无主属性-->
 					</ul>
 					<ul class="attr-list horizontally-radio-list">
@@ -874,6 +875,7 @@ const teamsCount = 2;
 						<li><input type="checkbox" name="attr-2" value="2" id="search-attr-2-2" /><label for="search-attr-2-2"><span class="attr" data-attr-icon="2"></span></label></li><!--木-->
 						<li><input type="checkbox" name="attr-2" value="3" id="search-attr-2-3" /><label for="search-attr-2-3"><span class="attr" data-attr-icon="3"></span></label></li><!--光-->
 						<li><input type="checkbox" name="attr-2" value="4" id="search-attr-2-4" /><label for="search-attr-2-4"><span class="attr" data-attr-icon="4"></span></label></li><!--暗-->
+						<li class="display-none"><input type="checkbox" name="attr-2" value="5" id="search-attr-2-5" /><label for="search-attr-2-5"><span class="attr" data-attr-icon="5"></span></label></li><!--心-->
 						<li><input type="checkbox" name="attr-2" value="6" id="search-attr-2-6" /><label for="search-attr-2-6"><span class="attr" data-attr-icon="6"></span></label></li><!--无副属性-->
 					</ul>
 					<ul class="attr-list horizontally-radio-list">
@@ -882,6 +884,7 @@ const teamsCount = 2;
 						<li><input type="checkbox" name="attr-3" value="2" id="search-attr-3-2" /><label for="search-attr-3-2"><span class="attr" data-attr-icon="2"></span></label></li><!--木-->
 						<li><input type="checkbox" name="attr-3" value="3" id="search-attr-3-3" /><label for="search-attr-3-3"><span class="attr" data-attr-icon="3"></span></label></li><!--光-->
 						<li><input type="checkbox" name="attr-3" value="4" id="search-attr-3-4" /><label for="search-attr-3-4"><span class="attr" data-attr-icon="4"></span></label></li><!--暗-->
+						<li class="display-none"><input type="checkbox" name="attr-3" value="5" id="search-attr-3-5" /><label for="search-attr-3-5"><span class="attr" data-attr-icon="5"></span></label></li><!--心-->
 						<li><input type="checkbox" name="attr-3" value="6" id="search-attr-3-6" /><label for="search-attr-3-6"><span class="attr" data-attr-icon="6"></span></label></li><!--无副属性-->
 					</ul>
 					<ul class="attr-list horizontally-radio-list display-none">
@@ -890,6 +893,7 @@ const teamsCount = 2;
 						<li><input type="checkbox" name="attr-4" value="2" id="search-attr-4-2" /><label for="search-attr-4-2"><span class="attr" data-attr-icon="2"></span></label></li><!--木-->
 						<li><input type="checkbox" name="attr-4" value="3" id="search-attr-4-3" /><label for="search-attr-4-3"><span class="attr" data-attr-icon="3"></span></label></li><!--光-->
 						<li><input type="checkbox" name="attr-4" value="4" id="search-attr-4-4" /><label for="search-attr-4-4"><span class="attr" data-attr-icon="4"></span></label></li><!--暗-->
+						<li class="display-none"><input type="checkbox" name="attr-4" value="5" id="search-attr-4-5" /><label for="search-attr-4-5"><span class="attr" data-attr-icon="5"></span></label></li><!--心-->
 						<li><input type="checkbox" name="attr-4" value="6" id="search-attr-4-6" /><label for="search-attr-4-6"><span class="attr" data-attr-icon="6"></span></label></li><!--无副属性-->
 					</ul>
 				</div>

script.js

@@ -4496,11 +4496,22 @@ function initialize() {
 		btnCustomAvatarSave.classList.remove(className_displayNone);
 		const attrs4 = s_AttrForm.querySelector(".attr-selecter-list .attr-list.display-none");
 		if (attrs4) {
-			Cards.forEach(card=>card.attrs[3] = Math.randomInteger(0,4));
+
 			attrs4.classList.remove(className_displayNone);
+			[...s_AttrForm.querySelectorAll(".attr-selecter-list .attr-list")].forEach(list=>list.querySelector("li.display-none").classList.remove(className_displayNone));
 		}
 		editBox.changeMonId(monstersID.value);
-		alert("恶搞功能：所有角色全部随机设定了第四属性，请勿当真。你可以上传你的自定义图片以制作卡片头像。\n\nSpoof function: All Cards have a random 4th attribute, don't take it seriously. You can upload your custom image to make a card avatar.");
+		const spoof = confirm("你可以上传你的自定义图片以制作卡片头像。\nYou can upload your custom image to make a card avatar.\n\n是否启用恶搞功能？\n所有角色全部随机设定四种属性。\nEnable Spoof function ?\nAll Cards set 4 random attrs. ");
+		if (spoof) {
+			Cards.forEach(card=>{
+				if (!card.enabled) return;
+				for (let i = 0; i < 4; i++) {
+					const maxAttr = (i === 1 && card.attrs[0] === 6) ? 5 : 6; //如果第一属性是无属性，第二属性就不可以是无属性
+					card.attrs[i] = Math.randomInteger(0, maxAttr);
+					if (i >= 1 && card.attrs[i] === 6) break; //如果第2属性开始出现了无属性，就不需要再继续了
+				}
+			});
+		}
 	}
 	avatarSelect.addEventListener("click", set_4th_attrs, {once: true});
 

service-worker.js

@@ -30223,7 +30223,7 @@ const cachesMap = new Map([
 	],
 	[
 		"multi.html",
-		"7f22a32b21a75c67f3a87c00b6b10d29"
+		"102b91cfe7df45e3cfd55c19620214c9"
 	],
 	[
 		"script-custom_elements.js",
@@ -30231,7 +30231,7 @@ const cachesMap = new Map([
 	],
 	[
 		"script-json_data.js",
-		"37f21417e9c5c4be0685546aa6f280e0"
+		"e6ed32d5988d693a323f2b3447d3debd"
 	],
 	[
 		"script-skill-parser.js",
@@ -30243,19 +30243,19 @@ const cachesMap = new Map([
 	],
 	[
 		"script.js",
-		"c5a1df2c76abb1d5c99468c92c68e200"
+		"9ec1b0af5a159d8455fb60a9aea0fd31"
 	],
 	[
 		"solo.html",
-		"402560775ce1f80ec5b54375d916b53a"
+		"aa016cec6738e5ff72f9e0c8e1aaa507"
 	],
 	[
 		"style-monsterimages.css",
-		"94d948c4a0d72636d243e05a9bdacdfa"
+		"01af9fbac81c5c7fa2eac76354bc89a1"
 	],
 	[
 		"style.css",
-		"555858755143ef7c727faea0c611834e"
+		"03a65edfb1df79c90af209931a321469"
 	],
 	[
 		"temp.js",
@@ -30263,7 +30263,7 @@ const cachesMap = new Map([
 	],
 	[
 		"triple.html",
-		"ff23d534ebe824b2926dd5f1a46628e5"
+		"49c87f094ad7dc38a9d31ec61f1a653f"
 	],
 	[
 		"languages/en.css",
@@ -30295,7 +30295,7 @@ const cachesMap = new Map([
 	],
 	[
 		"languages/zh-hans.css",
-		"49081d87502177cf042475908a7e0141"
+		"2983021b08b7537b48fc4d1aeb556321"
 	],
 	[
 		"languages/zh-hans.js",
@@ -30303,7 +30303,7 @@ const cachesMap = new Map([
 	],
 	[
 		"languages/zh-hant.css",
-		"7ef1f9d1e3cce4af1eef45fed616a693"
+		"12e90b96170f015450c40e49b3921098"
 	],
 	[
 		"languages/zh-hant.js",
@@ -30342,11 +30342,11 @@ const cachesMap = new Map([
 		"6138155bddb716d91ba0df6b17a8e876"
 	],
 	[
-		"images/CARDFRAME2.PNG",
-		"c28d99259c0c7db5dcc2824286b93ba6"
+		"images/CARDFRAME2.png",
+		"13006618d031ec6f749b1cc1f429d42e"
 	],
 	[
-		"images/CARDFRAMEW.PNG",
+		"images/CARDFRAMEW.png",
 		"54d696bcecec70de291995be2b0acb90"
 	],
 	[

solo.html

@@ -604,6 +604,7 @@ const teamsCount = 1;
 						<li><input type="checkbox" name="attr-1" value="2" id="search-attr-1-2" /><label for="search-attr-1-2"><span class="attr" data-attr-icon="2"></span></label></li><!--木-->
 						<li><input type="checkbox" name="attr-1" value="3" id="search-attr-1-3" /><label for="search-attr-1-3"><span class="attr" data-attr-icon="3"></span></label></li><!--光-->
 						<li><input type="checkbox" name="attr-1" value="4" id="search-attr-1-4" /><label for="search-attr-1-4"><span class="attr" data-attr-icon="4"></span></label></li><!--暗-->
+						<li class="display-none"><input type="checkbox" name="attr-1" value="5" id="search-attr-1-5" /><label for="search-attr-1-5"><span class="attr" data-attr-icon="5"></span></label></li><!--心-->
 						<li><input type="checkbox" name="attr-1" value="6" id="search-attr-1-6" /><label for="search-attr-1-6"><span class="attr" data-attr-icon="6"></span></label></li><!--无主属性-->
 					</ul>
 					<ul class="attr-list horizontally-radio-list">
@@ -612,6 +613,7 @@ const teamsCount = 1;
 						<li><input type="checkbox" name="attr-2" value="2" id="search-attr-2-2" /><label for="search-attr-2-2"><span class="attr" data-attr-icon="2"></span></label></li><!--木-->
 						<li><input type="checkbox" name="attr-2" value="3" id="search-attr-2-3" /><label for="search-attr-2-3"><span class="attr" data-attr-icon="3"></span></label></li><!--光-->
 						<li><input type="checkbox" name="attr-2" value="4" id="search-attr-2-4" /><label for="search-attr-2-4"><span class="attr" data-attr-icon="4"></span></label></li><!--暗-->
+						<li class="display-none"><input type="checkbox" name="attr-2" value="5" id="search-attr-2-5" /><label for="search-attr-2-5"><span class="attr" data-attr-icon="5"></span></label></li><!--心-->
 						<li><input type="checkbox" name="attr-2" value="6" id="search-attr-2-6" /><label for="search-attr-2-6"><span class="attr" data-attr-icon="6"></span></label></li><!--无副属性-->
 					</ul>
 					<ul class="attr-list horizontally-radio-list">
@@ -620,6 +622,7 @@ const teamsCount = 1;
 						<li><input type="checkbox" name="attr-3" value="2" id="search-attr-3-2" /><label for="search-attr-3-2"><span class="attr" data-attr-icon="2"></span></label></li><!--木-->
 						<li><input type="checkbox" name="attr-3" value="3" id="search-attr-3-3" /><label for="search-attr-3-3"><span class="attr" data-attr-icon="3"></span></label></li><!--光-->
 						<li><input type="checkbox" name="attr-3" value="4" id="search-attr-3-4" /><label for="search-attr-3-4"><span class="attr" data-attr-icon="4"></span></label></li><!--暗-->
+						<li class="display-none"><input type="checkbox" name="attr-3" value="5" id="search-attr-3-5" /><label for="search-attr-3-5"><span class="attr" data-attr-icon="5"></span></label></li><!--心-->
 						<li><input type="checkbox" name="attr-3" value="6" id="search-attr-3-6" /><label for="search-attr-3-6"><span class="attr" data-attr-icon="6"></span></label></li><!--无副属性-->
 					</ul>
 					<ul class="attr-list horizontally-radio-list display-none">
@@ -628,6 +631,7 @@ const teamsCount = 1;
 						<li><input type="checkbox" name="attr-4" value="2" id="search-attr-4-2" /><label for="search-attr-4-2"><span class="attr" data-attr-icon="2"></span></label></li><!--木-->
 						<li><input type="checkbox" name="attr-4" value="3" id="search-attr-4-3" /><label for="search-attr-4-3"><span class="attr" data-attr-icon="3"></span></label></li><!--光-->
 						<li><input type="checkbox" name="attr-4" value="4" id="search-attr-4-4" /><label for="search-attr-4-4"><span class="attr" data-attr-icon="4"></span></label></li><!--暗-->
+						<li class="display-none"><input type="checkbox" name="attr-4" value="5" id="search-attr-4-5" /><label for="search-attr-4-5"><span class="attr" data-attr-icon="5"></span></label></li><!--心-->
 						<li><input type="checkbox" name="attr-4" value="6" id="search-attr-4-6" /><label for="search-attr-4-6"><span class="attr" data-attr-icon="6"></span></label></li><!--无副属性-->
 					</ul>
 				</div>
@@ -1216,7 +1220,7 @@ const teamsCount = 1;
 		</div>
 
 		<template id="template-card-a">
-			<a class="monster" target="_blank" data-cardid="" data-cards-pic-idx="" data-cards-pic-x="" data-cards-pic-y="" title=""><div class="attrs"><div class="attr"></div><div class="attr"></div><div class="attr"></div><div class="attr"></div><div class="attr"></div></div><div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div></div><div class="id"></div><div class="awoken-count-num"></div><div class="super-awoken display-none"><div class="awoken-icon"></div></div><div class="level"></div><div class="rarity"></div><div class="count-in-box"><span class="same-id"></span><span class="evo-tree"></span></div></a>
+			<a class="monster" target="_blank" data-cardid="" data-cards-pic-idx="" data-cards-pic-x="" data-cards-pic-y="" title=""><div class="attrs"><div class="attr"></div><div class="attr"></div><div class="attr"></div><div class="attr"></div></div><div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div></div><div class="id"></div><div class="awoken-count-num"></div><div class="super-awoken display-none"><div class="awoken-icon"></div></div><div class="level"></div><div class="rarity"></div><div class="count-in-box"><span class="same-id"></span><span class="evo-tree"></span></div></a>
 		</template>
 	</div>
 	<svg id="interchange-line" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.2" height="100%" width="100%" style="display:none;">

style-monsterimages.css

@@ -30,8 +30,11 @@
 .monster .attrs .attr[data-attr='4'] {
 	background-position-x: calc(-102px * 4); /*暗*/
 }
+.monster .attrs .attr[data-attr='5'] {
+	background-position-x: calc(-102px * 5); /*心*/
+}
 .monster .attrs .attr:nth-of-type(1)[data-attr='6'] { /*无主属性*/
-	background-image: url(images/CARDFRAMEW.PNG);
+	background-image: url(images/CARDFRAMEW.png);
 	background-position: 0 0;
 }
 .monster .attrs .attr:nth-of-type(1)[data-attr='any'] {

style.css

@@ -510,7 +510,7 @@ ul{
 	width: 100%;
 	height: 100%;
 	background-repeat: no-repeat;
-	background-image: url(images/CARDFRAME2.PNG);
+	background-image: url(images/CARDFRAME2.png);
 	background-position: 100px 100px; /*默认都不显示*/
 }
 /*改变属性的，生成一个淡绿色圈*/
@@ -1776,7 +1776,7 @@ label[for="search-string"]::before {
 #search-attr {
 	display: grid;
 	grid-auto-rows: min-content;
-	grid-template-columns: 100px 340px 30px auto;
+	grid-template-columns: 100px min-content 30px auto;
 	grid-gap: 3px;
 }
 #search-attr .options {

triple.html

@@ -1548,6 +1548,7 @@ const teamsCount = 3;
 						<li><input type="checkbox" name="attr-1" value="2" id="search-attr-1-2" /><label for="search-attr-1-2"><span class="attr" data-attr-icon="2"></span></label></li><!--木-->
 						<li><input type="checkbox" name="attr-1" value="3" id="search-attr-1-3" /><label for="search-attr-1-3"><span class="attr" data-attr-icon="3"></span></label></li><!--光-->
 						<li><input type="checkbox" name="attr-1" value="4" id="search-attr-1-4" /><label for="search-attr-1-4"><span class="attr" data-attr-icon="4"></span></label></li><!--暗-->
+						<li class="display-none"><input type="checkbox" name="attr-1" value="5" id="search-attr-1-5" /><label for="search-attr-1-5"><span class="attr" data-attr-icon="5"></span></label></li><!--心-->
 						<li><input type="checkbox" name="attr-1" value="6" id="search-attr-1-6" /><label for="search-attr-1-6"><span class="attr" data-attr-icon="6"></span></label></li><!--无主属性-->
 					</ul>
 					<ul class="attr-list horizontally-radio-list">
@@ -1556,6 +1557,7 @@ const teamsCount = 3;
 						<li><input type="checkbox" name="attr-2" value="2" id="search-attr-2-2" /><label for="search-attr-2-2"><span class="attr" data-attr-icon="2"></span></label></li><!--木-->
 						<li><input type="checkbox" name="attr-2" value="3" id="search-attr-2-3" /><label for="search-attr-2-3"><span class="attr" data-attr-icon="3"></span></label></li><!--光-->
 						<li><input type="checkbox" name="attr-2" value="4" id="search-attr-2-4" /><label for="search-attr-2-4"><span class="attr" data-attr-icon="4"></span></label></li><!--暗-->
+						<li class="display-none"><input type="checkbox" name="attr-2" value="5" id="search-attr-2-5" /><label for="search-attr-2-5"><span class="attr" data-attr-icon="5"></span></label></li><!--心-->
 						<li><input type="checkbox" name="attr-2" value="6" id="search-attr-2-6" /><label for="search-attr-2-6"><span class="attr" data-attr-icon="6"></span></label></li><!--无副属性-->
 					</ul>
 					<ul class="attr-list horizontally-radio-list">
@@ -1564,6 +1566,7 @@ const teamsCount = 3;
 						<li><input type="checkbox" name="attr-3" value="2" id="search-attr-3-2" /><label for="search-attr-3-2"><span class="attr" data-attr-icon="2"></span></label></li><!--木-->
 						<li><input type="checkbox" name="attr-3" value="3" id="search-attr-3-3" /><label for="search-attr-3-3"><span class="attr" data-attr-icon="3"></span></label></li><!--光-->
 						<li><input type="checkbox" name="attr-3" value="4" id="search-attr-3-4" /><label for="search-attr-3-4"><span class="attr" data-attr-icon="4"></span></label></li><!--暗-->
+						<li class="display-none"><input type="checkbox" name="attr-3" value="5" id="search-attr-3-5" /><label for="search-attr-3-5"><span class="attr" data-attr-icon="5"></span></label></li><!--心-->
 						<li><input type="checkbox" name="attr-3" value="6" id="search-attr-3-6" /><label for="search-attr-3-6"><span class="attr" data-attr-icon="6"></span></label></li><!--无副属性-->
 					</ul>
 					<ul class="attr-list horizontally-radio-list display-none">
@@ -1572,6 +1575,7 @@ const teamsCount = 3;
 						<li><input type="checkbox" name="attr-4" value="2" id="search-attr-4-2" /><label for="search-attr-4-2"><span class="attr" data-attr-icon="2"></span></label></li><!--木-->
 						<li><input type="checkbox" name="attr-4" value="3" id="search-attr-4-3" /><label for="search-attr-4-3"><span class="attr" data-attr-icon="3"></span></label></li><!--光-->
 						<li><input type="checkbox" name="attr-4" value="4" id="search-attr-4-4" /><label for="search-attr-4-4"><span class="attr" data-attr-icon="4"></span></label></li><!--暗-->
+						<li class="display-none"><input type="checkbox" name="attr-4" value="5" id="search-attr-4-5" /><label for="search-attr-4-5"><span class="attr" data-attr-icon="5"></span></label></li><!--心-->
 						<li><input type="checkbox" name="attr-4" value="6" id="search-attr-4-6" /><label for="search-attr-4-6"><span class="attr" data-attr-icon="6"></span></label></li><!--无副属性-->
 					</ul>
 				</div>