解决新觉醒的统计问题

index.html

@@ -355,13 +355,13 @@ var formation = new Formation(2,5);
 		<div class="awoken-total-box">
 			<!--怪物觉醒-->
 			<ul class="awoken-ul">
-				<li class="awoken-count a-c-21 display-none"><span class="awoken-icon awoken-21"></span><span class="count"></span></li><!--SB-->
-				<li class="awoken-count a-c-28 display-none"><span class="awoken-icon awoken-28"></span><span class="count"></span></li><!--SX-->
-				<li class="awoken-count a-c-11 display-none"><span class="awoken-icon awoken-11"></span><span class="count"></span></li><!--防暗-->
-				<li class="awoken-count a-c-12 display-none"><span class="awoken-icon awoken-12"></span><span class="count"></span></li><!--防废-->
-				<li class="awoken-count a-c-13 display-none"><span class="awoken-icon awoken-13"></span><span class="count"></span></li><!--防毒-->
-				<li class="awoken-count a-c-54 display-none"><span class="awoken-icon awoken-54"></span><span class="count"></span></li><!--防云-->
-				<li class="awoken-count a-c-55 display-none"><span class="awoken-icon awoken-55"></span><span class="count"></span></li><!--防封条-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-21"></span><span class="count"></span></li><!--SB-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-28"></span><span class="count"></span></li><!--SX-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-11"></span><span class="count"></span></li><!--防暗-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-12"></span><span class="count"></span></li><!--防废-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-13"></span><span class="count"></span></li><!--防毒-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-54"></span><span class="count"></span></li><!--防云-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-55"></span><span class="count"></span></li><!--防封条-->
 			</ul>
 		</div>
 		<div class="detail-box"><textarea class="detail" placeholder="输入说明"></textarea></div>

script.js

