diff --git a/character/gwent.js b/character/gwent.js
index 5b61b970a..9fe23e6d8 100644
--- a/character/gwent.js
+++ b/character/gwent.js
@@ -525,7 +525,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			yunhuo:{
 				trigger:{player:'phaseBegin'},
 				filter:function(event,player){
-					return game.roundNumber%4==0&&event.skill!='yunhuo2';
+					return game.roundNumber%4==0&&event.skill!='yunhuo';
 				},
 				forced:true,
 				content:function(){
diff --git a/character/hearth.js b/character/hearth.js
index 554d57e6f..b75c5a94b 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -1002,7 +1002,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
                         return get.max(list,get.skillRank,'item');
     				};
     				if(event.isMine()){
-    					var dialog=ui.create.dialog();
+    					var dialog=ui.create.dialog('forcebutton');
     					dialog.add('选择获得一项技能');
     					var clickItem=function(){
     						_status.event._result=this.link;
@@ -3236,7 +3236,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     					return get.max(list,get.skillRank,'item');
     				};
     				if(event.isMine()){
-    					var dialog=ui.create.dialog();
+    					var dialog=ui.create.dialog('forcebutton');
     					dialog.add('选择获得一项技能');
     					var clickItem=function(){
     						_status.event._result=this.link;
diff --git a/character/swd.js b/character/swd.js
index bf07166a8..08b278ce1 100644
--- a/character/swd.js
+++ b/character/swd.js
@@ -6777,7 +6777,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     					return get.max(list,get.skillRank,'item');
     				};
     				if(event.isMine()){
-                        var dialog=ui.create.dialog();
+                        var dialog=ui.create.dialog('forcebutton');
         				dialog.add('选择获得一项技能');
         				_status.event.list=list;
         				var clickItem=function(){
@@ -6896,7 +6896,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     					}
     				}
     				if(onlylist) return list;
-    				var dialog=ui.create.dialog();
+    				var dialog=ui.create.dialog('forcebutton');
     				dialog.add('选择获得一项技能');
     				_status.event.list=list;
     				var clickItem=function(){
@@ -8624,9 +8624,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				player.removeSkill('mailun8');
     				if(event.isMine()){
     					ui.auto.hide();
-    					event.dialog=ui.create.dialog('脉轮：选择一个效果');
-                        event.dialog.forcebutton=true;
-                        event.dialog.classList.add('forcebutton');
+    					event.dialog=ui.create.dialog('脉轮：选择一个效果','forcebutton');
     					var effects=lib.skill.mailun.effects;
     					var clickItem=function(){
     						event.choice=this.link;
diff --git a/character/yijiang.js b/character/yijiang.js
index c451792bc..c6cc8f533 100644
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -2964,6 +2964,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				return event.skill=='zhanjue';
     			},
     			content:function(){
+                    if(typeof player.storage.zhanjue!='number'){
+                        player.storage.zhanjue=0;
+                    }
     				if(player.storage.zhanjue2==player){
     					player.draw(2);
     					player.storage.zhanjue+=2;
diff --git a/game/game.js b/game/game.js
index e66ee0468..69e8cef65 100644
--- a/game/game.js
+++ b/game/game.js
@@ -35071,6 +35071,7 @@
 				var i;
 				var hidden=false;
                 var notouchscroll=false;
+				var forcebutton=false;
 				var dialog=ui.create.div('.dialog');
 				dialog.contentContainer=ui.create.div('.content-container',dialog);
 				dialog.content=ui.create.div('.content',dialog.contentContainer);
@@ -35084,6 +35085,7 @@
 					if(typeof arguments[i]=='boolean') dialog.static=arguments[i];
                     else if(arguments[i]=='hidden') hidden=true;
 					else if(arguments[i]=='notouchscroll') notouchscroll=true;
+					else if(arguments[i]=='forcebutton') forcebutton=true;
 					else dialog.add(arguments[i]);
 				}
 				if(!hidden){
@@ -35096,6 +35098,10 @@
     				dialog.contentContainer.style.WebkitOverflowScrolling='touch';
     				dialog.ontouchstart=ui.click.dragtouchdialog;
                 }
+				if(forcebutton){
+					dialog.forcebutton=true;
+					dialog.classList.add('forcebutton');
+				}
 				return dialog;
 			},
 			line2:function(){