From 12d716349ebfc2bcd823e46043d2cddc93ca5a16 Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Mon, 16 Dec 2019 22:49:13 +0800
Subject: [PATCH] v1.9.96.4.1

---
 game/game.js   | 44 ++++++++++++++++++++++++--------------------
 game/update.js | 17 ++++++++---------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/game/game.js b/game/game.js
index fb327bd25..2903859cb 100644
--- a/game/game.js
+++ b/game/game.js
@@ -9846,16 +9846,15 @@
 					for(var i=0;i<cards.length;i++){
 						cards[i].goto(ui.ordering);
 					}
-					if(!event.noOrdering){
-					 var evt=event.getParent();
-						if(!evt.orderingCards){
-							evt.orderingCards=[];
-							var next=game.createEvent('orderingDiscard',false,evt.getParent());
-							next.relatedEvent=evt;
-							next.setContent('orderingDiscard');
-						}
-						evt.orderingCards.addArray(cards);
+				 var evt=event.getParent();
+					if(!evt.orderingCards) evt.orderingCards=[];
+					if(!event.noOrdering&&!event.cardsOrdered){
+						event.cardsOrdered=true;
+						var next=game.createEvent('orderingDiscard',false,evt.getParent());
+						next.relatedEvent=evt;
+						next.setContent('orderingDiscard');
 					}
+					if(!event.noOrdering) evt.orderingCards.addArray(cards);
 				},
 				cardsGotoSpecial:function(){
 					for(var i=0;i<cards.length;i++){
@@ -9934,8 +9933,8 @@
 					target.discard(todis2);
 					"step 1"
 					event.cards=[player.getCards('e'),target.getCards('e')];
-					player.lose(event.cards[0],ui.special,'visible');
-					target.lose(event.cards[1],ui.special,'visible');
+					player.lose(event.cards[0],ui.ordering,'visible');
+					target.lose(event.cards[1],ui.ordering,'visible');
 					if(event.cards[0].length) player.$give(event.cards[0],target);
 					if(event.cards[1].length) target.$give(event.cards[1],player);
 					"step 2"
@@ -11382,6 +11381,7 @@
 						if(event.parent.card&&event.parent.type=='card'){
 							next.set('respondTo',[event.parent.player,event.parent.card]);
 						}
+						if(event.noOrdering) next.noOrdering=true;
 					}
 					if(event.dialog&&event.dialog.close) event.dialog.close();
 				},
@@ -13987,7 +13987,10 @@
 						var next=player.lose(cards2,ui.ordering,'visible');
 						if(event.noOrdering) next.noOrdering=true;
 						cards2.removeArray(next.cards);
-						if(cards2.length) game.cardsGotoOrdering(cards);
+						if(cards2.length){
+							var next2=game.cardsGotoOrdering(cards2);
+							if(event.noOrdering) next2.noOrdering=true;
+						}
 					}
 					for(var i=0;i<cards.length;i++){
 						if(event.animate!=false) player.$throw(cards[i]);
@@ -14020,7 +14023,7 @@
 					target.$giveAuto(event.cards2,player);
 					'step 1'
 					event.cards=event.cards1;
-					var next=player.lose(event.cards,ui.special).set('type','gain');
+					var next=player.lose(event.cards,ui.ordering);
 					if(player==game.me){
 						event.delayed=true;
 					}
@@ -14029,7 +14032,7 @@
 					}
 					'step 1'
 					event.cards=event.cards2;
-					var next=target.lose(event.cards,ui.special).set('type','gain');
+					var next=target.lose(event.cards,ui.ordering);
 					if(target==game.me){
 						event.delayed=true;
 					}
@@ -14039,8 +14042,8 @@
 					'step 2'
 					if(!event.delayed) game.delay();
 					'step 3'
-					player.gain(event.cards2,target);
-					target.gain(event.cards1,player);
+					player.gain(event.cards2);
+					target.gain(event.cards1);
 				},
 				gainMultiple:function(){
 					'step 0'
@@ -14307,15 +14310,16 @@
 					player.update();
 					game.addVideo('loseAfter',player);
 					event.num=0;
-					if(event.position==ui.ordering&&!event.noOrdering){
+					if(event.position==ui.ordering){
 						var evt=event.getParent();
-						if(!evt.orderingCards){
-							evt.orderingCards=[];
+						if(!evt.orderingCards)	evt.orderingCards=[];
+						if(!event.noOrdering&&!event.cardsOrdered){
+							event.cardsOrdered=true;
 							var next=game.createEvent('orderingDiscard',false,evt.getParent());
 							next.relatedEvent=evt;
 							next.setContent('orderingDiscard');
 						}
-						evt.orderingCards.addArray(cards);
+						if(!event.noOrdering) evt.orderingCards.addArray(cards);
 					}
 					"step 1"
 					if(num<cards.length){
diff --git a/game/update.js b/game/update.js
index 7fd5e904c..b98dfb5d7 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,8 +1,7 @@
 window.noname_update={
-	version:'1.9.96.4',
-	update:'1.9.96.3',
+	version:'1.9.96.4.1',
+	update:'1.9.96.4',
 	changeLog:[
-		'处理区',
 		'修复BUG',
 	],
 	files:[
@@ -14,27 +13,27 @@ window.noname_update={
 		//'card/guozhan.js',
 		//'card/gwent.js',
 		//'character/diy.js',
-		'character/extra.js',
+		//'character/extra.js',
 		//'character/hearth.js',
 		//'character/gujian.js',
 		//'character/gwent.js',
-		'character/mobile.js',
+		//'character/mobile.js',
 		//'character/mtg.js',
 		//'character/old.js',
-		'character/refresh.js',
+		//'character/refresh.js',
 		'character/shenhua.js',
-		'character/sp.js',
+		//'character/sp.js',
 		//'character/tw.js',
 		'character/standard.js',
 		//'character/swd.js',
 		//'character/xianjian.js',
-		'character/xinghuoliaoyuan.js',
+		//'character/xinghuoliaoyuan.js',
 		'character/yijiang.js',
 		//'character/yxs.js',
 		//'extension/boss/extension.js',
 		//'mode/identity.js',
 		//'mode/doudizhu.js',
-		'mode/guozhan.js',
+		//'mode/guozhan.js',
 		//'mode/single.js',
 		//'mode/stone.js',
 		//'mode/versus.js',