From 8c98036f0e37a2f1b60fd0ef405aaf3707a7a4a0 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Fri, 17 Mar 2017 09:38:59 +0800
Subject: [PATCH] l3

---
 game/game.js              | 72 +++++++++++++--------------------------
 game/update.js            | 14 ++++----
 layout/default/layout.css |  2 +-
 mode/guozhan.js           | 16 ++++-----
 theme/music/style.css     |  5 +--
 theme/simple/style.css    |  5 +--
 theme/woodden/style.css   |  5 +--
 7 files changed, 48 insertions(+), 71 deletions(-)

diff --git a/game/game.js b/game/game.js
index ec4474d9c..a908fb61b 100644
--- a/game/game.js
+++ b/game/game.js
@@ -9443,8 +9443,22 @@
 				lose:function(){
 					"step 0"
 					var hs=[],es=[],js=[];
+					var hej=player.get('hej');
+					event.stockcards=cards.slice(0);
 					for(var i=0;i<cards.length;i++){
-						if(cards[i].parentNode){
+						cards[i].style.transform+=' scale(0.2)';
+                        cards[i].classList.remove('glow');
+                        cards[i].recheck();
+						if(event.position){
+							cards[i].goto(event.position);
+						}
+						else{
+							cards[i].delete();
+						}
+						if(!hej.contains(cards[i])){
+							cards.splice(i--,1);
+						}
+						else if(cards[i].parentNode){
 							if(cards[i].parentNode.classList.contains('equips')){
 								cards[i].original='e';
 								es.push(cards[i]);
@@ -9461,15 +9475,6 @@
 								cards[i].original=null;
 							}
 						}
-						cards[i].style.transform+=' scale(0.2)';
-                        cards[i].classList.remove('glow');
-                        cards[i].recheck();
-						if(event.position){
-							cards[i].goto(event.position);
-						}
-						else{
-							cards[i].delete();
-						}
 					}
 					if(player==game.me) ui.updatehl();
 					ui.updatej(player);
@@ -9479,18 +9484,6 @@
                             cards[i].delete();
                         }
                         if(player==game.me){
-                            for(var i=player.node.handcards1.childNodes.length-1;i>0;i--){
-        						if(player.node.handcards1.childNodes[i].classList.contains('removing')==false){
-        							player.node.handcards1.childNodes[i].animate('last');
-        							break;
-        						}
-        					}
-        					for(var i=player.node.handcards2.childNodes.length-1;i>0;i--){
-        						if(player.node.handcards2.childNodes[i].classList.contains('removing')==false){
-        							player.node.handcards2.childNodes[i].animate('last');
-        							break;
-        						}
-        					}
                             ui.updatehl();
                         }
 						ui.updatej(player);
@@ -9499,18 +9492,6 @@
 					game.addVideo('lose',player,[get.cardsInfo(hs),get.cardsInfo(es),get.cardsInfo(js)]);
 					player.update();
 					game.addVideo('loseAfter',player);
-					for(var i=player.node.handcards1.childNodes.length-1;i>0;i--){
-						if(player.node.handcards1.childNodes[i].classList.contains('removing')==false){
-							player.node.handcards1.childNodes[i].animate('last');
-							break;
-						}
-					}
-					for(var i=player.node.handcards2.childNodes.length-1;i>0;i--){
-						if(player.node.handcards2.childNodes[i].classList.contains('removing')==false){
-							player.node.handcards2.childNodes[i].animate('last');
-							break;
-						}
-					}
 					event.num=0;
 					"step 1"
 					if(num<cards.length){
@@ -12140,9 +12121,14 @@
 							next.position=arguments[i];
 						}
 					}
-					if(next.cards==undefined) _status.event.next.remove(next);
-					if(next.position==undefined) next.position=ui.discardPile;
-                    next.setContent('lose');
+					if(next.cards==undefined){
+						_status.event.next.remove(next);
+					}
+					else{
+						if(next.position==undefined) next.position=ui.discardPile;
+						next.cards=next.cards.slice(0);
+					}
+					next.setContent('lose');
 					return next;
 				},
 				damage:function(){
@@ -19583,18 +19569,6 @@
 					console.log('loseAfter');
 					return;
 				}
