diff --git a/game/game.js b/game/game.js
index 405eb0a6c..83c6acd66 100644
--- a/game/game.js
+++ b/game/game.js
@@ -8845,7 +8845,7 @@
 							event.fakeforce=false;
 						}
 					}
-					if(event.player.isUnderControl()||(event.player.handcardsVisible&&event.player!=game.me)){
+					if(event.player.isUnderControl()){
 						event.result={
 							bool:false
 						}
@@ -10023,7 +10023,7 @@
 							event.dialog.add('手牌');
 							var hs=target.getCards('h');
 							hs.randomSort();
-							if(event.visible||target.isUnderControl(true)||target.handcardsVisible){
+							if(event.visible||target.isUnderControl(true)){
 								event.dialog.add(hs);
                                 directh=false;
 							}
@@ -10117,7 +10117,7 @@
 							event.dialog.add('手牌');
 							var hs=target.getCards('h');
 							hs.randomSort();
-							if(event.visible||target.isUnderControl(true)||target.handcardsVisible){
+							if(event.visible||target.isUnderControl(true)){
 								event.dialog.add(hs);
                                 directh=false;
 							}
@@ -10228,7 +10228,7 @@
 							event.dialog.add('手牌');
 							var hs=target.getCards('h');
 							hs.randomSort();
-							if(event.visible||target.isUnderControl(true)||target.handcardsVisible){
+							if(event.visible||target.isUnderControl(true)){
 								event.dialog.add(hs);
                                 directh=false;
 							}
@@ -15626,6 +15626,7 @@
 					if(lib.config.mode=='versus'){
 						if(_status.mode=='three') return this.side==me.side;
 						if(_status.mode=='standard') return lib.storage.single_control&&this.side==me.side;
+						if(_status.mode=='four') return get.config('four_phaseswap')&&this.side==me.side;
 						return false;
 					}
 					else if(lib.config.mode=='boss'){
@@ -16504,9 +16505,7 @@
 				$giveAuto:function(card,player){
 					if(Array.isArray(card)&&card.length==0) return;
 					var args=Array.from(arguments);
-					if(_status.connectMode||(
-						!this.isUnderControl(true)&&!player.isUnderControl(true)&&
-						!this.handcardsVisible&&!player.handcardsVisible)){
+					if(_status.connectMode||(!this.isUnderControl(true)&&!player.isUnderControl(true))){
 						if(Array.isArray(card)){
 							card=card.length;
 						}
@@ -18352,7 +18351,7 @@
 					}
 					if(!_status.connectMode&&lib.config.wuxie_self&&event.getParent().state){
 						var tw=event.getTrigger().parent;
-						if((tw.player.isUnderControl(true)||tw.player.handcardsVisible)&&tw.targets&&tw.targets.length==1&&!tw.noai){
+						if(tw.player.isUnderControl(true)&&tw.targets&&tw.targets.length==1&&!tw.noai){
 							return true;
 						}
 					}
@@ -18459,29 +18458,6 @@
 					game.modeSwapPlayer(player);
 				},
 			},
-			autophase:{
-				trigger:{player:['chooseToUseBegin','chooseToRespondBegin','chooseToDiscardBegin','chooseToCompareBegin',
-				'chooseButtonBegin','chooseCardBegin','chooseTargetBegin','chooseCardTargetBegin','chooseControlBegin',
-				'chooseBoolBegin','choosePlayerCardBegin','discardPlayerCardBegin','gainPlayerCardBegin']},
-				forced:true,
-				priority:100,
-				popup:false,
-				filter:function(event,player){
-					if(player==game.me) return false;
-					if(event.autochoose&&event.autochoose()) return false;
-					if(lib.filter.wuxieSwap(event)) return false;
-					if(_status.auto) return false;
-					if(!player.isFriendOf(game.me)) return false;
-					if(_status.autophasefilter&&_status.autophasefilter(event,player)){
-						return true;
-					}
-					if(_status.currentPhase!=player) return false;
-					return true;
-				},
-				content:function(){
-					game.swapPlayer(player);
-				},
-			},
             fengyin:{
                 init:function(player,skill){
                     var skills=player.getSkills(true,false);
@@ -39563,7 +39539,7 @@
 				}
 				uiintro.add(capt);
 
-                if(node.isUnderControl()||(node.handcardsVisible&&node!=game.me)){
+                if(node.isUnderControl()){
                     var hs=node.getCards('h');
                     if(hs.length){
                         uiintro.add('<div class="text center">手牌</div>');
diff --git a/mode/versus.js b/mode/versus.js
index 12d5e4b0e..71ad3e64f 100644
--- a/mode/versus.js
+++ b/mode/versus.js
@@ -1046,26 +1046,11 @@ mode.versus={
 					_status.ladder_mmr=0;
 				}
 				if(get.config('four_phaseswap')){
-					game.addGlobalSkill('autophase');
+					game.addGlobalSkill('autoswap');
 					if(lib.config.show_handcardbutton){
 						ui.versushs=ui.create.system('手牌',null,true);
 						lib.setPopped(ui.versushs,game.versusHoverHandcards,220);
 					}
-					ui.autophase=ui.create.system('自动切换',function(){
-						this.classList.toggle('glow');
-						game.save('autophase_four',!this.classList.contains('glow'));
-					},true);
-					if(!lib.storage.autophase_four){
-						ui.autophase.classList.add('glow');
-					}
-					_status.autophasefilter=function(){
-						return ui.autophase.classList.contains('glow');
-					}
-					for(var i=0;i<game.players.length;i++){
-						if(game.players[i].side==game.me.side){
-							game.players[i].handcardsVisible=true;
-						}
-					}
 				}
 				"step 1"
 				if(event.current==game.me||(event.four_assign&&event.current.side==game.me.side)){
@@ -2731,8 +2716,13 @@ mode.versus={
 			}
 		},
 		modeSwapPlayer:function(player){
-			game.swapControl(player);
-			game.onSwapControl();
+			if(_status.mode=='four'){
+				game.swapPlayer(player);
+			}
+			else{
+				game.swapControl(player);
+				game.onSwapControl();
+			}
 		},
 		updateLineMe:function(opacity,player){
 			if(!player){