From 85e1bf5eeb3ac2db8f56f5ecd0fd053f2bd04a69 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: Sat, 18 Jan 2020 13:45:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=80=E8=83=BDCD=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script.js | 33 ++++++++-------------------------
 style.css |  9 ++++++---
 2 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/script.js b/script.js
index d83f6985..18e013d1 100644
--- a/script.js
+++ b/script.js
@@ -1179,7 +1179,6 @@ function changeid(mon,monDom,latentDom)
 	fragment.appendChild(monDom);
 	const monId = mon.id;
 	const card = Cards[monId] || Cards[0]; //怪物固定数据
-	//const skill = Skills[card.activeSkillId];
 	monDom.setAttribute("data-cardid", monId); //设定新的id
 	if (monId<0) //如果是延迟
 	{
@@ -1337,20 +1336,20 @@ function changeid(mon,monDom,latentDom)
 			latentDom.classList.add("display-none");
 		}
 	}
-	/*
-	const skillLv = monDom.querySelector(".skill");
-	if (skillLv) //如果存在超觉醒的DOM且提供了超觉醒
+
+	const skillCdDom = monDom.querySelector(".skill");
+	if (skillCdDom) //如果存在技能CD DOM
 	{
-		if (mon.skilllevel != undefined && mon.skilllevel < skill.maxLevel)
+		//const skill = Skills[card.activeSkillId];
+		if (card.activeSkillId == 0)
 		{
-			skillLv.classList.remove("display-none");
-			skillLv.innerHTML = skill.initialCooldown - mon.skilllevel + 1;
+			skillCdDom.classList.add("display-none");
 		}else
 		{
-			skillLv.classList.add("display-none");
+			skillCdDom.classList.remove("display-none");
 		}
 	}
-	*/
+
 	parentNode.appendChild(fragment);
 }
 //点击怪物头像，出现编辑窗
@@ -1893,20 +1892,4 @@ function refreshSkillCD(teamDom,team,idx){
 		memberSkillCdDom.classList.add("max-skill");
 		assistSkillCdDom.classList.add("max-skill");
 	}
-
-	//没有技能时
-	if (memberSkill.id == 0)
-	{
-		memberSkillCdDom.classList.add("display-none");
-	}else
-	{
-		memberSkillCdDom.classList.remove("display-none");
-	}
-	if (assistSkill.id == 0)
-	{
-		assistSkillCdDom.classList.add("display-none");
-	}else
-	{
-		assistSkillCdDom.classList.remove("display-none");
-	}
 }
diff --git a/style.css b/style.css
index 49f597c3..55e6a761 100644
--- a/style.css
+++ b/style.css
@@ -144,7 +144,7 @@ ul{
 	left:10px;
 }
 .null .monster>div,.delay .monster>div{
-	display:none;
+	display:none !important;
 }
 .monster .plus .hp::before,
 .monster .plus .atk::before,
@@ -210,7 +210,7 @@ ul{
 	text-shadow: black 0 0 2px, black 2px 2px 0;
 	position: absolute;
 	left: 5px;
-	bottom: 0px;
+	bottom: 0;
 	vertical-align: top;
 }
 .monster .level,.monster .level.max::before{
@@ -243,6 +243,9 @@ ul{
 .not-show-mon-id .monster .id{
 	display: none;
 }
+.monster .id::before{
+	font-size: 12px;
+}
 /*.monster .id::before{
 	content: "No.";
 }*/
@@ -256,7 +259,7 @@ ul{
 	color:white;
 	text-shadow: black 0 0 1px,black 0 0 2px, black 2px 2px 0;
 	position: absolute;
-	right:3px;
+	right:0;
 	bottom:0;
 }
 .monster .skill.max-skill{