From 2134329ef5dfc160d50371024fec6a1e462b200a 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, 26 Jun 2019 16:11:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=B6=85=E8=A7=89=E9=86=92=E7=9A=84=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8C=89ESC=E5=BF=AB=E9=80=9F=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 monsters-info/extractByNode.js |  2 +-
 script.js                      | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/monsters-info/extractByNode.js b/monsters-info/extractByNode.js
index 621a60c4..5e6452cc 100644
--- a/monsters-info/extractByNode.js
+++ b/monsters-info/extractByNode.js
@@ -36,7 +36,7 @@ for (var mi=0;mi<mainCard.length;mi++)
 
 		var awokenCIdx = 58+m[57]*3; //awoken Count Index
 		var awoken = m.slice(awokenCIdx+1,awokenCIdx+1+m[awokenCIdx]);
-		var superAwoken = m[awokenCIdx+1+m[awokenCIdx]].split(",").map(function(ns){return parseInt(ns);}); //超觉醒
+		var superAwoken = m[awokenCIdx+1+m[awokenCIdx]].length>0?(m[awokenCIdx+1+m[awokenCIdx]].split(",").map(function(ns){return parseInt(ns);})):null; //超觉醒
 
 		var mon = {
 			id:	m[0],
diff --git a/script.js b/script.js
index f0104f8e..0c702f63 100644
--- a/script.js
+++ b/script.js
@@ -328,6 +328,15 @@ function initialize()
 		creatNewUrl();
 		editBox.hide();
 	}
+	window.onkeydown = function(e){
+		if (!editBox.classList.contains("display-none"))
+		{
+			if (e.keyCode == 27)
+			{ //按下ESC时，自动关闭编辑窗
+				btnCancel.onclick();
+			}
+		}
+	}
 	btnNull.onclick = function(){
 		var mD = formation.team[editBox.memberIdx[0]][editBox.memberIdx[1]][editBox.memberIdx[2]] = {id:0};
 		changeid(mD,editBox.monsterBox,editBox.latentBox);
@@ -445,7 +454,7 @@ function changeid(mon,monDom,latentDom)
 		}
 	}
 	var m_id = monDom.querySelector(".id");
-	if (m_id) //如果存在超觉醒的DOM且提供了超觉醒
+	if (m_id) //怪物ID
 	{
 		m_id.innerHTML = mon.id;
 	}
@@ -607,7 +616,7 @@ function editBoxChangeMonId(id)
 	//超觉醒
 	var mSAwokenRow = settingBox.querySelector(".row-mon-super-awoken");
 	var mSAwoken = mSAwokenRow.querySelectorAll(".awoken-ul li");
-	if (md.sAwoken)
+	if (md.sAwoken && md.sAwoken.length>0)
 	{
 		mSAwokenRow.classList.remove("display-none");
 		for (var ai=0;ai<mSAwoken.length;ai++)
@@ -619,9 +628,7 @@ function editBoxChangeMonId(id)
 		}
 	}else
 	{
-		console.log(mSAwokenRow.classList);
 		mSAwokenRow.classList.add("display-none");
-		console.log(mSAwokenRow.classList);
 	}
 
 	var monEditLvMax = settingBox.querySelector(".m-level-btn-max");