From 4d700296143722c735a526f329fa0ce192d2f1c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= <mapaler@163.com>
Date: Tue, 18 Feb 2020 20:14:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AD=89=E6=95=88=E8=A7=89?=
 =?UTF-8?q?=E9=86=92=E7=9A=84=E7=8B=AC=E7=AB=8B=E6=94=B6=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script.js             | 37 ++++++++++++++-----------------------
 universal_function.js |  9 +++++++++
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/script.js b/script.js
index 1b0927d1..ffad9718 100644
--- a/script.js
+++ b/script.js
@@ -1983,32 +1983,23 @@ function refreshFormationAwokenCount(awokenDom,teams){
 		else
 			ali.classList.add("display-none");
 	}
-	const bigAwoken = [52,53,56,68,69,70]; //等于几个小觉醒的大觉醒
+	
 	for (var ai=1;ai<=72;ai++)
 	{
 		const aicon = awokenUL.querySelector(".awoken-" + ai);
-		if (!aicon) continue;
-		if (ai == 10) //防封
-		{
-			setCount(aicon,awokenCountInFormation(teams,ai,solo)+awokenCountInFormation(teams,52,solo)*2);
-		}else if (ai == 11) //防暗
-		{
-			setCount(aicon,awokenCountInFormation(teams,ai,solo)+awokenCountInFormation(teams,68,solo)*5);
-		}else if (ai == 12) //防废
-		{
-			setCount(aicon,awokenCountInFormation(teams,ai,solo)+awokenCountInFormation(teams,69,solo)*5);
-		}else if (ai == 13) //防毒
-		{
-			setCount(aicon,awokenCountInFormation(teams,ai,solo)+awokenCountInFormation(teams,70,solo)*5);
-		}else if (ai == 19) //手指
-		{
-			setCount(aicon,awokenCountInFormation(teams,ai,solo)+awokenCountInFormation(teams,53,solo)*2);
-		}else if (ai == 21) //SB
-		{
-			setCount(aicon,awokenCountInFormation(teams,ai,solo)+awokenCountInFormation(teams,56,solo)*2);
-		}else if (bigAwoken.indexOf(ai)>=0) //属于大觉醒
-		{
-			continue;
+		if (!aicon) continue; //如果没有这个觉醒图，直接跳过
+		//搜索等效觉醒
+		const equivalentAwokens = equivalent_awoken.filter((ak)=>{return ak.small == ai || ak.big == ai;});
+		if (equivalentAwokens.length > 0)
+		{
+			const equivalentAwoken = equivalentAwokens[0];
+			if (equivalentAwoken.small == ai)
+			{ //小觉醒
+				setCount(aicon, awokenCountInFormation(teams, equivalentAwoken.small, solo) + awokenCountInFormation(teams, equivalentAwoken.big, solo) * equivalentAwoken.times);
+			}else
+			{ //属于大觉醒
+				continue;
+			}
 		}else
 		{
 			setCount(aicon,awokenCountInFormation(teams,ai,solo));
diff --git a/universal_function.js b/universal_function.js
index 14790782..30c1508f 100644
--- a/universal_function.js
+++ b/universal_function.js
@@ -14,6 +14,15 @@ const type_allowable_latent = {
 	"7":[17],//7恶魔
 	"8":[17,20,21,24],//8机械
 };
+//等效觉醒列表
+const equivalent_awoken = [
+	{small:10,big:52,times:2}, //防封
+	{small:11,big:68,times:5}, //防暗
+	{small:12,big:69,times:5}, //防废
+	{small:13,big:70,times:5}, //防毒
+	{small:19,big:53,times:2}, //手指
+	{small:21,big:56,times:2}, //SB
+];
 //仿GM_xmlhttpRequest函数v1.3
 const GM_xmlhttpRequest = function(GM_param) {
 	const xhr = new XMLHttpRequest(); //创建XMLHttpRequest对象