From 8196ccc014be0546c403485dd0cc0c3b13eac66b 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, 23 Jul 2019 16:47:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E4=B8=80=E4=BA=9B=E5=A4=96?=
 =?UTF-8?q?=E8=A7=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script.js | 34 +++++++++++++---------------------
 style.css | 34 ++++++++++------------------------
 2 files changed, 23 insertions(+), 45 deletions(-)

diff --git a/script.js b/script.js
index da495e33..69585131 100644
--- a/script.js
+++ b/script.js
@@ -1,10 +1,18 @@
 var ms = null;
 var language = null;
 var memberTeamObj = function(){
-	return {id:0,level:0,awoken:0,plus:[0,0,0],latent:[]}; //sawoken作为可选项目，默认不在内
+	this.id = 0;
+	this.level = 0;
+	this.awoken = 0;
+	this.plus = [0,0,0];
+	this.latent = [];
+	 //sawoken作为可选项目，默认不在内
 }
 var memberAssistObj = function(){
-	return {id:0,level:0,awoken:0,plus:[0,0,0]};
+	this.id = 0;
+	this.level = 0;
+	this.awoken = 0;
+	this.plus = [0,0,0];
 }
 window.onload = function()
 {
@@ -361,13 +369,6 @@ function initialize()
 	languageJS.type = "text/javascript";
 	languageJS.src = "languages/"+language.i18n+".js";
 }
-//计算用了多少潜觉格子
-function usedHole(latent)
-{
-	return latent.reduce(function(previous,current){
-		return previous + (current>= 12?2:1);
-	},0);
-}
 //改变一个怪物头像
 function changeid(mon,monDom,latentDom)
 {
@@ -503,7 +504,7 @@ function changeid(mon,monDom,latentDom)
 		}
 	}
 }
-//点击怪物头像，出现编辑框
+//点击怪物头像，出现编辑窗
 function editMon(AorB,isAssist,tempIdx)
 {
 	//数据
@@ -568,7 +569,7 @@ function editMon(AorB,isAssist,tempIdx)
 		editBox.querySelector(".edit-box-title").classList.add("edit-box-title-assist");
 	}
 }
-
+//编辑窗，修改怪物ID
 function editBoxChangeMonId(id)
 {
 	var md = ms[id]; //怪物固定数据
@@ -737,7 +738,7 @@ function refreshAwokenCount(team){
 		}else if (ai == 21) //SB
 		{
 			setCount(ai,awokenCountInTeam(team,ai,solo)+awokenCountInTeam(team,56,solo)*2);
-		}else if (ai == 52 || ai == 53 || ai == 56) //大手指，大SB
+		}else if (ai == 52 || ai == 53 || ai == 56) //大防封、大手指，大SB
 		{
 			continue;
 		}else
@@ -745,13 +746,4 @@ function refreshAwokenCount(team){
 			setCount(ai,awokenCountInTeam(team,ai,solo));
 		}
 	}
-	/*
-	setCount(21,awokenCountInTeam(team,21)+awokenCountInTeam(team,56)*2); //SB+大SB
-	setCount(28,awokenCountInTeam(team,28)); //SX
-	setCount(11,awokenCountInTeam(team,11)); //防暗
-	setCount(12,awokenCountInTeam(team,12)); //防废
-	setCount(13,awokenCountInTeam(team,13)); //防毒
-	setCount(54,awokenCountInTeam(team,54)); //防云
-	setCount(55,awokenCountInTeam(team,55)); //防封条
-	*/
 }
\ No newline at end of file
diff --git a/style.css b/style.css
index e62e6e30..d0fa6b13 100644
--- a/style.css
+++ b/style.css
@@ -283,35 +283,21 @@ ul{
 }
 
 /*队伍的潜觉*/
-.formation-box .latents{
+.formation-latents {
+	height: 44px;
+}
+.formation-latents .latents{
 	width: 108px;
 	/*float:left;*/
-	margin-bottom: -19px;
+	margin-bottom: -20px;
 	display: inline-block;
 }
-.formation-box .latent-ul{
+.formation-latents .latent-ul{
 	font-size: 0;
 	width: 152px;
-	transform: translate(-22px,-10px) scale(0.71);
+	transform: translate(-22px,-10px) scale(0.68);
 }
 
-.a-awoken-icon-1 li{
-	background-image: url(images/sha.png);
-	background-size: 50px 21px;
-	width: 50px;
-	height: 21px;
-	margin-right: 4px;
-}
-.a-awoken-icon-2 li{
-	background-image: url(images/fangzuo.png);
-	background-size: 21px 21px;
-	width: 21px;
-	height: 21px;
-	margin-left: 6px;
-}
-.a-awoken-icon-ul li{
-	float:left;
-}
 /*队长的边框*/
 .formation-A-box .formation-team .team-leader .monster, .formation-B-box .formation-team .team-leader .monster{
 	border-radius: 10px;
@@ -461,10 +447,10 @@ ul{
 	height: 32px;
 }
 .awoken-ul li{
-	margin-left: 5px;
+	margin-right: 5px;
 }
-.awoken-ul li:first-of-type{
-	margin-left: 0;
+.awoken-ul li:last-of-type{
+	margin-right: 0;
 }
 .edit-box .awoken-ul .awoken-icon{
 	cursor: pointer;