From 0842aaaaebc3ae5d058418f722734600cb7e87b7 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Tue, 28 Mar 2017 11:43:53 +0800
Subject: [PATCH] t

---
 card/sp.js              |   2 +-
 game/game.js            | 151 +++++++++++++++++++++-------------------
 game/update.js          |   8 +--
 layout/long2/layout.css |   8 +++
 4 files changed, 91 insertions(+), 78 deletions(-)

diff --git a/card/sp.js b/card/sp.js
index c10745204..041a1da36 100644
--- a/card/sp.js
+++ b/card/sp.js
@@ -81,7 +81,7 @@ card.sp={
             type:'trick',
 			selectTarget:2,
 			multitarget:true,
-			targetprompt:['交给其一张牌','得两张牌'],
+			targetprompt:['给一张牌','得两张牌'],
 			filterTarget:function(card,player,target){
 				return target!=player;
 			},
diff --git a/game/game.js b/game/game.js
index 5f80faba0..622239c5a 100644
--- a/game/game.js
+++ b/game/game.js
@@ -6230,35 +6230,35 @@
 						});
 					}
                 }
-				lib.cardSelectObserver=new MutationObserver(function(mutations){
-					for(var i=0;i<mutations.length;i++){
-						if(mutations[i].attributeName=='class'){
-							var node=mutations[i].target;
-							if(node._transform&&node.parentNode&&node.parentNode.parentNode&&
-								node.parentNode.parentNode.parentNode==ui.me){
-								if(node.classList.contains('selected')){
-									setTimeout((function(node){
-										return function(){
-											if(node._transform&&node.parentNode&&node.parentNode.parentNode&&
-												node.parentNode.parentNode.parentNode==ui.me){
-												if(node.classList.contains('selected')&&
-												!node.parentNode.parentNode.classList.contains('scrollh')){
-													node.style.transform=node._transform+' translateY(-20px)';
-												}
-												else{
-													node.style.transform=node._transform;
-												}
-											}
-										}
-									}(node)),200);
-								}
-								else{
-									node.style.transform=node._transform;
-								}
-							}
-						}
-					}
-				});
+				// lib.cardSelectObserver=new MutationObserver(function(mutations){
+				// 	for(var i=0;i<mutations.length;i++){
+				// 		if(mutations[i].attributeName=='class'){
+				// 			var node=mutations[i].target;
+				// 			if(node._transform&&node.parentNode&&node.parentNode.parentNode&&
+				// 				node.parentNode.parentNode.parentNode==ui.me){
+				// 				if(node.classList.contains('selected')){
+				// 					setTimeout((function(node){
+				// 						return function(){
+				// 							if(node._transform&&node.parentNode&&node.parentNode.parentNode&&
+				// 								node.parentNode.parentNode.parentNode==ui.me){
+				// 								if(node.classList.contains('selected')&&
+				// 								!node.parentNode.parentNode.classList.contains('scrollh')){
+				// 									node.style.transform=node._transform+' translateY(-20px)';
+				// 								}
+				// 								else{
+				// 									node.style.transform=node._transform;
+				// 								}
+				// 							}
+				// 						}
+				// 					}(node)),200);
+				// 				}
+				// 				else{
+				// 					node.style.transform=node._transform;
+				// 				}
+				// 			}
+				// 		}
+				// 	}
+				// });
 
 				if(lib.device){
 					lib.init.cordovaReady=function(){
@@ -17293,6 +17293,19 @@
                     }
 					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&&
+						(!this.parentNode.parentNode.classList.contains('scrollh')||game.layout=='long2')){
+						if(bool){
+							this.style.transform=this._transform+' translateY(-20px)';
+						}
+						else{
+							this.style.transform=this._transform||'';
+						}
+					}
+				},
 				aiexclude:function(){
 					_status.event.aiexclude.add(this);
 				},
