修订显示效果

multi.html

@@ -662,10 +662,10 @@ var formation = new Formation(teamsCount,5);
 				<button class="search-close"><!--关闭搜索--></button>
 				<button class="search-clear"><!--清空搜索条件--></button>
 				<div class="additional-div"><!--额外显示栏-->
-					<input type="checkbox" class="config-checkbox-ipt" name="add-show-awoken" id="add-show-awoken"><label class="config-checkbox-lbl add-show-awoken-label" for="add-show-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
 					<input type="checkbox" class="config-checkbox-ipt" name="add-show-CD" id="add-show-CD"><label class="config-checkbox-lbl add-show-CD-label" for="add-show-CD"><div class="config-checkbox-lbl-cicle"></div></label>
 					<input type="checkbox" class="config-checkbox-ipt" name="add-show-abilities" id="add-show-abilities"><label class="config-checkbox-lbl add-show-abilities-label" for="add-show-abilities"><div class="config-checkbox-lbl-cicle"></div></label>
 					<input type="checkbox" class="config-checkbox-ipt" name="add-show-abilities-with-awoken" id="add-show-abilities-with-awoken"><label class="config-checkbox-lbl add-show-abilities-with-awoken-label" for="add-show-abilities-with-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
+					<input type="checkbox" class="config-checkbox-ipt" name="add-show-awoken" id="add-show-awoken"><label class="config-checkbox-lbl add-show-awoken-label" for="add-show-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
 				</div>
 				<div class="sort-div"><!--排序栏-->
 					<select class="sort-list"></select>

script.js

@@ -935,18 +935,6 @@ function initialize() {
 			monstersID.onchange();
 			return false; //取消链接的默认操作
 		}
-		//产生一个觉醒列表
-		function creatAwokenList(awokens) {
-			const ul = document.createElement("ul");
-			ul.className = "awoken-ul";
-			awokens.forEach(ak=>{
-				const li = ul.appendChild(document.createElement("li"));
-				const icon = li.appendChild(document.createElement("icon"));
-				icon.className = "awoken-icon";
-				icon.setAttribute("data-awoken-icon",ak);
-			});
-			return ul;
-		}
 		const cli = document.createElement("li");
 		const cdom = cli.head = createCardA(id);
 		cli.appendChild(cdom);
@@ -976,40 +964,46 @@ function initialize() {
 				CD_MaxDom.textContent = CD_Max;
 			}
 		}
+		//产生一个能力值列表
+		function creatAbilitiesList(abilities) {
+			const abilitiesPreview = document.createElement("ul");
+			abilitiesPreview.className = "abilities-preview";
+			const hpDom = abilitiesPreview.appendChild(document.createElement("li"));
+			hpDom.className = "hp-preview";
+			hpDom.textContent = abilities.hp;
+			const atkDom = abilitiesPreview.appendChild(document.createElement("li"));
+			atkDom.className = "atk-preview";
+			atkDom.textContent = abilities.atk;
+			const rcvDom = abilitiesPreview.appendChild(document.createElement("li"));
+			rcvDom.className = "rcv-preview";
+			rcvDom.textContent = abilities.rcv;
+			return abilitiesPreview;
+		}
 		if (options.showAbilities || options.showAbilitiesWithAwoken)
 		{
 			const abilities_2status = calculateAbility_max(id, solo, teamsCount);
 			if (options.showAbilities && abilities_2status)
 			{
-				const abilitiesPreview = cli.appendChild(document.createElement("ul"));
-				abilitiesPreview.className = "abilities-preview";
-				const abilities = abilities_2status.noAwoken;
-				const hpDom = abilitiesPreview.appendChild(document.createElement("li"));
-				hpDom.className = "hp-preview";
-				hpDom.textContent = abilities.hp;
-				const atkDom = abilitiesPreview.appendChild(document.createElement("li"));
-				atkDom.className = "atk-preview";
-				atkDom.textContent = abilities.atk;
-				const rcvDom = abilitiesPreview.appendChild(document.createElement("li"));
-				rcvDom.className = "rcv-preview";
-				rcvDom.textContent = abilities.rcv;
+				const abilitiesPreview = cli.appendChild(creatAbilitiesList(abilities_2status.noAwoken));
 			} 
 			if (options.showAbilitiesWithAwoken && abilities_2status)
 			{
-				const abilitiesPreview = cli.appendChild(document.createElement("ul"));
-				abilitiesPreview.className = "abilities-with-awoken-preview";
-				const abilities = abilities_2status.withAwoken;
-				const hpDom = abilitiesPreview.appendChild(document.createElement("li"));
-				hpDom.className = "hp-preview";
-				hpDom.textContent = abilities.hp;
-				const atkDom = abilitiesPreview.appendChild(document.createElement("li"));
-				atkDom.className = "atk-preview";
-				atkDom.textContent = abilities.atk;
-				const rcvDom = abilitiesPreview.appendChild(document.createElement("li"));
-				rcvDom.className = "rcv-preview";
-				rcvDom.textContent = abilities.rcv;
+				const abilitiesPreview = cli.appendChild(creatAbilitiesList(abilities_2status.withAwoken));
+				abilitiesPreview.classList.add("abilities-with-awoken-preview");
 			}
 		}