-				for(var i=player.node.handcards1.childNodes.length-1;i>0;i--){
-					if(player.node.handcards1.childNodes[i].classList.contains('removing')==false){
-						player.node.handcards1.childNodes[i].animate('last');
-						break;
-					}
-				}
-				for(var i=player.node.handcards2.childNodes.length-1;i>0;i--){
-					if(player.node.handcards2.childNodes[i].classList.contains('removing')==false){
-						player.node.handcards2.childNodes[i].animate('last');
-						break;
-					}
-				}
 			},
 			link:function(player,bool){
 				if(player&&player.classList){
diff --git a/game/update.js b/game/update.js
index a2a8fffb9..f7e8c180b 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,16 +1,16 @@
 window.noname_update={
     version:'1.9.10.8',
-    update:'1.9.10.7',
+    // update:'1.9.10.7',
     changeLog:[
         'bug修复',
     ],
     files:[
-        'game/game.js',
+        // 'game/game.js',
         // 'game/package.js',
         // 'game/config.js',
         // 'game/source.js',
         // 'game/asset.js',
-        'card/guozhan.js',
+        // 'card/guozhan.js',
         // 'character/rank.js',
         // 'character/gwent.js',
         // 'character/ow.js',
@@ -26,11 +26,11 @@ window.noname_update={
         // 'mode/stone.js',
         // 'theme/simple/style.css',
         // 'layout/default/layout.css',
-        'layout/default/menu.css',
-        'layout/long/layout.css',
-        'layout/long2/layout.css',
+        // 'layout/default/menu.css',
+        // 'layout/long/layout.css',
+        // 'layout/long2/layout.css',
         // 'layout/mobile/layout.css',
-        'layout/newlayout/global.css',
+        // 'layout/newlayout/global.css',
         // 'layout/mode/chess.css',
         // 'extension/boss/extension.js',
     ]
diff --git a/layout/default/layout.css b/layout/default/layout.css
index d0729a33f..61d367869 100644
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -485,7 +485,7 @@ not(.removing):not(.dialog):not(.centermenu):not(.popup-container):not(.forceopa
 	width: 100%;
 	height: 20px;
 	line-height: 20px;
-	top: 44px;
+	top: 37px;
 	left: 0;
 	text-align: center;
 }
diff --git a/mode/guozhan.js b/mode/guozhan.js
index bb24307ee..8e8839810 100644
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -651,9 +651,9 @@ mode.guozhan={
 						if(!player.storage.zhangwu){
 							player.storage.zhangwu=[];
 						}
-						for(var i=0;i<trigger.cards.length;i++){
-							if(trigger.cards[i].name=='feilongduofeng'){
-								player.storage.zhangwu.add(trigger.cards[i]);
+						for(var i=0;i<trigger.stockcards.length;i++){
+							if(trigger.stockcards[i].name=='feilongduofeng'){
+								player.storage.zhangwu.add(trigger.stockcards[i]);
 							}
 						}
 					}
@@ -665,8 +665,8 @@ mode.guozhan={
 						if(lib.skill.zhangwu_count1.filter(event,player)){
 							return false;
 						}
-						for(var i=0;i<event.cards.length;i++){
-							if(event.cards[i].name=='feilongduofeng'){
+						for(var i=0;i<event.stockcards.length;i++){
+							if(event.stockcards[i].name=='feilongduofeng'){
 								return true;
 							}
 						}
@@ -674,9 +674,9 @@ mode.guozhan={
 					content:function(){
 						'step 0'
 						var list=[];
-						for(var i=0;i<trigger.cards.length;i++){
-							if(trigger.cards[i].name=='feilongduofeng'){
-								list.add(trigger.cards[i]);
+						for(var i=0;i<trigger.stockcards.length;i++){
+							if(trigger.stockcards[i].name=='feilongduofeng'){
+								list.add(trigger.stockcards[i]);
 							}
 						}
 						if(list.length){
diff --git a/theme/music/style.css b/theme/music/style.css
index a9bb2f032..1b69c31ae 100644
--- a/theme/music/style.css
+++ b/theme/music/style.css
@@ -46,12 +46,13 @@ body[data-background_color_music='blue'] #arena.mobile:not(.chess) .player[data-
 #arena:not(.long) .player.unseen .equips:not(*:empty),
 #arena.long .player.unseen2 .equips:not(*:empty){
 	border-radius:4px;
+	overflow: hidden;
 }
 
 #arena:not(.long).mobile:not(.oldlayout) .player.unseen:not([data-position="0"]) .equips:not(*:empty)>.card,
-#arena:not(.long):not(.mobile):not(.oldlayout) .player.unseen .equips:not(*:empty)>.card,
+#arena:not(.long):not(.mobile):not(.oldlayout) .player.unseen .equips:not(*:empty)>.card:not(.selected),
 #arena.long.mobile:not(.oldlayout) .player.unseen2:not([data-position="0"]) .equips:not(*:empty)>.card,
-#arena.long:not(.mobile):not(.oldlayout) .player.unseen2 .equips:not(*:empty)>.card{
+#arena.long:not(.mobile):not(.oldlayout) .player.unseen2 .equips:not(*:empty)>.card:not(.selected){
 	background: none !important;
 }
 
diff --git a/theme/simple/style.css b/theme/simple/style.css
index 336716b36..71a9bd5fc 100644
--- a/theme/simple/style.css
+++ b/theme/simple/style.css
@@ -50,11 +50,12 @@ body{
 #arena:not(.long) .player.unseen .equips:not(*:empty),
 #arena.long .player.unseen2 .equips:not(*:empty){
 	border-radius:4px;
+	overflow: hidden;
 }
 #arena:not(.long).mobile:not(.oldlayout) .player.unseen:not([data-position="0"]) .equips:not(*:empty)>.card,
-#arena:not(.long):not(.mobile):not(.oldlayout) .player.unseen .equips:not(*:empty)>.card,
+#arena:not(.long):not(.mobile):not(.oldlayout) .player.unseen .equips:not(*:empty)>.card:not(.selected),
 #arena.long.mobile:not(.oldlayout) .player.unseen2:not([data-position="0"]) .equips:not(*:empty)>.card,
-#arena.long:not(.mobile):not(.oldlayout) .player.unseen2 .equips:not(*:empty)>.card{
+#arena.long:not(.mobile):not(.oldlayout) .player.unseen2 .equips:not(*:empty)>.card:not(.selected){
 	background: none !important;
 }
 #arena.mobile:not(.chess) .player[data-position='0']>.equips>.equip5 {
diff --git a/theme/woodden/style.css b/theme/woodden/style.css
index d805f8175..29b7c883f 100644
--- a/theme/woodden/style.css
+++ b/theme/woodden/style.css
@@ -46,12 +46,13 @@ html{
 #arena.long:not(.mobile):not(.oldlayout) .player.unseen2 .equips:not(*:empty){
 	background: url('wood.png');
 	border-radius:4px;
+	overflow: hidden;
 	box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 2px 10px;
 }
 #arena:not(.long).mobile:not(.oldlayout) .player.unseen:not([data-position="0"]) .equips:not(*:empty)>.card,
-#arena:not(.long):not(.mobile):not(.oldlayout) .player.unseen .equips:not(*:empty)>.card,
+#arena:not(.long):not(.mobile):not(.oldlayout) .player.unseen .equips:not(*:empty)>.card:not(.selected),
 #arena.long.mobile:not(.oldlayout) .player.unseen2:not([data-position="0"]) .equips:not(*:empty)>.card,
-#arena.long:not(.mobile):not(.oldlayout) .player.unseen2 .equips:not(*:empty)>.card{
+#arena.long:not(.mobile):not(.oldlayout) .player.unseen2 .equips:not(*:empty)>.card:not(.selected){
 	background: none !important;
 }