From fd4e370bf851b4b6003efcf8e6b23197e8316c3d Mon Sep 17 00:00:00 2001
From: libccy <operawidget@163.com>
Date: Sat, 1 Apr 2017 13:45:23 +0800
Subject: [PATCH] 1

---
 character/rank.js |  2 +-
 game/game.js      | 36 +++++++++++++++++++++++++-----------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/character/rank.js b/character/rank.js
index 5e18fe6e0..76ba68105 100644
--- a/character/rank.js
+++ b/character/rank.js
@@ -405,6 +405,7 @@ window.characterRank={
         'hs_nozdormu',
         'zhoucang',
         'hs_shifazhe',
+        'guanyinping',
     ],
     b:[
         'sp_daqiao',
@@ -499,7 +500,6 @@ window.characterRank={
         'guohuai',
         'sunluban',
         'zhouyu',
-        'guanyinping',
         'dingfeng',
         'mayunlu',
         'shen_guanyu',
diff --git a/game/game.js b/game/game.js
index 0c04b143b..577e25f6a 100644
--- a/game/game.js
+++ b/game/game.js
@@ -17443,17 +17443,25 @@
                     }
 					return this;
 				},
-				updateTransform:function(bool){
-					if(_status.event.player!=game.me) return;
-					if(this._transform&&this.parentNode&&this.parentNode.parentNode&&
-						this.parentNode.parentNode.parentNode==ui.me&&
-						(!_status.mousedown||_status.mouseleft)&&
-						(!this.parentNode.parentNode.classList.contains('scrollh')||game.layout=='long2')){
-						if(bool){
-							this.style.transform=this._transform+' translateY(-20px)';
-						}
-						else{
-							this.style.transform=this._transform||'';
+				updateTransform:function(bool,delay){
+					if(delay){
+						var that=this;
+						setTimeout(function(){
+							that.updateTransform(that.classList.contains('selected'));
+						},delay);
+					}
+					else{
+						if(_status.event.player!=game.me) return;
+						if(this._transform&&this.parentNode&&this.parentNode.parentNode&&
+							this.parentNode.parentNode.parentNode==ui.me&&
+							(!_status.mousedown||_status.mouseleft)&&
+							(!this.parentNode.parentNode.classList.contains('scrollh')||game.layout=='long2')){
+							if(bool){
+								this.style.transform=this._transform+' translateY(-20px)';
+							}
+							else{
+								this.style.transform=this._transform||'';
+							}
 						}
 					}
 				},
@@ -35496,6 +35504,9 @@
 						var itemtype=get.itemtype(item);
 						if(itemtype=='card'||itemtype=='button'||itemtype=='player'){
 							_status.mouseleft=true;
+							if(ui.selected.cards.length){
+								ui.selected.cards[0].updateTransform(true,100);
+							}
 							var ex=e.touches[0].clientX/game.documentZoom-ui.arena.offsetLeft;
 							var ey=e.touches[0].clientY/game.documentZoom-ui.arena.offsetTop;
 							var exx=ex,eyy=ey;
@@ -35865,6 +35876,9 @@
 						var itemtype=get.itemtype(item);
 						if(itemtype=='card'||itemtype=='button'||itemtype=='player'){
 							_status.mouseleft=true;
+							if(ui.selected.cards.length){
+								ui.selected.cards[0].updateTransform(true,100);
+							}
 							var ex=e.clientX/game.documentZoom-ui.arena.offsetLeft;
 							var ey=e.clientY/game.documentZoom-ui.arena.offsetTop;
 							var exx=ex,eyy=ey;