From 6ec7f331fbc368a8664bcde490636dd4fcf12eb2 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: Wed, 23 Sep 2020 19:16:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AD=A6=E5=99=A8=E8=A7=89?=
 =?UTF-8?q?=E9=86=92=E6=9C=AA=E7=82=B9=E6=BB=A1=E6=97=B6=E7=9A=84=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script-universal_function.js | 2 +-
 script.js                    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/script-universal_function.js b/script-universal_function.js
index fa20eb2e..e51e5d40 100644
--- a/script-universal_function.js
+++ b/script-universal_function.js
@@ -230,7 +230,7 @@ function awokenCountInTeam(team,awokenIndex,solo,teamsCount)
 		}
 		if (assistCard && assistCard.enabled && assistCard.awakenings.includes(49))
 		{ //如果卡片未启用
-			enableAwoken = enableAwoken.concat(assistCard.awakenings);
+			enableAwoken = enableAwoken.concat(assistCard.awakenings.slice(0, assist.awoken));
 		}
 
 		//相同的觉醒数
diff --git a/script.js b/script.js
index 9d86cbc6..cbb0c4c3 100644
--- a/script.js
+++ b/script.js
@@ -1622,7 +1622,7 @@ function changeid(mon, monDom, latentDom) {
         {
             awokenIcon.classList.add(className_displayNone);
             awokenIcon.innerHTML = "";
-        } else if (mon.awoken > 1) //如果提供了觉醒
+        } else if (mon.awoken > 0) //如果提供了觉醒
         {
             awokenIcon.classList.remove(className_displayNone);
             awokenIcon.innerHTML = mon.awoken;
@@ -1790,7 +1790,7 @@ function editMon(teamNum, isAssist, indexInTeam) {
         editBoxTitle.classList.add("edit-box-title-assist");
     }
     editBox.reCalculateExp();
-    if (mon.awoken > 0 && monEditAwokens[mon.awoken])
+    if (mon.awoken !== undefined && monEditAwokens[mon.awoken])
         monEditAwokens[mon.awoken].click(); //涉及到觉醒数字的显示，所以需要点一下
     else
         editBox.reCalculateAbility();