diff --git a/script.js b/script.js
index fc66048d..40a94230 100644
--- a/script.js
+++ b/script.js
@@ -41,19 +41,18 @@ window.onload = function()
 		onload: function(response) {
 			ms = JSON.parse(response.response);
 			initialize();//初始化
-
 			try
 			{
 				var idataQer = getQueryString("data");
 				if (idataQer)
 				{
-					var idata = JSON.parse(decodeURIComponent(idataQer));
+					var idata = JSON.parse(idataQer);
 					formation = idata;
 					refreshAll(formation);
 				}
 			}catch(e)
 			{
-				console.log("初始数据解码出错");
+				console.log("初始数据解码出错",e);
 			}
 			//test(); //测试代码
 		},
@@ -73,7 +72,7 @@ function creatNewUrl(){
 function getQueryString(name) {
 	var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
 	var r = window.location.search.substr(1).match(reg);
-	if (r != null) return unescape(r[2]); return null;
+	if (r != null) return decodeURIComponent(r[2]); return null;
 }
 //初始化
 function initialize()
@@ -337,6 +336,8 @@ function changeid(mon,monDom,latentDom)
 				awokenIcon.innerHTML = "★";
 				if (md.assist)
 					awokenIcon.classList.add("allowable-assist");
+				else
+					awokenIcon.classList.remove("allowable-assist");
 			}
 		}
 	}
diff --git a/style.css b/style.css
index b408a558..496525b0 100644
--- a/style.css
+++ b/style.css
@@ -24,6 +24,7 @@
 	width:100%;
 	max-width:100%;
 	min-width:100%;
+	height: 100px;
 	resize: vertical; 
 	border: none;
 	background: none;
@@ -254,9 +255,9 @@ ul{
 /*队伍的潜觉*/
 .formation-box .latents{
 	width: 108px;
-	/*height: 46px;*/
-	float: left;
+	/*float:left;*/
 	margin-bottom: -19px;
+	display: inline-block;
 }
 .formation-box .latent-ul{
 	font-size: 0;