diff --git a/character/yijiang.js b/character/yijiang.js
index e037b2659..6413bdbb3 100755
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -247,7 +247,7 @@ character.yijiang={
 			popup:false,
 			content:function(){
 				delete player.storage.jiaozhao;
-				delete player.storage.jiaozhao2;
+				delete player.storage.jiaozhao_card;
 			}
 		},
 		danxin:{
@@ -345,7 +345,7 @@ character.yijiang={
 			},
 			content:function(){
 				'step 0'
-				target.chooseToUse({name:'sha'},player,-1,'止戈：使用一张杀，或将其装备区里的一张牌交给'+get.translation(player));
+				target.chooseToUse({name:'sha'},'止戈：使用一张杀，或将其装备区里的一张牌交给'+get.translation(player));
 				'step 1'
 				if(!result.bool&&target.num('e')){
 					target.chooseCard('e',true,'将其装备区里的一张牌交给'+get.translation(player));
@@ -360,6 +360,7 @@ character.yijiang={
 				}
 			},
 			ai:{
+				expose:0.2,
 				order:5,
 				result:{
 					target:-1,
@@ -730,26 +731,34 @@ character.yijiang={
 				if(info&&info.distance&&info.distance.attackFrom){
 					num-=info.distance.attackFrom;
 				}
-				trigger.player.chooseToDiscard(num,'弃置'+get.cnNumber(num)+'张牌，或令杀的伤害+1').set('ai',function(card){
-					var player=_status.event.player;
-					if(player.hp==1){
-						if(get.type(card)=='basic'){
-							return 8-ai.get.value(card);
+				if(trigger.player.num('h')<num){
+					event.directfalse=true;
+				}
+				else{
+					trigger.player.chooseToDiscard(num,'弃置'+get.cnNumber(num)+'张手牌，或令杀的伤害+1').set('ai',function(card){
+						var player=_status.event.player;
+						if(player.hp==1){
+							if(get.type(card)=='basic'){
+								return 8-ai.get.value(card);
+							}
+							else{
+								return 10-ai.get.value(card);
+							}
 						}
 						else{
-							return 10-ai.get.value(card);
+							if(num>2){
+								return 0;
+							}
+							return 8-ai.get.value(card);
 						}
-					}
-					else{
-						if(num>2){
-							return 0;
-						}
-						return 8-ai.get.value(card);
-					}
-				});
+					});
+				}
 				'step 1'
-				if(result.bool){
-					player.discard(player.get('e','1'));
+				if(!event.directfalse&&result.bool){
+					var e1=player.get('e','1');
+					if(e1){
+						player.discard(e1);
+					}
 				}
 				else{
 					trigger.num++;
diff --git a/game/game.js b/game/game.js
index 21ae22e41..f7b63d427 100755
--- a/game/game.js
+++ b/game/game.js
@@ -18684,8 +18684,16 @@
 															game.saveConfig('extension_'+extname+'_'+i,game.importedPack.config[i].init);
 														}
 													}
-													if(game.importedPack.image&&lib.db){
-														for(var i=0;i<game.importedPack.image.length;i++){
+                                                    var imglist=[];
+                                                    for(var i in zip.files){
+                                                        if(i[0]!='.'&&i[0]!='_'){
+                                                            if(i.indexOf('.jpg')!=-1||i.indexOf('.png')!=-1){
+                                                                imglist.push(i);
+                                                            }
+                                                        }
+                                                    }
+													if(imglist.length&&lib.db){
+														for(var i=0;i<imglist.length;i++){
 															var buttons=page.querySelectorAll('.button.character');
 															for(var j=0;j<buttons.length;j++){
 																if(buttons[j].link==i){
@@ -18693,7 +18701,7 @@
 																	break;
 																}
 															}
-															var imgname=game.importedPack.image[i];
+															var imgname=imglist[i];
 															var str=zip.file(imgname).asArrayBuffer();
 															if(str){
 																var blob=new Blob([str]);