From cffbbd96f051d1c7f522fe0382f0593521a1d8ac Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Mon, 11 Apr 2022 09:20:08 +0800
Subject: [PATCH] fix

---
 game/game.js   | 24 +++++++++++++++++++-----
 game/update.js | 36 ++++++++++++++++++------------------
 2 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/game/game.js b/game/game.js
index 7a179fcf7..dea11fa0f 100644
--- a/game/game.js
+++ b/game/game.js
@@ -14731,7 +14731,7 @@
 					}
 					if(!get.info(card,false).noForceDie) event.forceDie=true;
 					if(cards.length){
-						var owner=get.owner(cards[0]);
+						var owner=(get.owner(cards[0])||player);
 						var next=owner.lose(cards,'visible',ui.ordering).set('type','use');
 						var directDiscard=[];
 						for(var i=0;i<cards.length;i++){
@@ -15497,7 +15497,7 @@
 					}
 					player.actionHistory[player.actionHistory.length-1].respond.push(event);
 					if(cards.length){
-						var owner=get.owner(cards[0]);
+						var owner=(get.owner(cards[0])||player);
 						var next=owner.lose(cards,'visible',ui.ordering).set('type','use');
 						var directDiscard=[];
 						for(var i=0;i<cards.length;i++){
@@ -18099,6 +18099,8 @@
 						equips:this.getCards('e'),
 						judges:this.getCards('j'),
 						specials:this.getCards('s'),
+						expansions:this.getCards('x'),
+						expansion_gaintag:[],
 						disableJudge:this.storage._disableJudge,
 						disableEquip:this.storage.disableEquip,
 						views:[],
@@ -18121,6 +18123,9 @@
 					for(var i=0;i<state.handcards.length;i++){
 						state.gaintag[i]=state.handcards[i].gaintag;
 					}
+					for(var i=0;i<state.expansions.length;i++){
+						state.expansion_gaintag[i]=state.expansions[i].gaintag;
+					}
 					if(this.getModeState){
 						state.mode=this.getModeState();
 					}
@@ -20407,9 +20412,9 @@
 						var sort=lib.config.sort_card(cards[i]);
 						this.node.expansions.insertBefore(cards[i],this.node.expansions.firstChild);
 					}
-					if(broadcast!==false) game.broadcast(function(player,cards){
-						player.$addToExpansion(cards);
-					},this,cards);
+					if(broadcast!==false) game.broadcast(function(player,cards,gaintag){
+						player.$addToExpansion(cards,null,gaintag);
+					},this,cards,gaintag);
 					return this;
 				},
 				directgain:function(cards,broadcast,gaintag){
@@ -28535,6 +28540,15 @@
 							for(var i=0;i<info.specials.length;i++){
 								info.specials[i].classList.add('glows');
 							}
+							if(info.expansions.length){
+								var expansion_gaintag=[];
+								player.$addToExpansion(info.expansions);
+								for(var i=0;i<info.expansions.length;i++){
+									info.expansions[i].addGaintag(info.expansion_gaintag[i]);
+									expansion_gaintag.addArray(info.expansion_gaintag[i]);
+								}
+								for(var i of expansion_gaintag) player.markSkill[i];
+							}
 							for(var i=0;i<info.judges.length;i++){
 								if(info.views[i]&&info.views[i]!=info.judges[i]){
 									info.judges[i].classList.add('fakejudge');
diff --git a/game/update.js b/game/update.js
index 8561b1fce..6d112895e 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,6 +1,6 @@
 window.noname_update={
-	version:'1.9.113',
-	update:'1.9.112.3',
+	version:'1.9.113.1',
+	update:'1.9.113',
 	changeLog:[
 		'功能性更新：E(x)pansion区域独立化（武将牌上的牌所在区域）',
 		'bug修复',
@@ -8,7 +8,7 @@ window.noname_update={
 	files:[
 		//'card/extra.js',
 		//'card/gujian.js',
-		'card/guozhan.js',
+		//'card/guozhan.js',
 		//'card/gwent.js',
 		//'card/huanlekapai.js',
 		//'card/mtg.js',
@@ -17,32 +17,32 @@ window.noname_update={
 		//'card/swd.js',
 		//'card/yunchou.js',
 		//'card/yingbian.js',
-		'card/yongjian.js',
+		//'card/yongjian.js',
 		//'card/zhenfa.js',
 		//'card/zhulu.js',
-		'character/diy.js',
-		'character/extra.js',
+		//'character/diy.js',
+		//'character/extra.js',
 		//'character/hearth.js',
 		//'character/gujian.js',
 		//'character/gwent.js',
         //'character/hearth.js',
-		'character/mobile.js',
+		//'character/mobile.js',
 		//'character/mtg.js',
 		//'character/offline.js',
-		'character/old.js',
+		//'character/old.js',
 		//'character/ow.js',
 		//'character/rank.js',
-		'character/refresh.js',
-		'character/shenhua.js',
-		'character/sp.js',
-		'character/sp2.js',
-		'character/tw.js',
-		'character/standard.js',
+		//'character/refresh.js',
+		//'character/shenhua.js',
+		//'character/sp.js',
+		//'character/sp2.js',
+		//'character/tw.js',
+		//'character/standard.js',
 		//'character/swd.js',
 		//'character/xianjian.js',
-		'character/xinghuoliaoyuan.js',
-		'character/yingbian.js',
-		'character/yijiang.js',
+		//'character/xinghuoliaoyuan.js',
+		//'character/yingbian.js',
+		//'character/yijiang.js',
 		//'character/yxs.js',
 		//'extension/boss/extension.js',
 		//'layout/default/layout.css',
@@ -55,7 +55,7 @@ window.noname_update={
 		//'mode/chess.js',
 		//'mode/connect.js',
 		//'mode/doudizhu.js',
-		'mode/guozhan.js',
+		//'mode/guozhan.js',
 		//'mode/identity.js',
 		//'mode/single.js',
 		//'mode/stone.js',