@@ -938,26 +938,38 @@ function refreshAll(fmt){
 function refreshAwokenCount(teams){
 	var awokenUL = document.querySelector(".awoken-total-box .awoken-ul");
 	function setCount(idx,number){
-		var ali = awokenUL.querySelector(".a-c-" + idx);
-		if (!ali) return; //没有这个觉醒就撤回 
-		ali.querySelector(".count").innerHTML = number;
+		var aicon = awokenUL.querySelector(".awoken-" + idx);
+		if (!aicon) return; //没有这个觉醒就撤回 
+		var ali = aicon.parentNode;
+		var countDom = ali.querySelector(".count");
+		countDom.innerHTML = number;
 		if (number)
 			ali.classList.remove("display-none");
 		else
 			ali.classList.add("display-none");
 	}
-	for (var ai=1;ai<=67;ai++)
+	var bigAwoken = [52,53,56,68,69,70]; //等于几个小觉醒的大觉醒
+	for (var ai=1;ai<=72;ai++)
 	{
 		if (ai == 10) //防封
 		{
 			setCount(ai,awokenCountInTeam(teams,ai,solo)+awokenCountInTeam(teams,52,solo)*2);
+		}else if (ai == 11) //防暗
+		{
+			setCount(ai,awokenCountInTeam(teams,ai,solo)+awokenCountInTeam(teams,68,solo)*5);
+		}else if (ai == 12) //防废
+		{
+			setCount(ai,awokenCountInTeam(teams,ai,solo)+awokenCountInTeam(teams,69,solo)*5);
+		}else if (ai == 13) //防毒
+		{
+			setCount(ai,awokenCountInTeam(teams,ai,solo)+awokenCountInTeam(teams,70,solo)*5);
 		}else if (ai == 19) //手指
 		{
 			setCount(ai,awokenCountInTeam(teams,ai,solo)+awokenCountInTeam(teams,53,solo)*2);
 		}else if (ai == 21) //SB
 		{
 			setCount(ai,awokenCountInTeam(teams,ai,solo)+awokenCountInTeam(teams,56,solo)*2);
-		}else if (ai == 52 || ai == 53 || ai == 56) //大防封、大手指，大SB
+		}else if (bigAwoken.indexOf(ai)>=0) //属于大觉醒
 		{
 			continue;
 		}else

solo.html

@@ -246,73 +246,78 @@ var formation = new Formation(1,6);
 		<div class="awoken-total-box">
 			<!--怪物觉醒-->
 			<ul class="awoken-ul">
-				<li class="awoken-count a-c-1 display-none"><span class="awoken-icon awoken-1"></span><span class="count"></span></li><!--HP+-->
-				<li class="awoken-count a-c-2 display-none"><span class="awoken-icon awoken-2"></span><span class="count"></span></li><!--攻击+-->
-				<li class="awoken-count a-c-3 display-none"><span class="awoken-icon awoken-3"></span><span class="count"></span></li><!--回复+-->
-				<li class="awoken-count a-c-4 display-none"><span class="awoken-icon awoken-4"></span><span class="count"></span></li><!--火盾-->
-				<li class="awoken-count a-c-5 display-none"><span class="awoken-icon awoken-5"></span><span class="count"></span></li><!--水盾-->
-				<li class="awoken-count a-c-6 display-none"><span class="awoken-icon awoken-6"></span><span class="count"></span></li><!--木盾-->
-				<li class="awoken-count a-c-7 display-none"><span class="awoken-icon awoken-7"></span><span class="count"></span></li><!--光盾-->
-				<li class="awoken-count a-c-8 display-none"><span class="awoken-icon awoken-8"></span><span class="count"></span></li><!--暗盾-->
-				<li class="awoken-count a-c-9 display-none"><span class="awoken-icon awoken-9"></span><span class="count"></span></li><!--自回-->
-				<li class="awoken-count a-c-10 display-none"><span class="awoken-icon awoken-10"></span><span class="count"></span></li><!--防封-->
-				<li class="awoken-count a-c-11 display-none"><span class="awoken-icon awoken-11"></span><span class="count"></span></li><!--防暗-->
-				<li class="awoken-count a-c-12 display-none"><span class="awoken-icon awoken-12"></span><span class="count"></span></li><!--防废-->
-				<li class="awoken-count a-c-13 display-none"><span class="awoken-icon awoken-13"></span><span class="count"></span></li><!--防毒-->
-				<li class="awoken-count a-c-14 display-none"><span class="awoken-icon awoken-14"></span><span class="count"></span></li><!--火+-->
-				<li class="awoken-count a-c-15 display-none"><span class="awoken-icon awoken-15"></span><span class="count"></span></li><!--水+-->
-				<li class="awoken-count a-c-16 display-none"><span class="awoken-icon awoken-16"></span><span class="count"></span></li><!--木+-->
-				<li class="awoken-count a-c-17 display-none"><span class="awoken-icon awoken-17"></span><span class="count"></span></li><!--光+-->
-				<li class="awoken-count a-c-18 display-none"><span class="awoken-icon awoken-18"></span><span class="count"></span></li><!--暗+-->
-				<li class="awoken-count a-c-19 display-none"><span class="awoken-icon awoken-19"></span><span class="count"></span></li><!--手指-->
-				<li class="awoken-count a-c-20 display-none"><span class="awoken-icon awoken-20"></span><span class="count"></span></li><!--心解-->
-				<li class="awoken-count a-c-21 display-none"><span class="awoken-icon awoken-21"></span><span class="count"></span></li><!--SB-->
-				<li class="awoken-count a-c-22 display-none"><span class="awoken-icon awoken-22"></span><span class="count"></span></li><!--火横-->
-				<li class="awoken-count a-c-23 display-none"><span class="awoken-icon awoken-23"></span><span class="count"></span></li><!--水横-->
-				<li class="awoken-count a-c-24 display-none"><span class="awoken-icon awoken-24"></span><span class="count"></span></li><!--木横-->
-				<li class="awoken-count a-c-25 display-none"><span class="awoken-icon awoken-25"></span><span class="count"></span></li><!--光横-->
-				<li class="awoken-count a-c-26 display-none"><span class="awoken-icon awoken-26"></span><span class="count"></span></li><!--暗横-->
-				<li class="awoken-count a-c-27 display-none"><span class="awoken-icon awoken-27"></span><span class="count"></span></li><!--U-->
-				<li class="awoken-count a-c-28 display-none"><span class="awoken-icon awoken-28"></span><span class="count"></span></li><!--SX-->
-				<li class="awoken-count a-c-29 display-none"><span class="awoken-icon awoken-29"></span><span class="count"></span></li><!--心+-->
-				<li class="awoken-count a-c-30 display-none"><span class="awoken-icon awoken-30"></span><span class="count"></span></li><!--协力-->
-				<li class="awoken-count a-c-31 display-none"><span class="awoken-icon awoken-31"></span><span class="count"></span></li><!--龙杀-->
-				<li class="awoken-count a-c-32 display-none"><span class="awoken-icon awoken-32"></span><span class="count"></span></li><!--神杀-->
-				<li class="awoken-count a-c-33 display-none"><span class="awoken-icon awoken-33"></span><span class="count"></span></li><!--恶魔杀-->
-				<li class="awoken-count a-c-34 display-none"><span class="awoken-icon awoken-34"></span><span class="count"></span></li><!--机杀-->
-				<li class="awoken-count a-c-35 display-none"><span class="awoken-icon awoken-35"></span><span class="count"></span></li><!--平衡杀-->
-				<li class="awoken-count a-c-36 display-none"><span class="awoken-icon awoken-36"></span><span class="count"></span></li><!--攻击杀-->
-				<li class="awoken-count a-c-37 display-none"><span class="awoken-icon awoken-37"></span><span class="count"></span></li><!--体力杀-->
-				<li class="awoken-count a-c-38 display-none"><span class="awoken-icon awoken-38"></span><span class="count"></span></li><!--回复杀-->
-				<li class="awoken-count a-c-39 display-none"><span class="awoken-icon awoken-39"></span><span class="count"></span></li><!--进化杀-->
-				<li class="awoken-count a-c-40 display-none"><span class="awoken-icon awoken-40"></span><span class="count"></span></li><!--觉醒杀-->
-				<li class="awoken-count a-c-41 display-none"><span class="awoken-icon awoken-41"></span><span class="count"></span></li><!--强化杀-->
-				<li class="awoken-count a-c-42 display-none"><span class="awoken-icon awoken-42"></span><span class="count"></span></li><!--卖钱杀-->
-				<li class="awoken-count a-c-43 display-none"><span class="awoken-icon awoken-43"></span><span class="count"></span></li><!--7c-->
-				<li class="awoken-count a-c-44 display-none"><span class="awoken-icon awoken-44"></span><span class="count"></span></li><!--5色破防-->
-				<li class="awoken-count a-c-45 display-none"><span class="awoken-icon awoken-45"></span><span class="count"></span></li><!--心追-->
-				<li class="awoken-count a-c-46 display-none"><span class="awoken-icon awoken-46"></span><span class="count"></span></li><!--全体HP-->
-				<li class="awoken-count a-c-47 display-none"><span class="awoken-icon awoken-47"></span><span class="count"></span></li><!--全体回复-->
-				<li class="awoken-count a-c-48 display-none"><span class="awoken-icon awoken-48"></span><span class="count"></span></li><!--破无效-->
-				<li class="awoken-count a-c-49 display-none"><span class="awoken-icon awoken-49"></span><span class="count"></span></li><!--武器觉醒-->
-				<li class="awoken-count a-c-50 display-none"><span class="awoken-icon awoken-50"></span><span class="count"></span></li><!--方块心追-->
-				<li class="awoken-count a-c-51 display-none"><span class="awoken-icon awoken-51"></span><span class="count"></span></li><!--5色溜-->
-				<li class="awoken-count a-c-52 display-none"><span class="awoken-icon awoken-52"></span><span class="count"></span></li><!--大防封-->
-				<li class="awoken-count a-c-53 display-none"><span class="awoken-icon awoken-53"></span><span class="count"></span></li><!--大手指-->
-				<li class="awoken-count a-c-54 display-none"><span class="awoken-icon awoken-54"></span><span class="count"></span></li><!--防云-->
-				<li class="awoken-count a-c-55 display-none"><span class="awoken-icon awoken-55"></span><span class="count"></span></li><!--防封条-->
-				<li class="awoken-count a-c-56 display-none"><span class="awoken-icon awoken-56"></span><span class="count"></span></li><!--大SB-->
-				<li class="awoken-count a-c-57 display-none"><span class="awoken-icon awoken-57"></span><span class="count"></span></li><!--满血强化-->
-				<li class="awoken-count a-c-58 display-none"><span class="awoken-icon awoken-58"></span><span class="count"></span></li><!--下半血强化-->
-				<li class="awoken-count a-c-59 display-none"><span class="awoken-icon awoken-59"></span><span class="count"></span></li><!--L盾-->
-				<li class="awoken-count a-c-60 display-none"><span class="awoken-icon awoken-60"></span><span class="count"></span></li><!--L解锁-->
-				<li class="awoken-count a-c-61 display-none"><span class="awoken-icon awoken-61"></span><span class="count"></span></li><!--10c-->
-				<li class="awoken-count a-c-62 display-none"><span class="awoken-icon awoken-62"></span><span class="count"></span></li><!--c珠-->
-				<li class="awoken-count a-c-63 display-none"><span class="awoken-icon awoken-63"></span><span class="count"></span></li><!--语音-->
-				<li class="awoken-count a-c-64 display-none"><span class="awoken-icon awoken-64"></span><span class="count"></span></li><!--奖励增加-->
-				<li class="awoken-count a-c-65 display-none"><span class="awoken-icon awoken-65"></span><span class="count"></span></li><!--HP--->
-				<li class="awoken-count a-c-66 display-none"><span class="awoken-icon awoken-66"></span><span class="count"></span></li><!--攻击--->
-				<li class="awoken-count a-c-67 display-none"><span class="awoken-icon awoken-67"></span><span class="count"></span></li><!--回复--->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-1"></span><span class="count"></span></li><!--HP+-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-2"></span><span class="count"></span></li><!--攻击+-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-3"></span><span class="count"></span></li><!--回复+-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-4"></span><span class="count"></span></li><!--火盾-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-5"></span><span class="count"></span></li><!--水盾-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-6"></span><span class="count"></span></li><!--木盾-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-7"></span><span class="count"></span></li><!--光盾-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-8"></span><span class="count"></span></li><!--暗盾-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-9"></span><span class="count"></span></li><!--自回-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-10"></span><span class="count"></span></li><!--防封-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-11"></span><span class="count"></span></li><!--防暗-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-12"></span><span class="count"></span></li><!--防废-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-13"></span><span class="count"></span></li><!--防毒-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-14"></span><span class="count"></span></li><!--火+-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-15"></span><span class="count"></span></li><!--水+-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-16"></span><span class="count"></span></li><!--木+-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-17"></span><span class="count"></span></li><!--光+-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-18"></span><span class="count"></span></li><!--暗+-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-19"></span><span class="count"></span></li><!--手指-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-20"></span><span class="count"></span></li><!--心解-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-21"></span><span class="count"></span></li><!--SB-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-22"></span><span class="count"></span></li><!--火横-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-23"></span><span class="count"></span></li><!--水横-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-24"></span><span class="count"></span></li><!--木横-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-25"></span><span class="count"></span></li><!--光横-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-26"></span><span class="count"></span></li><!--暗横-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-27"></span><span class="count"></span></li><!--U-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-28"></span><span class="count"></span></li><!--SX-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-29"></span><span class="count"></span></li><!--心+-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-30"></span><span class="count"></span></li><!--协力-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-31"></span><span class="count"></span></li><!--龙杀-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-32"></span><span class="count"></span></li><!--神杀-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-33"></span><span class="count"></span></li><!--恶魔杀-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-34"></span><span class="count"></span></li><!--机杀-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-35"></span><span class="count"></span></li><!--平衡杀-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-36"></span><span class="count"></span></li><!--攻击杀-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-37"></span><span class="count"></span></li><!--体力杀-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-38"></span><span class="count"></span></li><!--回复杀-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-39"></span><span class="count"></span></li><!--进化杀-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-40"></span><span class="count"></span></li><!--觉醒杀-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-41"></span><span class="count"></span></li><!--强化杀-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-42"></span><span class="count"></span></li><!--卖钱杀-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-43"></span><span class="count"></span></li><!--7c-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-44"></span><span class="count"></span></li><!--5色破防-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-45"></span><span class="count"></span></li><!--心追-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-46"></span><span class="count"></span></li><!--全体HP-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-47"></span><span class="count"></span></li><!--全体回复-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-48"></span><span class="count"></span></li><!--破无效-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-49"></span><span class="count"></span></li><!--武器觉醒-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-50"></span><span class="count"></span></li><!--方块心追-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-51"></span><span class="count"></span></li><!--5色溜-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-52"></span><span class="count"></span></li><!--大防封-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-53"></span><span class="count"></span></li><!--大手指-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-54"></span><span class="count"></span></li><!--防云-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-55"></span><span class="count"></span></li><!--防封条-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-56"></span><span class="count"></span></li><!--大SB-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-57"></span><span class="count"></span></li><!--满血强化-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-58"></span><span class="count"></span></li><!--下半血强化-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-59"></span><span class="count"></span></li><!--L盾-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-60"></span><span class="count"></span></li><!--L解锁-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-61"></span><span class="count"></span></li><!--10c-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-62"></span><span class="count"></span></li><!--c珠-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-63"></span><span class="count"></span></li><!--语音-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-64"></span><span class="count"></span></li><!--奖励增加-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-65"></span><span class="count"></span></li><!--HP--->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-66"></span><span class="count"></span></li><!--攻击--->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-67"></span><span class="count"></span></li><!--回复--->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-68"></span><span class="count"></span></li><!--大防暗-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-69"></span><span class="count"></span></li><!--大防废-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-70"></span><span class="count"></span></li><!--大防毒-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-71"></span><span class="count"></span></li><!--掉废-->
+				<li class="awoken-count display-none"><span class="awoken-icon awoken-72"></span><span class="count"></span></li><!--掉毒-->
 			</ul>
 		</div>
 		<div class="detail-box"><textarea class="detail" placeholder="输入说明"></textarea></div>