diff --git a/script.js b/script.js
index f68d17dc..b6f978d5 100644
--- a/script.js
+++ b/script.js
@@ -1360,11 +1360,11 @@ function initialize() {
 	//const s_rare = s_rareLi.map(li=>li.querySelector(".rare-check"));  //checkbox集合
 
 	const s_awokensDiv = searchBox.querySelector(".awoken-div");
-	const s_awokensUl = s_awokensDiv.querySelector(".awoken-ul");
+	const s_awokensUl = s_awokensDiv.querySelector(".all-awokens");
 	const s_awokensLi = Array.from(s_awokensUl.querySelectorAll(".awoken-count"));
 	const s_awokensIcons = s_awokensLi.map(li => li.querySelector(".awoken-icon"));
-	s_awokensUl.originalSorting = s_awokensIcons.map(icon => parseInt(icon.getAttribute("data-awoken-icon"), 10));
-	const s_awokensCounts = s_awokensLi.map(li => li.querySelector(".count"));
+	const s_awokensSubs = s_awokensLi.map(li => li.querySelector(".awoken-sub1"));
+	s_awokensUl.originalSorting = s_awokensIcons.map(icon => parseInt(icon.getAttribute("data-awoken-icon"), 10)); //储存觉醒列表的原始排序
 
 	const searchMonList = searchBox.querySelector(".search-mon-list"); //搜索结果列表
 	searchMonList.originalHeads = null; //用于存放原始搜索结果
@@ -1419,32 +1419,28 @@ function initialize() {
 	s_showOfficialAwokenSorting.checked = Boolean(parseInt(localStorage.getItem("PADDF-" + officialSortingClassName)));
 	s_showOfficialAwokenSorting.onchange();
 
-
 	function search_awokenAdd1() {
-		const countDom = this.parentNode.querySelector(".count");
-		let count = parseInt(countDom.value, 10);
+		let count = parseInt(this.value || 0, 10);
 		if (count < 9) {
 			count++;
-			countDom.value = count;
 			this.setAttribute("value", count);
-			//this.parentNode.classList.remove("zero");
 		}
 	}
 	function search_awokenClear() {
 		this.setAttribute("value", 0);
-		const countDom = this.parentNode.querySelector(".count");
-		countDom.value = 0;
-		//this.parentNode.classList.add("zero");
 	}
-	const longPressDuration = 1000; //1秒钟
+	const longPressDuration = 700; //700毫秒
 	function search_awokenLongPressStart(e) {
+		console.log(e);
 		let _this = this;
 		this.longPress = setTimeout(function(){
 			search_awokenClear.apply(_this);
 		}, longPressDuration);
 		this.startTime = new Date(); //仅仅给自己设一个开始时间
+		e.preventDefault();
 	}
 	function search_awokenLongPressEnd(e) {
+		console.log(e);
 		const endTime = new Date();
 		if ((endTime - this.startTime) < longPressDuration)
 		{
@@ -1453,39 +1449,36 @@ function initialize() {
 		clearTimeout(this.longPress);
 		this.startTime = null;
 	}
-	function search_awokenLongPressBreak(e) {
-		const endTime = new Date();
+	function search_awokenLongPressCancel(e) {
+		console.log(e);
 		clearTimeout(this.longPress);
 		this.startTime = null;
 	}
-	s_awokensIcons.forEach((b, idx) => { //每种觉醒增加1
-		//b.onclick = search_awokenAdd1;
-		b.onmousedown = search_awokenLongPressStart;
-		b.onmouseup = search_awokenLongPressEnd;
-		b.onmouseout = search_awokenLongPressBreak;
+	s_awokensIcons.forEach(b => {
+		//b.ontouchstart = search_awokenLongPressStart;
+		//b.ontouchend = search_awokenLongPressEnd;
+		//b.ontouchcancel = search_awokenLongPressCancel;
+		//b.onmousedown = search_awokenLongPressStart;
+		//b.onmouseup = search_awokenLongPressEnd;
+		//b.onmouseout = search_awokenLongPressCancel;
+		b.onclick = search_awokenAdd1; //每种觉醒增加1
 	});
 
 	function search_awokenSub1() {
-		let count = parseInt(this.value, 10);
+		const awokenIcon = this.previousElementSibling;
+		let count = parseInt(awokenIcon.value || 0, 10);
 		if (count > 0) {
 			count--;
-			this.value = count;
-			this.parentNode.parentNode.querySelector(".awoken-icon").setAttribute("value", count);
-			if (count === 0) {
-				//this.parentNode.parentNode.classList.add("zero");
-			}
+			awokenIcon.setAttribute("value", count);
 		}
 	}
-	s_awokensCounts.forEach((b, idx) => { //每种觉醒减少1
-		b.onclick = search_awokenSub1;
+	s_awokensSubs.forEach(b => {
+		b.onclick = search_awokenSub1; //每种觉醒减少1
 	});
 
 	const awokenClear = searchBox.querySelector(".awoken-div .awoken-clear");
 	const sawokenClear = searchBox.querySelector(".sawoken-div .sawoken-clear");
 	awokenClear.onclick = function() { //清空觉醒选项
-		s_awokensCounts.forEach(t => {
-			t.value = 0;
-		});
 		s_awokensIcons.forEach(t => {
 			t.setAttribute("value", 0);
 		});
@@ -1595,9 +1588,12 @@ function initialize() {
 			s_rareHighs.filter(returnCheckedInput).map(returnInputValue).map(Str2Int)[0],
 		];
 		const sawokensFilter = s_sawokens.filter(returnCheckedInput).map(returnInputValue).map(Str2Int);
-		const awokensFilter = s_awokensCounts.filter(btn => parseInt(btn.value, 10) > 0).map(btn => {
-			const awokenIndex = parseInt(btn.parentNode.parentNode.querySelector(".awoken-icon").getAttribute("data-awoken-icon"), 10);
-			return { id: awokenIndex, num: parseInt(btn.value, 10) };
+		const awokensFilter = s_awokensIcons.filter(btn => parseInt(btn.value, 10) > 0).map(btn => {
+			const awokenIndex = parseInt(btn.getAttribute("data-awoken-icon"), 10);
+			return {
+				id: awokenIndex,
+				num: parseInt(btn.value, 10)
+			};
 		});
 		const searchResult = searchCards(cards,
 			attr1, attr2,
@@ -1626,23 +1622,12 @@ function initialize() {
 		s_types.forEach(t => {
 			t.checked = false;
 		});
+		s_typeAndOr.onchange();
 		s_rareLows[0].checked = true;
 		s_rareHighs[9].checked = true;
-		s_typeAndOr.onchange();
 		
-		s_awokensCounts.forEach(t => {
-			t.value = 0;
-		});
-		s_awokensLi.forEach(t => {
-			t.classList.add("zero");
-		});
-		// 这些觉醒的选项干脆都不清除
-		//s_awokensEquivalent.checked = false;
-		//if (s_includeSuperAwoken.checked) s_includeSuperAwoken.click();
-
-		s_sawokens.forEach(t => {
-			t.checked = false;
-		});
+		awokenClear.click();
+		sawokenClear.click();;
 
 		searchMonList.originalHeads = null;
 		searchMonList.innerHTML = "";
diff --git a/solo.html b/solo.html
index 298e4bb8..ea198de2 100644
--- a/solo.html
+++ b/solo.html
@@ -485,84 +485,86 @@ var formation = new Formation(teamsCount,6);
 			</div>
 			<div class="awoken-div"><!--觉醒-->
 				<button class="awoken-clear"></button>
-				<ul class="awoken-ul">
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="43"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--7c-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="61"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--10c-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="58"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--下半血强化-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="48"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--破无效-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="27"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--U-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="21"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--SB-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="49"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--武器觉醒-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="52"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--大防封-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="11"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--防暗-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="12"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--防废-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="13"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--防毒-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="54"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--防云-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="55"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--防封条-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="45"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--心追-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="50"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--方块心追-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="19"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--手指-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="60"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--L解锁-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="1"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--HP+-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="2"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--攻击+-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="3"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--回复+-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="4"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--火盾-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="5"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--水盾-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="6"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--木盾-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="7"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--光盾-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="8"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--暗盾-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="9"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--自回-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="10"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--防封-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="14"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--火+-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="15"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--水+-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="16"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--木+-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="17"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--光+-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="18"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--暗+-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="29"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--心+-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="22"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--火横-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="23"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--水横-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="24"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--木横-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="25"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--光横-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="26"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--暗横-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="20"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--心解-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="28"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--SX-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="30"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--协力-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="31"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--龙杀-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="32"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--神杀-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="33"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--恶魔杀-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="34"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--机杀-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="35"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--平衡杀-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="36"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--攻击杀-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="37"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--体力杀-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="38"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--回复杀-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="39"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--进化杀-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="40"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--觉醒杀-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="41"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--强化杀-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="42"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--卖钱杀-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="44"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--5色破防-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="46"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--全体HP-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="47"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--全体回复-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="51"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--5色溜-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="53"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--大手指-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="56"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--大SB-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="57"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--满血强化-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="59"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--L盾-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="62"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--c珠-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="63"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--语音-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="64"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--奖励增加-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="65"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--HP--->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="66"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--攻击--->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="67"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--回复--->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="68"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--大防暗-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="69"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--大防废-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="70"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--大防毒-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="71"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--掉废-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="72"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--掉毒-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="73"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--2串火-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="74"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--2串水-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="75"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--2串木-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="76"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--2串光-->
-					<li class="awoken-count"><button class="awoken-icon" value="0" data-awoken-icon="77"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--2串暗-->
+				<ul class="awoken-ul candidate">
+				</ul>
+				<ul class="awoken-ul all-awokens">
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="43"></button><button class="awoken-sub1"></button><!--7c--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="61"></button><button class="awoken-sub1"></button><!--10c--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="58"></button><button class="awoken-sub1"></button><!--下半血强化--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="48"></button><button class="awoken-sub1"></button><!--破无效--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="27"></button><button class="awoken-sub1"></button><!--U--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="21"></button><button class="awoken-sub1"></button><!--SB--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="49"></button><button class="awoken-sub1"></button><!--武器觉醒--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="52"></button><button class="awoken-sub1"></button><!--大防封--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="11"></button><button class="awoken-sub1"></button><!--防暗--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="12"></button><button class="awoken-sub1"></button><!--防废--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="13"></button><button class="awoken-sub1"></button><!--防毒--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="54"></button><button class="awoken-sub1"></button><!--防云--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="55"></button><button class="awoken-sub1"></button><!--防封条--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="45"></button><button class="awoken-sub1"></button><!--心追--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="50"></button><button class="awoken-sub1"></button><!--方块心追--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="19"></button><button class="awoken-sub1"></button><!--手指--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="60"></button><button class="awoken-sub1"></button><!--L解锁--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="1"></button><button class="awoken-sub1"></button><!--HP+--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="2"></button><button class="awoken-sub1"></button><!--攻击+--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="3"></button><button class="awoken-sub1"></button><!--回复+--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="4"></button><button class="awoken-sub1"></button><!--火盾--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="5"></button><button class="awoken-sub1"></button><!--水盾--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="6"></button><button class="awoken-sub1"></button><!--木盾--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="7"></button><button class="awoken-sub1"></button><!--光盾--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="8"></button><button class="awoken-sub1"></button><!--暗盾--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="9"></button><button class="awoken-sub1"></button><!--自回--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="10"></button><button class="awoken-sub1"></button><!--防封--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="14"></button><button class="awoken-sub1"></button><!--火+--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="15"></button><button class="awoken-sub1"></button><!--水+--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="16"></button><button class="awoken-sub1"></button><!--木+--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="17"></button><button class="awoken-sub1"></button><!--光+--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="18"></button><button class="awoken-sub1"></button><!--暗+--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="29"></button><button class="awoken-sub1"></button><!--心+--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="22"></button><button class="awoken-sub1"></button><!--火横--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="23"></button><button class="awoken-sub1"></button><!--水横--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="24"></button><button class="awoken-sub1"></button><!--木横--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="25"></button><button class="awoken-sub1"></button><!--光横--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="26"></button><button class="awoken-sub1"></button><!--暗横--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="20"></button><button class="awoken-sub1"></button><!--心解--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="28"></button><button class="awoken-sub1"></button><!--SX--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="30"></button><button class="awoken-sub1"></button><!--协力--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="31"></button><button class="awoken-sub1"></button><!--龙杀--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="32"></button><button class="awoken-sub1"></button><!--神杀--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="33"></button><button class="awoken-sub1"></button><!--恶魔杀--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="34"></button><button class="awoken-sub1"></button><!--机杀--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="35"></button><button class="awoken-sub1"></button><!--平衡杀--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="36"></button><button class="awoken-sub1"></button><!--攻击杀--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="37"></button><button class="awoken-sub1"></button><!--体力杀--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="38"></button><button class="awoken-sub1"></button><!--回复杀--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="39"></button><button class="awoken-sub1"></button><!--进化杀--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="40"></button><button class="awoken-sub1"></button><!--觉醒杀--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="41"></button><button class="awoken-sub1"></button><!--强化杀--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="42"></button><button class="awoken-sub1"></button><!--卖钱杀--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="44"></button><button class="awoken-sub1"></button><!--5色破防--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="46"></button><button class="awoken-sub1"></button><!--全体HP--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="47"></button><button class="awoken-sub1"></button><!--全体回复--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="51"></button><button class="awoken-sub1"></button><!--5色溜--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="53"></button><button class="awoken-sub1"></button><!--大手指--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="56"></button><button class="awoken-sub1"></button><!--大SB--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="57"></button><button class="awoken-sub1"></button><!--满血强化--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="59"></button><button class="awoken-sub1"></button><!--L盾--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="62"></button><button class="awoken-sub1"></button><!--c珠--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="63"></button><button class="awoken-sub1"></button><!--语音--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="64"></button><button class="awoken-sub1"></button><!--奖励增加--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="65"></button><button class="awoken-sub1"></button><!--HP---></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="66"></button><button class="awoken-sub1"></button><!--攻击---></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="67"></button><button class="awoken-sub1"></button><!--回复---></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="68"></button><button class="awoken-sub1"></button><!--大防暗--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="69"></button><button class="awoken-sub1"></button><!--大防废--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="70"></button><button class="awoken-sub1"></button><!--大防毒--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="71"></button><button class="awoken-sub1"></button><!--掉废--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="72"></button><button class="awoken-sub1"></button><!--掉毒--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="73"></button><button class="awoken-sub1"></button><!--2串火--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="74"></button><button class="awoken-sub1"></button><!--2串水--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="75"></button><button class="awoken-sub1"></button><!--2串木--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="76"></button><button class="awoken-sub1"></button><!--2串光--></li>
+					<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="77"></button><button class="awoken-sub1"></button><!--2串暗--></li>
 				</ul>
 			</div>
 			<div class="sawoken-div"><!--超觉醒-->
diff --git a/style.css b/style.css
index 76ade163..ccb90b96 100644
--- a/style.css
+++ b/style.css
@@ -990,6 +990,8 @@ ul{
 	display: inline-block;
 	vertical-align: top;
 	font-size:16px;
+}
+.search-box .attr-list>li{
 	overflow: hidden;
 }
 .search-box>div>ul>li>label{
@@ -1194,38 +1196,6 @@ ul{
 .sawoken-div{
 	display: inline-block;
 }
-.awoken-div .awoken-icon{
-	position: relative;
-	opacity: var(--search-icon-unchecked);
-}
-.awoken-div .awoken-icon:not([value="0"]){
-	opacity: 1;
-}
-.awoken-div .awoken-icon~.count-symbol{
-	opacity: var(--search-icon-unchecked);
-}
-.awoken-div .awoken-icon:not([value="0"])~.count-symbol{
-	opacity: 1;
-}
-
-.awoken-div .awoken-icon::before{
-	display: none;
-}
-.awoken-div .awoken-icon:not([value="0"])::before{
-	display: inline-block;
-	content: attr(value);
-	position: absolute;
-	line-height: 18px;
-	font-size: 18px;
-	right: 0;
-	bottom: 0;
-	-webkit-text-stroke: 1px black;
-	text-stroke: 1px black;
-	text-shadow: black 1px 1px 1px;
-}
-.count-symbol{
-	display: none !important;
-}
 
 .search-box .awoken-div .awoken-clear::before,
 .search-box .sawoken-div .sawoken-clear::before
@@ -1239,7 +1209,7 @@ ul{
 }
 .awoken-div .awoken-ul.official-awoken-sorting
 {
-	width: 350px;
+	width: 490px;
 }
 .awoken-ul .awoken-count
 {
@@ -1258,14 +1228,13 @@ ul{
 	display: inline-block;
 	vertical-align: middle;
 }
-.awoken-ul .count::before,
-.search-box .awoken-div .count-symbol::before
+.awoken-ul .count::before
 {
 	content: "×";
 }
-.search-box .awoken-ul button,
-.search-box .awoken-ul input[type='button']
+.search-box .awoken-div .awoken-icon
 {
+	position: relative;
 	border: none;
 	background-color: unset;
 	font-family: var(--game-font-family);
@@ -1275,6 +1244,60 @@ ul{
 	padding: 0;
 	text-align: left;
 }
+
+.search-box .awoken-div .awoken-icon:not([value]),
+.search-box .awoken-div .awoken-icon[value="0"],
+.search-box .awoken-div .awoken-icon:not([value])~.awoken-sub1,
+.search-box .awoken-div .awoken-icon[value="0"]~.awoken-sub1
+{
+	opacity: var(--search-icon-unchecked);
+}
+.awoken-div .awoken-icon:not([value="0"])::before
+{
+	display: inline-block;
+	content: attr(value);
+	position: absolute;
+	line-height: 18px;
+	font-size: 18px;
+	right: 0;
+	bottom: 0;
+	-webkit-text-stroke: 1px black;
+	text-stroke: 1px black;
+	text-shadow: black 1px 1px 1px;
+}
+.awoken-div .awoken-sub1
+{
+	background-image: linear-gradient(to bottom,#C38E5F,#2F2008);
+	border: none;
+	border-radius: 5px;
+	padding: 2px;
+	cursor: pointer;
+	transition: transform 0.1s;
+	height: 32px;
+}
+.awoken-div .awoken-sub1::before
+{
+	line-height: unset;
+	display: inline-block;
+	box-sizing: border-box;
+	background-color: #956A42;
+	background-image: url(images/slate.svg);
+	background-size: 120px 120px;
+	border-radius: 2px;
+	vertical-align: middle;
+	color: white;
+	font-family: var(--game-font-family);
+	text-shadow: black 2px 2px 0;
+}
+.awoken-div .awoken-sub1::before
+{
+	content: "▼";
+}
+.awoken-div .awoken-sub1:active
+{
+	transform: scale(1.1);
+}
+
 .search-box .awoken-ul .awoken-count.zero{
 	opacity: var(--search-icon-unchecked);
 }