From 6e7ca4e3460dd8829f812ab0b090a3595bbf51af Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Fri, 1 May 2015 11:25:06 +0800
Subject: [PATCH] null

---
 game/game.js              | 18 +++++-------------
 layout/default/layout.css |  6 +++---
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/game/game.js b/game/game.js
index daada8234..5341ff9ed 100644
--- a/game/game.js
+++ b/game/game.js
@@ -6454,8 +6454,9 @@ window.play={};
 				if(control.childNodes.length){
 					var width=0;
 					for(i=0;i<control.childNodes.length;i++) width+=control.childNodes[i].offsetWidth;
-					control.hide();
-					setTimeout(function(){control.style.width=width+'px';control.show();},0);
+					ui.refresh(control);
+					control.style.width=width+'px';
+					control.style.opacity=1;
 				}
 				return control;
 			},
@@ -6514,17 +6515,8 @@ window.play={};
 					delete ui.skills;
 				}
 				if(skills==undefined||skills.length==0) return;
-				ui.skills=ui.create.control(ui.click.skill);
-				for(i=0;i<skills.length;i++){
-					ui.skills.add(skills[i]);
-				}
-				if(_status.event.isMine()){
-					var width=0;
-					for(var i=0;i<ui.skills.childNodes.length;i++) width+=ui.skills.childNodes[i].offsetWidth;
-					ui.skills.style.width=width+'px';
-					ui.skills.animate('start');
-				}
-				else{
+				ui.skills=ui.create.control(skills.concat([ui.click.skill]));
+				if(!_status.event.isMine()){
 					ui.skills.style.display='none';
 				}
 				ui.skills.skills=skills;
diff --git a/layout/default/layout.css b/layout/default/layout.css
index a2f25259e..0d44eef94 100644
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -99,11 +99,11 @@ body>.background{z-index:-2}
 .card.center{top:calc(50% - 52px);left:calc(50% - 52px);}
 .card>.background{font-size: 80px;height: 80px;padding-top: 14px;text-align: center;}
 .equips>.card>.background{font-size: 36px;height: 36px;padding-top: 3px;}
-.judges>.card>.background,.marks>.card>.background{font-size: 20px;height: 20px;padding-top: 2px;}
+.judges>.card>.background,.marks>.card>.background{font-size: 20px;height: 20px;padding-top: 3px;}
 .button.card>.background{font-size: 68px;height: 68px;padding-top: 12px;}
 .card>.background{font-family:'xiaozhuan'}
 .card>.background.tight{letter-spacing: -0.2em}
-.marks>.card>.background.skillmark{font-family:'huangcao'}
+.marks>.card>.background.skillmark{font-family:'huangcao';padding-top:4px;}
 /*--------窗口--------*/
 .dialog{text-align: center;}
 .dialog{width: calc(90% - 420px);height: calc(100% / 3 - 160px / 3 + 120px);}
@@ -177,7 +177,7 @@ margin-bottom: 5px;
 /*--------确认--------*/
 #control{text-align: center;z-index: 2;top: calc(200% / 3);left: calc(5% + 240px);width: calc(90% - 480px);}
 .control{padding-top: 2px;padding-bottom: 2px;padding-left: 4px;padding-right: 4px;margin-left: 4px;margin-right: 4px;}
-.control{font-size: 18px;white-space: nowrap;position: relative;overflow: hidden;width: 0;}
+.control{font-size: 18px;white-space: nowrap;position: relative;overflow: hidden;width: 0;opacity:0}
 .control>div{position: relative;padding: 3px;}
 /*--------角色--------*/
 .player{z-index: 4;width: 240px;height: 120px;}