diff --git a/game/game.js b/game/game.js
index de7ce7bc7..68cbd78da 100644
--- a/game/game.js
+++ b/game/game.js
@@ -23466,13 +23466,14 @@
 			filterCard:function(card,player,event){
 				var info=get.info(card);
 				//if(info.toself&&!lib.filter.targetEnabled(card,player,player)) return false;
+				if(player==undefined) player=_status.event.player;
 				var filterTarget=(event&&event.filterTarget)?event.filterTarget:lib.filter.filterTarget;
 				return (lib.filter.cardEnabled(card,player,event)&&
 					lib.filter.cardUsable(card,player,event)&&
-					(info.notarget||game.hasPlayer(function(current){
+					(info.notarget||!player||game.hasPlayer(function(current){
 						return filterTarget(card,player,current);
 					}))
-					);
+				);
 			},
 			targetEnabled:function(card,player,target){
 				if(!card) return false;
@@ -23754,6 +23755,7 @@
 				}
 			},
 			autoswap:{
+				firstDo:true,
 				trigger:{player:['playercontrol','chooseToUseBegin','chooseToRespondBegin','chooseToDiscardBegin','chooseToCompareBegin',
 				'chooseButtonBegin','chooseCardBegin','chooseTargetBegin','chooseCardTargetBegin','chooseControlBegin',
 				'chooseBoolBegin','choosePlayerCardBegin','discardPlayerCardBegin','gainPlayerCardBegin']},
diff --git a/game/update.js b/game/update.js
index 0879044f9..9fe0e47ad 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,16 +1,16 @@
 window.noname_update={
-	version:'1.9.96.7.1',
-	update:'1.9.96.7',
+	version:'1.9.96.7.2',
+	update:'1.9.96.7.1',
 	changeLog:[
 		'BUG修复',
 	],
 	files:[
-		//'card/extra.js',
+		'card/extra.js',
 		//'card/huanlekapai.js',
 		//'card/sp.js',
-		'card/standard.js',
+		//'card/standard.js',
 		//'card/swd.js',
-		'card/guozhan.js',
+		//'card/guozhan.js',
 		//'card/gwent.js',
 		//'character/diy.js',
 		//'character/extra.js',
@@ -20,15 +20,15 @@ window.noname_update={
 		//'character/mobile.js',
 		//'character/mtg.js',
 		//'character/old.js',
-		'character/refresh.js',
-		//'character/shenhua.js',
-		'character/sp.js',
+		//'character/refresh.js',
+		'character/shenhua.js',
+		//'character/sp.js',
 		//'character/tw.js',
 		//'character/standard.js',
 		//'character/swd.js',
 		//'character/xianjian.js',
-		'character/xinghuoliaoyuan.js',
-		'character/yijiang.js',
+		//'character/xinghuoliaoyuan.js',
+		//'character/yijiang.js',
 		//'character/yxs.js',
 		//'extension/boss/extension.js',
 		//'layout/default/layout.css',
@@ -37,7 +37,7 @@ window.noname_update={
 		//'mode/guozhan.js',
 		//'mode/single.js',
 		//'mode/stone.js',
-		//'mode/versus.js',
+		'mode/versus.js',
 		//'mode/boss.js',
 		'game/game.js',
 		//'game/config.js',