@@ -23417,7 +23430,7 @@
 					game.uncheck('card');
 				}
 				else{
-					var cards=player.get(event.position||'h');
+					var cards=player.getCards(event.position);
 					var firstCheck=false;
 					range=get.select(event.selectCard);
 					if(!event._cardChoice&&typeof event.selectCard!='function'&&
@@ -23468,6 +23481,7 @@
 							}
 							else if(range[1]==-1){
 								cards[i].classList.add('selected');
+								cards[i].updateTransform(true);
 								ui.selected.cards.add(cards[i]);
 							}
 							else{
@@ -23478,6 +23492,7 @@
 							cards[i].classList.remove('selectable');
 							if(range[1]==-1){
 								cards[i].classList.remove('selected');
+								cards[i].updateTransform();
 								ui.selected.cards.remove(cards[i]);
 							}
 						}
@@ -23760,50 +23775,34 @@
 			for(var i=0;i<argc;i++){
 				args[i]=arguments[i];
 			}
-			if(args.length==0){
-				var selectable=document.getElementsByClassName('selectable');
-				var selected=document.getElementsByClassName('selected');
-				while(selectable.length>0){
-					selectable[0].classList.remove('selectable');
+			if((args.length==0||args.contains('card'))&&_status.event.player){
+				var cards=_status.event.player.getCards('hej');
+				for(j=0;j<cards.length;j++){
+					cards[j].classList.remove('selected');
+					cards[j].classList.remove('selectable');
+					cards[j].updateTransform();
 				}
-				while(selected.length>0){
-					selected[0].classList.remove('selected');
-				}
-				if(_status.event.player){
-					var cards=_status.event.player.getCards('hej');
-					for(j=0;j<cards.length;j++){
-						cards[j].classList.remove('selected');
-						cards[j].classList.remove('selectable');
+				ui.selected.cards.length=0;
+			}
+			if((args.length==0||args.contains('target'))){
+				for(j=0;j<game.players.length;j++){
+					game.players[j].classList.remove('selected');
+					game.players[j].classList.remove('selectable');
+					if(game.players[j].instance){
+						game.players[j].instance.classList.remove('selected');
+						game.players[j].instance.classList.remove('selectable');
 					}
 				}
-				ui.selected.buttons.length=0;
-				ui.selected.cards.length=0;
 				ui.selected.targets.length=0;
 			}
-			else{
-				for(i=0;i<args.length;i++){
-					if(args[i]=='target'){
-						for(j=0;j<game.players.length;j++){
-							game.players[j].classList.remove('selected');
-							game.players[j].classList.remove('selectable');
-							if(game.players[j].instance){
-								game.players[j].instance.classList.remove('selected');
-								game.players[j].instance.classList.remove('selectable');
-							}
-						}
-						ui.selected.targets.length=0;
-					}
-					else if(args[i]=='card'){
-						var cards=_status.event.player.getCards('hej');
-						for(j=0;j<cards.length;j++){
-							cards[j].classList.remove('selected');
-							cards[j].classList.remove('selectable');
-						}
-						ui.selected.cards.length=0;
-					}
+			if((args.length==0||args.contains('button'))&&_status.event.dialog&&_status.event.dialog.buttons){
+				for(var j=0;j<_status.event.dialog.buttons.length;j++){
+					_status.event.dialog.buttons[j].classList.remove('selectable');
+					_status.event.dialog.buttons[j].classList.remove('selected');
 				}
+				ui.selected.buttons.length=0;
 			}
-			if(args[0]!='target'&&args[0]!='card'&&args[0]!='button'){
+			if(args.length==0){
 				ui.arena.classList.remove('selecting');
 				_status.imchoosing=false;
 				_status.lastdragchange.length=0;
@@ -28921,7 +28920,12 @@
                         exportExtLine.style.width='calc(100% - 40px)';
                         exportExtLine.style.textAlign='left';
                         exportExtLine.style.marginBottom='5px';
-                        exportExtLine.innerHTML='重启后生效。<span class="hrefnode">立即重启</span><span class="closenode">×</span>';
+						if(lib.device=='ios'){
+							exportExtLine.innerHTML='已保存。退出游戏并重新打开后生效';
+						}
+                        else{
+							exportExtLine.innerHTML='重启后生效。<span class="hrefnode">立即重启</span><span class="closenode">×</span>';
+						}
                         exportExtLine.querySelectorAll('span')[0].onclick=game.reload;
                         exportExtLine.querySelectorAll('span')[1].onclick=function(){
                             exportExtLine.style.display='none';
@@ -36273,20 +36277,21 @@
 					return;
 				}
 				if(this.classList.contains('selectable')==false) return;
-				var notoggle=false;
 				if(this.classList.contains('selected')){
 					ui.selected.cards.remove(this);
 					if(_status.multitarget||_status.event.complexSelect){
 						game.uncheck();
 						game.check();
-						notoggle=true;
+					}
+					else{
+						this.classList.remove('selected');
+						this.updateTransform();
 					}
 				}
 				else{
 					ui.selected.cards.add(this);
-				}
-				if(!notoggle){
-					this.classList.toggle('selected');
+					this.classList.add('selected');
+					this.updateTransform(true);
 				}
                 if(game.chess&&get.config('show_range')&&!_status.event.skill&&this.classList.contains('selected')&&
                 _status.event.isMine()&&_status.event.name=='chooseToUse'){
diff --git a/game/update.js b/game/update.js
index 380910d62..78ca668e7 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,8 +1,8 @@
 window.noname_update={
-    version:'1.9.17',
+    version:'1.9.18',
     // update:'1.9.15',
     changeLog:[
-        '提高载入速度',
+        // '提高载入速度',
     ],
     files:[
         'game/game.js',
@@ -11,7 +11,7 @@ window.noname_update={
         // 'game/source.js',
         // 'game/asset.js',
         // 'card/*',
-        // 'card/guozhan.js',
+        'card/sp.js',
         // 'character/*',
         // 'character/refresh.js',
         // 'mode/boss.js',
@@ -28,7 +28,7 @@ window.noname_update={
         // 'layout/default/menu.css',
         // 'theme/style/cardback/*',
         // 'layout/long/layout.css',
-        // 'layout/long2/layout.css',
+        'layout/long2/layout.css',
         // 'layout/mobile/layout.css',
         // 'layout/newlayout/global.css',
         // 'layout/mode/chess.css',
diff --git a/layout/long2/layout.css b/layout/long2/layout.css
index 2c9c06e02..fe7db6c94 100644
--- a/layout/long2/layout.css
+++ b/layout/long2/layout.css
@@ -106,6 +106,14 @@
     padding:0;
     top:calc(100% - 120px);
 }
+#arena:not(.chess) #handcards1.scrollh{
+    top: calc(100% - 180px);
+    height: 180px;
+}
+#arena:not(.chess) #handcards1.scrollh>div{
+    height: 120px;
+    top: 60px;
+}
 #arena:not(.chess):not(.single-handcard) #handcards1{
     width:calc(100% - 240px);
     left:calc(150% / 47 - 300% / 94 + 625% / 47 - 105px + 120px);