+		//产生一个觉醒列表
+		function creatAwokenList(awokens) {
+			const ul = document.createElement("ul");
+			ul.className = "awoken-ul";
+			awokens.forEach(ak=>{
+				const li = ul.appendChild(document.createElement("li"));
+				const icon = li.appendChild(document.createElement("icon"));
+				icon.className = "awoken-icon";
+				icon.setAttribute("data-awoken-icon",ak);
+			});
+			return ul;
+		}
 		if (options.showAwoken)
 		{
 			const awokenPreview = cli.appendChild(document.createElement("div"));
@@ -1195,8 +1189,11 @@ function initialize() {
 	//对已经搜索到的Cards重新附加显示
 	function reShowSearch()
 	{
-		const oldArr = searchMonList.originalHeads.map(head=>head.card);
-		showSearch(oldArr);
+		if (Array.isArray(searchMonList.originalHeads))
+		{
+			const oldArr = searchMonList.originalHeads.map(head=>head.card);
+			showSearch(oldArr);
+		}
 	}
 	s_add_show_awoken.onchange = reShowSearch;
 	s_add_show_CD.onchange = reShowSearch;

solo.html

@@ -612,10 +612,10 @@ var formation = new Formation(teamsCount,6);
 				<button class="search-close"><!--关闭搜索--></button>
 				<button class="search-clear"><!--清空搜索条件--></button>
 				<div class="additional-div"><!--额外显示栏-->
-					<input type="checkbox" class="config-checkbox-ipt" name="add-show-awoken" id="add-show-awoken"><label class="config-checkbox-lbl add-show-awoken-label" for="add-show-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
 					<input type="checkbox" class="config-checkbox-ipt" name="add-show-CD" id="add-show-CD"><label class="config-checkbox-lbl add-show-CD-label" for="add-show-CD"><div class="config-checkbox-lbl-cicle"></div></label>
 					<input type="checkbox" class="config-checkbox-ipt" name="add-show-abilities" id="add-show-abilities"><label class="config-checkbox-lbl add-show-abilities-label" for="add-show-abilities"><div class="config-checkbox-lbl-cicle"></div></label>
 					<input type="checkbox" class="config-checkbox-ipt" name="add-show-abilities-with-awoken" id="add-show-abilities-with-awoken"><label class="config-checkbox-lbl add-show-abilities-with-awoken-label" for="add-show-abilities-with-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
+					<input type="checkbox" class="config-checkbox-ipt" name="add-show-awoken" id="add-show-awoken"><label class="config-checkbox-lbl add-show-awoken-label" for="add-show-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
 				</div>
 				<div class="sort-div"><!--排序栏-->
 					<select class="sort-list"></select>

style.css

@@ -883,19 +883,27 @@ ul{
 {
 	content: "-";
 }
-.abilities-preview>li,
-.abilities-with-awoken-preview>li
+.cd-preview,
+.add-show-CD-label
+{
+	color: lightblue;
+}
+.abilities-preview>li
 {
 	font-size: 14px;
 }
 .cd-preview::before,
-.abilities-preview>li::before,
-.abilities-with-awoken-preview>li::before
+.abilities-preview>li::before
 {
 	font-size: 10px;
 	display: inline-block;
 	width: 25px;
 }
+.add-show-abilities-with-awoken-label,
+.abilities-with-awoken-preview>li
+{
+	color: #dfd;
+}
 
 
 /*.setting-box .row-mon-id .open-search::before{

triple.html

@@ -1307,10 +1307,10 @@ var formation = new Formation(teamsCount,6);
 				<button class="search-close"><!--关闭搜索--></button>
 				<button class="search-clear"><!--清空搜索条件--></button>
 				<div class="additional-div"><!--额外显示栏-->
-					<input type="checkbox" class="config-checkbox-ipt" name="add-show-awoken" id="add-show-awoken"><label class="config-checkbox-lbl add-show-awoken-label" for="add-show-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
 					<input type="checkbox" class="config-checkbox-ipt" name="add-show-CD" id="add-show-CD"><label class="config-checkbox-lbl add-show-CD-label" for="add-show-CD"><div class="config-checkbox-lbl-cicle"></div></label>
 					<input type="checkbox" class="config-checkbox-ipt" name="add-show-abilities" id="add-show-abilities"><label class="config-checkbox-lbl add-show-abilities-label" for="add-show-abilities"><div class="config-checkbox-lbl-cicle"></div></label>
 					<input type="checkbox" class="config-checkbox-ipt" name="add-show-abilities-with-awoken" id="add-show-abilities-with-awoken"><label class="config-checkbox-lbl add-show-abilities-with-awoken-label" for="add-show-abilities-with-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
+					<input type="checkbox" class="config-checkbox-ipt" name="add-show-awoken" id="add-show-awoken"><label class="config-checkbox-lbl add-show-awoken-label" for="add-show-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
 				</div>
 				<div class="sort-div"><!--排序栏-->
 					<select class="sort-list"></select>