diff --git a/character/shenhua.js b/character/shenhua.js
index 0c9303b6b..5fbe60568 100644
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -2648,7 +2648,14 @@ character.shenhua={
 			content:function(){
 				player.draw(3);
 				player.turnOver();
-			}
+			},
+			ai:{
+				effect:{
+					target:function(card,player,target){
+						if(card.name=='guiyoujie') return [0,1];
+					}
+				}
+			},
 		},
 		liegong:{
 			audio:2,
diff --git a/character/yijiang.js b/character/yijiang.js
index 4609bb627..015530875 100755
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -403,7 +403,6 @@ character.yijiang={
 					player.storage.kuangbi_draw_source=target;
 					player.syncStorage('kuangbi_draw');
 					player.addSkill('kuangbi_draw');
-					game.delay();
 				}
 			},
 			ai:{
@@ -4689,7 +4688,8 @@ character.yijiang={
 				}
 				if(get.type(card)=='equip'){
 					event.target.equip(card);
-					event.target.$draw(cards);
+					event.target.$draw(card);
+					game.delay();
 				}
 				else{
 					event.target.gain(cards,'gain2');
diff --git a/game/game.js b/game/game.js
index 624df9b0c..8b9a4b88f 100755
--- a/game/game.js
+++ b/game/game.js
@@ -2303,12 +2303,16 @@
 							map.enable_all.hide();
 							map.four_assign.hide();
 						}
+                        if(config.versus_mode=='jiange'||config.versus_mode=='two'){
+                            map.free_choose.show();
+                        }
+                        else{
+                            map.free_choose.hide();
+                        }
 						if(config.versus_mode=='jiange'){
-							map.free_choose.show();
 							map.double_character_jiange.show();
 						}
 						else{
-							map.free_choose.hide();
 							map.double_character_jiange.hide();
 						}
                         if(config.versus_mode=='two'){
diff --git a/game/update.js b/game/update.js
index 0b45fcbf8..e08209ab5 100644
--- a/game/update.js
+++ b/game/update.js
@@ -10,6 +10,8 @@ window.noname_update={
             'game/asset.js',
             'game/game.js',
             'mode/versus.js',
+            'character/yijiang.js',
+            'character/shenhua.js'
         ],
         '1.8.11':[],
         '1.8.12':[],
diff --git a/mode/versus.js b/mode/versus.js
index 33642bc57..63df23069 100755
--- a/mode/versus.js
+++ b/mode/versus.js
@@ -566,10 +566,83 @@ mode.versus={
 				}
 				var choose=[];
 				event.list=list;
-				var dialog=ui.create.dialog('选择角色',[list.randomRemove(7),'character']);
+				var dialog=ui.create.dialog('选择角色',[list.randomGets(7),'character']);
 				game.me.chooseButton(true,dialog);
+
+				ui.create.cheat=function(){
+					_status.createControl=ui.cheat2;
+					ui.cheat=ui.create.control('更换',function(){
+						if(ui.cheat2&&ui.cheat2.dialog==_status.event.dialog){
+							return;
+						}
+						if(game.changeCoin){
+							game.changeCoin(-3);
+						}
+						_status.event.dialog.close();
+						_status.event.dialog=ui.create.dialog('选择角色',[list.randomGets(7),'character']);
+						game.uncheck();
+						game.check();
+					});
+					delete _status.createControl;
+				};
+				event.dialogxx=ui.create.characterDialog();
+				ui.create.cheat2=function(){
+					ui.cheat2=ui.create.control('自由选将',function(){
+						if(this.dialog==_status.event.dialog){
+							if(game.changeCoin){
+								game.changeCoin(50);
+							}
+							this.dialog.close();
+							_status.event.dialog=this.backup;
+							this.backup.open();
+							delete this.backup;
+							game.uncheck();
+							game.check();
+							if(ui.cheat){
+								ui.cheat.style.opacity=1;
+							}
+							if(ui.cheat2x){
+								ui.cheat2x.close();
+								delete ui.cheat2x;
+							}
+						}
+						else{
+							if(game.changeCoin){
+								game.changeCoin(-10);
+							}
+							ui.cheat2x=ui.create.groupControl(_status.event.parent.dialogxx);
+							this.backup=_status.event.dialog;
+							_status.event.dialog.close();
+							_status.event.dialog=_status.event.parent.dialogxx;
+							this.dialog=_status.event.dialog;
+							this.dialog.open();
+							game.uncheck();
+							game.check();
+							if(ui.cheat){
+								ui.cheat.style.opacity=0.6;
+							}
+						}
+					});
+				}
+				if(!ui.cheat&&get.config('change_choice'))
+				ui.create.cheat();
+				if(!ui.cheat2&&get.config('free_choose'))
+				ui.create.cheat2();
 				'step 1'
+				if(ui.cheat){
+					ui.cheat.close();
+					delete ui.cheat;
+				}
+				if(ui.cheat2){
+					ui.cheat2.close();
+					delete ui.cheat2;
+				}
+				if(ui.cheat2x){
+					ui.cheat2x.close();
+					delete ui.cheat2x;
+				}
 				game.me.init(result.links[0]);
+				game.addRecentCharacter(game.me.name);
 				for(var i=0;i<game.players.length;i++){
 					if(game.players[i]!=game.me){
 						game.players[i].init(event.list.randomRemove());