diff --git a/card/sp.js b/card/sp.js
index 6d208acb3..bc956859e 100644
--- a/card/sp.js
+++ b/card/sp.js
@@ -19,7 +19,15 @@ card.sp={
 			type:'equip',
 			subtype:'equip5',
 			nomod:true,
-			skills:['muniu_skill','muniu_skill2','muniu_skill7'],
+			onEquip:function(){
+				player.markSkill('muniu_skill6');
+			},
+			onLose:function(){
+				player.unmarkSkill('muniu_skill6');
+			},
+			equipDelay:false,
+			loseDelay:false,
+			skills:['muniu_skill','muniu_skill2','muniu_skill6','muniu_skill7'],
 			ai:{
 				basic:{
 					equipValue:function(card){
@@ -306,11 +314,13 @@ card.sp={
 				if(result.bool){
 					var card=player.get('e','5');
 					result.targets[0].equip(card);
-					player.addTempSkill('muniu_skill6','equipAfter');
 					player.$give(card,result.targets[0]);
 					player.line(result.targets,'green');
 					game.delay();
 				}
+				else{
+					player.updateMarks();
+				}
 			},
 			ai:{
 				save:true,
@@ -384,6 +394,7 @@ card.sp={
 					var muniu=player.get('e','5');
 					muniu.cards.remove(result.links[0]);
 					lib.skill.muniu_skill.sync(muniu);
+					player.updateMarks();
 				}
 			},
 			ai:{
@@ -447,6 +458,7 @@ card.sp={
 								muniu.cards.remove(result.card);
 								lib.skill.muniu_skill.sync(muniu);
 							}
+							player.updateMarks();
 						}
 					}
 				},
@@ -466,7 +478,36 @@ card.sp={
 				value:-1
 			}
 		},
-		muniu_skill6:{},
+		muniu_skill6:{
+			mark:true,
+			intro:{
+				content:function(storage,player){
+					var muniu=player.get('e','5');
+					if(!muniu||!muniu.cards||!muniu.cards.length) return '共有〇张牌';
+					if(player.isUnderControl(true)){
+						return get.translation(muniu.cards);
+					}
+					else{
+						return '共有'+get.cnNumber(muniu.cards.length)+'张牌';
+					}
+				},
+				mark:function(dialog,storage,player){
+					var muniu=player.get('e','5');
+					if(!muniu||!muniu.cards||!muniu.cards.length) return '共有〇张牌';
+					if(player.isUnderControl(true)){
+						dialog.addAuto(muniu.cards);
+					}
+					else{
+						return '共有'+get.cnNumber(muniu.cards.length)+'张牌';
+					}
+				},
+				markcount:function(storage,player){
+					var muniu=player.get('e','5');
+					if(muniu&&muniu.cards) return muniu.cards.length;
+					return 0;
+				}
+			}
+		},
 		muniu_skill7:{
 			filter:function(){return false},
 			hiddenCard:function(player,name){
@@ -484,17 +525,17 @@ card.sp={
 			forced:true,
 			popup:false,
 			filter:function(event,player){
+				if(event.type=='equip') return false;
 				for(var i=0;i<event.cards.length;i++){
-					if(event.cards[i].name=='muniu'&&event.cards[i].original=='e'&&
-						player.hasSkill('muniu_skill6')==false&&
-						get.position(event.cards[i])==='d') return true;
+					if(event.cards[i].name.indexOf('muniu')==0&&event.cards[i].original=='e'){
+						return true;
+					}
 				}
 				return false;
 			},
 			content:function(){
 				for(var i=0;i<trigger.cards.length;i++){
-					if(trigger.cards[i].name=='muniu'&&trigger.cards[i].original=='e'&&
-						player.hasSkill('muniu_skill6')==false){
+					if(trigger.cards[i].name.indexOf('muniu')==0&&trigger.cards[i].original=='e'){
 						var card=trigger.cards[i];
 						var card2;
 						if(card.cards&&card.cards.length){
@@ -570,7 +611,8 @@ card.sp={
 		muniu_skill2:'流马',
 		muniu_skill3:'流马',
 		muniu_skill4:'流马',
-		muniu_skill6:'流马',
+		muniu_skill6:'木牛流马',
+		muniu_skill6_bg:'辎',
 		muniu_skill4_backup:'流马',
 		muniu_info:'出牌阶段限一次，你可以将一张手牌扣置于你装备区里的【木牛流马】下，若如此做，你可以将此装备移动到一名其他角色的装备区里；你可以将此装备牌下的牌如手牌般使用或打出。',
 		muniu_skill_info:'出牌阶段限一次，你可以将一张手牌扣置于你装备区里的【木牛流马】下，若如此做，你可以将此装备移动到一名其他角色的装备区里；你可以将此装备牌下的牌如手牌般使用或打出。',
diff --git a/card/swd.js b/card/swd.js
index 9782fe9ed..2681bc7d5 100644
--- a/card/swd.js
+++ b/card/swd.js
@@ -494,10 +494,16 @@ card.swd={
 			type:'equip',
 			subtype:'equip5',
 			nomod:true,
+			onEquip:function(){
+				player.markSkill('lianyaohu_skill');
+			},
+			onLose:function(){
+				player.unmarkSkill('lianyaohu_skill');
+			},
 			ai:{
 				equipValue:6
 			},
-			skills:['lianhua','shouna']
+			skills:['lianhua','shouna','lianyaohu_skill']
 		},
 		haotianta:{
 			fullskin:true,
@@ -1744,6 +1750,32 @@ card.swd={
 		},
 	},
 	skill:{
+		lianyaohu_skill:{
+			mark:true,
+			intro:{
+				content:function(storage,player){
+					var card=player.get('e','5');
+					if(card&&card.storage.shouna&&card.storage.shouna.length){
+						return '共有'+get.cnNumber(card.storage.shouna.length)+'张牌';
+					}
+					return '共有〇张牌';
+				},
+				mark:function(dialog,storage,player){
+					var card=player.get('e','5');
+					if(card&&card.storage.shouna&&card.storage.shouna.length){
+						dialog.addAuto(card.storage.shouna);
+					}
+					else{
+						return '共有〇张牌';
+					}
+				},
+				markcount:function(storage,player){
+					var card=player.get('e','5');
+					if(card&&card.storage.shouna) return card.storage.shouna.length;
+					return 0;
+				}
+			}
+		},
 		_shencaojie:{
 			trigger:{source:'damageBegin'},
 			direct:true,
@@ -1864,7 +1896,7 @@ card.swd={
 			content:function(){
 				'step 0'
 				player.addSkill('shuchui2');
-				player.storage.shuchui2=0;
+				player.storage.shuchui2=false;
 				event.num=0;
 				'step 1'
 				var card=player.get('h','sha')[0];
@@ -1873,7 +1905,7 @@ card.swd={
 				}
 				else{
 					if(player.storage.shuchui2){
-						player.draw(player.storage.shuchui2);
+						player.draw();
 					}
 					player.removeSkill('shuchui2');
 					event.finish();
@@ -1884,7 +1916,7 @@ card.swd={
 				}
 				else{
 					if(player.storage.shuchui2){
-						player.draw(player.storage.shuchui2);
+						player.draw();
 					}
 					player.removeSkill('shuchui2');
 				}
@@ -1906,10 +1938,10 @@ card.swd={
 				delete player.storage.shuchui2;
 			},
 			filter:function(event,player){
-				return event.card&&event.card.name=='sha';
+				return event.card&&event.card.name=='sha'&&!player.storage.shuchui2;
 			},
 			content:function(){
-				player.storage.shuchui2++;
+				player.storage.shuchui2=true;
 			}
 		},
 		xuejibingbao:{
@@ -2356,6 +2388,7 @@ card.swd={
 				return false;
 			},
 			usable:1,
+			delay:false,
 			content:function(){
 				"step 0"
 				event.hu=player.get('e','5');
@@ -2391,6 +2424,41 @@ card.swd={
 			}
 		},
 		shouna:{
+			enable:'phaseUse',
+			filter:function(event,player){
+				return player.num('h')>0;
+			},
+			usable:1,
+			filterCard:true,
+			check:function(card){
+				return 6-ai.get.value(card);
+			},
+			filterTarget:function(card,player,target){
+				return target!=player&&target.num('h')>0;
+			},
+			content:function(){
+				var card=target.get('h').randomGet();
+				var hu=player.get('e','5');
+				if(card&&hu){
+					if(!hu.storage.shouna){
+						hu.storage.shouna=[];
+					}
+					target.$give(card,player);
+					target.lose(card,ui.special);
+					hu.storage.shouna.push(card);
+					player.updateMarks();
+				}
+			},
+			ai:{
+				order:5,
+				result:{
+					target:function(player,target){
+						return -1/Math.sqrt(1+target.num('h'));
+					}
+				}
+			}
+		},
+		shouna_old:{
 			trigger:{global:'discardAfter'},
 			filter:function(event,player){
 				if(player.hasSkill('shouna2')) return false;
@@ -4286,7 +4354,7 @@ card.swd={
 		fengyinzhidan:'封印之蛋',
 		fengyinzhidan_info:'随机使用三张非延时锦囊牌（随机指定目标）',
 		shuchui:'鼠槌',
-		shuchui_info:'出牌阶段限一次，你可以指定一名攻击范围内的角色，依次将手牌中的至多3张杀对该角色使用，杀每造成一次伤害你摸一张牌',
+		shuchui_info:'出牌阶段限一次，你可以指定一名攻击范围内的角色，依次将手牌中的至多3张杀对该角色使用，若杀造成了伤害，你摸一张牌',
 		zhiluxiaohu:'指路小狐',
 		zhiluxiaohu_info:'出牌阶段对自己使用，视为对一名随机敌方角色使用一张杀，然后摸一张牌',
 		xuejibingbao:'雪肌冰鲍',
@@ -4539,6 +4607,8 @@ card.swd={
 		xuanyuanjian2:'轩辕剑',
 		pangufu:'盘古斧',
 		lianyaohu:'炼妖壶',
+		lianyaohu_skill:'炼妖壶',
+		lianyaohu_skill_bg:'壶',
 		haotianta:'昊天塔',
 		fuxiqin:'伏羲琴',
 		shennongding:'神农鼎',
@@ -4557,7 +4627,7 @@ card.swd={
 		lianhua:'炼化',
 		lianhua_info:'出牌阶段限一次，你可以弃置两张炼妖壶中的牌，从牌堆中获得一张与弃置的牌类别均不相同的牌',
 		shouna:'收纳',
-		shouna_info:'当一名其他角色于回合外弃置的卡牌进入弃牌堆后，你可以选择其中的一张放入炼妖壶，每名角色的回合限一次',
+		shouna_info:'出牌阶段限一次，你可以弃置一张手牌，并将一名其他角色的一张手牌置入炼妖壶',
 		donghuangzhong_info:'回合结束阶段，你可以弃置一张手牌，并选择一名角色将一张随机单体延时锦囊置入其判定区',
 		xuanyuanjian_info:'锁定技，每当你即将造成一次伤害，你令此伤害加一并变为雷属性，此伤害结算后，你流失一点体力并摸一张牌。任何时候，若你体力值不超过2，则立即失去轩辕剑',
 		pangufu_info:'锁定技，每当你造成一次伤害，受伤角色须弃置一张牌',
@@ -4568,7 +4638,7 @@ card.swd={
 		nvwashi_info:'当一名角色濒死时，若你的体力值大于1，你可以失去一点体力并令其回复一点体力',
 		kongxin_info:'出牌阶段限一次，你可以与一名其他角色进行拼点，若你赢，你可以指定另一名角色视为对方对该角色使用一张杀，否则对方可弃置你一张牌',
 		fuxiqin_info:'出牌阶段限一次，你可以与一名其他角色进行拼点，若你赢，你可以指定另一名角色视为对方对该角色使用一张杀，否则对方可弃置你一张牌',
-		lianyaohu_info:'当一名其他角色于回合外弃置的卡牌进入弃牌堆后，你将其放入炼妖壶（每回合只发动一次）；出牌阶段限一次，你可以弃置两张炼妖壶中的牌，从牌堆中获得一张与弃置的牌类别均不相同的牌',
+		lianyaohu_info:'出牌阶段各限一次，你可以选择一项：1.弃置一张手牌，并将一名其他角色的一张手牌置入炼妖壶；2.弃置两张炼妖壶中的牌，从牌堆中获得一张与弃置的牌类别均不相同的牌',
 	},
 	list:[
 		['spade',1,'baihupifeng'],
diff --git a/character/extra.js b/character/extra.js
index c5bdb995b..67e64b8a4 100644
--- a/character/extra.js
+++ b/character/extra.js
@@ -629,7 +629,7 @@ character.extra={
 				mark:function(dialog,content,player){
 					if(content&&content.length){
 						if(player==game.me||player.isUnderControl()){
-							dialog.add(content);
+							dialog.addAuto(content);
 						}
 						else{
 							return '共有'+get.cnNumber(content.length)+'张星';
diff --git a/character/sp.js b/character/sp.js
index 018faf777..d82a4a68b 100644
--- a/character/sp.js
+++ b/character/sp.js
@@ -1233,7 +1233,7 @@ character.sp={
 				content:'cards',
 				mark:function(dialog,content,player){
 					if(content&&content.length){
-						dialog.add(content);
+						dialog.addAuto(content);
 						if(player.isUnderControl(true)){
 							var str='';
 							for(var i=0;i<player.storage.shefu2.length;i++){
diff --git a/game/game.js b/game/game.js
index c45fdf4ff..5168c67bb 100644
--- a/game/game.js
+++ b/game/game.js
@@ -6191,7 +6191,7 @@
 					"step 0";
 					var next=player.chooseToUse();
                     if(!lib.config.show_phaseuse_prompt){
-                        next.set('prompt',' ');
+                        next.set('prompt',false);
                     }
 					"step 1"
 					if(result.bool&&!event.skipped){
@@ -8266,7 +8266,7 @@
 					if(cards){
                         var owner=event.source||get.owner(cards[0]);
 						if(owner){
-							owner.lose(cards,ui.special);
+							owner.lose(cards,ui.special).set('type','gain');
 						}
 					}
 					else{
@@ -8450,8 +8450,11 @@
 						event.finish();
 					}
 					"step 2"
-					player.popup(cards[num].name);
                     var info=get.info(cards[num]);
+                    if(info.loseDelay!=false){
+                        player.popup(cards[num].name);
+    					game.delayx();
+                    }
                     if(Array.isArray(info.onLose)){
                         for(var i=0;i<info.onLose.length;i++){
                             var next=game.createEvent('lose_'+cards[num].name);
@@ -8466,7 +8469,6 @@
     					next.player=player;
     					next.card=cards[num];
                     }
-					game.delayx();
 					event.num++;
 					event.goto(1);
 				},
@@ -8790,7 +8792,7 @@
 				equip:function(){
 					"step 0"
                     var owner=get.owner(card)
-					if(owner) owner.lose(card,ui.special);
+					if(owner) owner.lose(card,ui.special).set('type','equip');
 					if(card.clone){
                         game.broadcast(function(card,player){
                             if(card.clone){
@@ -8841,7 +8843,7 @@
     						next.player=player;
     						next.card=card;
                         }
-						game.delayx();
+						if(info.equipDelay!='false') game.delayx();
 					}
 					delete player.equiping;
                     "step 3"
@@ -9560,10 +9562,14 @@
 				updateMarks:function(){
 					for(var i in this.marks){
 						if(i=='ghujia'||(!this.marks[i].querySelector('.image')&&lib.skill[i]&&
-							lib.skill[i].intro&&!lib.skill[i].intro.nocount&&this.storage[i])){
+							lib.skill[i].intro&&!lib.skill[i].intro.nocount&&
+                            (this.storage[i]||lib.skill[i].intro.markcount))){
 							this.marks[i].classList.add('overflowmark')
 							var num=0;
-                            if(typeof this.storage[i+'_markcount']=='number'){
+                            if(typeof lib.skill[i].intro.markcount=='function'){
+                                num=lib.skill[i].intro.markcount(this.storage[i],this);
+                            }
+                            else if(typeof this.storage[i+'_markcount']=='number'){
                                 num=this.storage[i+'_markcount'];
                             }
 							else if(i=='ghujia'){
@@ -14234,6 +14240,14 @@
 				addSmall:function(item,noclick){
 					return this.add(item,noclick,true);
 				},
+                addAuto:function(content){
+                    if(content&&content.length>4&&!this._hovercustomed){
+                        this.addSmall(content);
+                    }
+                    else{
+                        this.add(content);
+                    }
+                },
 				open:function(){
 					if(this.noopen) return;
 					for(var i=0;i<ui.dialogs.length;i++){
@@ -33172,12 +33186,7 @@
 						content=[content];
 					}
 					if(dialog&&get.itemtype(content)=='cards'){
-						if(content.length>6&&!dialog._hovercustomed){
-							dialog.addSmall(content);
-						}
-						else{
-							dialog.add(content);
-						}
+						dialog.addAuto(content);
 					}
 					else{
 						if(content&&content.length){
@@ -33191,12 +33200,7 @@
 						content=[content];
 					}
 					if(dialog&&get.itemtype(content)=='players'){
-						if(content.length>6&&!dialog._hovercustomed){
-							dialog.addSmall(content);
-						}
-						else{
-							dialog.add(content);
-						}
+                        dialog.addAuto(content);
 						return false;
 					}
 					else{
@@ -33501,34 +33505,7 @@
 				else{
 					uiintro.add(get.translation(node));
 				}
-				if(node.name.indexOf('muniu')==0&&get.position(node)=='e'){
-					var num=0;
-					if(node.cards){
-						num=node.cards.length;
-					}
-					if(get.owner(node)==game.me&&num){
-						uiintro.add(node.cards,true,num>4);
-					}
-					else{
-						uiintro.add('<div class="text center">'+'共有'+get.cnNumber(num)+'张牌'+'</div>');
-					}
-                    if(node.name!='muniu'){
-                        uiintro.add('<div class="text">'+lib.translate[node.name+'_info'].slice(81)+'</div>');
-                    }
-				}
-				else if(node.name=='lianyaohu'&&get.position(node)=='e'){
-					var num=0;
-					if(node.storage.shouna){
-						num=node.storage.shouna.length;
-					}
-					if(num){
-						uiintro.add(node.storage.shouna,true,num>4);
-					}
-					else{
-						uiintro.add('<div class="text center">炼妖壶内没有牌</div>');
-					}
-				}
-				else if(lib.translate[name+'_info']){
+				if(lib.translate[name+'_info']){
 					if(get.subtype(node)=='equip1'){
 						var added=false;
 						if(lib.card[node.name]&&lib.card[node.name].distance){
diff --git a/game/update.js b/game/update.js
index 4de30c365..4dd6e1e6b 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,36 +1,37 @@
 window.noname_update={
     version:'1.9.6.4',
-    update:'1.9.6.2',
+    update:'1.9.6.4',
     changeLog:[
         'bug修复',
     ],
     files:[
-        'game/game.js',
-        'game/package.js',
-        'game/asset.js',
-        'card/hearth.js',
-        'card/swd.js',
-        'card/guozhan.js',
-        'character/rank.js',
-        'character/ow.js',
-        'character/hearth.js',
-        'character/sp.js',
-        'character/xianjian.js',
-        'character/refresh.js',
-        'character/shenhua.js',
-        'character/swd.js',
-        'character/yxs.js',
-        'character/yijiang.js',
-        'character/extra.js',
-        'mode/boss.js',
-        'mode/versus.js',
+        // 'game/game.js',
+        // 'game/package.js',
+        // 'game/asset.js',
+        // 'card/hearth.js',
+        // 'card/swd.js',
+        // 'card/sp.js',
+        // 'card/guozhan.js',
+        // 'character/rank.js',
+        // 'character/ow.js',
+        // 'character/hearth.js',
+        // 'character/sp.js',
+        // 'character/xianjian.js',
+        // 'character/refresh.js',
+        // 'character/shenhua.js',
+        // 'character/swd.js',
+        // 'character/yxs.js',
+        // 'character/yijiang.js',
+        // 'character/extra.js',
+        // 'mode/boss.js',
+        // 'mode/versus.js',
         // 'mode/guozhan.js',
         // 'mode/identity.js',
         // 'mode/stone.js',
         // 'theme/simple/style.css',
         // 'layout/default/layout.css',
         // 'layout/long/layout.css',
-        'layout/long2/layout.css',
+        // 'layout/long2/layout.css',
         // 'layout/mobile/layout.css',
         // 'layout/newlayout/global.css',
         // 'layout/mode/stone.css',
diff --git a/image/character/re_yuanshao.jpg b/image/character/re_yuanshao.jpg
index b4fae882a..d9d532fca 100644
Binary files a/image/character/re_yuanshao.jpg and b/image/character/re_yuanshao.jpg differ