diff --git a/card/extra.js b/card/extra.js
index 6d90a2175..8319519ae 100644
--- a/card/extra.js
+++ b/card/extra.js
@@ -25,6 +25,9 @@ card.extra={
 					}
 				}
 				else{
+					if(cards&&cards.length){
+						card=cards[0];
+					}
 					game.broadcastAll(function(target,card,gain2){
 						target.addSkill('jiu');
 						if(!target.node.jiu&&lib.config.jiu_effect){
diff --git a/card/gujian.js b/card/gujian.js
index 36bdab416..6c93bbd8e 100644
--- a/card/gujian.js
+++ b/card/gujian.js
@@ -111,12 +111,39 @@ card.gujian={
             selectTarget:-1,
             modTarget:true,
         },
+        heilonglinpian:{
+            fullskin:true,
+            type:'trick',
+        },
+        mutoumianju:{
+            fullskin:true,
+            type:'equip',
+            subtype:'equip2',
+        },
+        yuheng:{
+            fullskin:true,
+            type:'equip',
+            subtype:'equip5',
+        },
+        shujinsan:{
+            fullskin:true,
+            type:'basic',
+        },
     },
     skill:{},
     cardType:{
         food:0.3
     },
     translate:{
+        yuheng:'玉衡',
+        yuheng_info:'回合结束阶段，若场你的体力值不是全场最少，你失去一点体力并令玉衡获得一点力量；回合开始阶段，玉衡每有一点力量，你便可以获得一名其他角色的一张牌',
+        shujinsan:'舒筋散',
+        shujinsan_info:'对任意角色使用，目标可弃置任意张牌，并摸等量的牌',
+        mutoumianju:'木头面具',
+        mutoumianju_info:'装备后视为拥有技能龙胆',
+        heilonglinpian:'黑龙鳞片',
+        heilonglinpian_info:'对自己使用，获得一点护甲，直到下一回合开始，计算其他角色与你的距离时始终+1',
+
         food:'食物',
         chunbing:'春饼',
         gudonggeng:'骨董羹',
@@ -126,7 +153,6 @@ card.gujian={
         xiajiao:'虾饺',
         tanhuadong:'昙花冻',
         qingtuan:'青团',
-
         luyugeng:'鲈鱼羹',
         yuanbaorou:'元宝肉',
         molicha:'茉莉茶',
diff --git a/card/swd.js b/card/swd.js
index 1d17e29fa..2433faef7 100644
--- a/card/swd.js
+++ b/card/swd.js
@@ -1,5 +1,87 @@
 card.swd={
 	card:{
+		dujian:{
+			fullskin:true,
+			type:'basic',
+			enable:true,
+			filterTarget:function(card,player,target){
+				return target.num('h')>0;
+			},
+			content:function(){
+				"step 0"
+				if(target.num('h')==0||player.num('h')==0){
+					event.finish();
+					return;
+				}
+				player.chooseCard(true);
+				"step 1"
+				event.card1=result.cards[0];
+				var rand=Math.random()<0.5;
+				target.chooseCard(true).ai=function(card){
+					if(rand) return Math.random();
+					return ai.get.value(card);
+				};
+				"step 2"
+				event.card2=result.cards[0];
+				ui.arena.classList.add('thrownhighlight');
+				game.addVideo('thrownhighlight1');
+				player.$compare(event.card1,target,event.card2);
+				game.delay(4);
+				"step 3"
+				game.log(player,'展示了',event.card1);
+				game.log(target,'展示了',event.card2);
+				if(get.color(event.card2)==get.color(event.card1)){
+					player.discard(event.card1).animate=false;
+					target.$gain2(event.card2);
+					var clone=event.card1.clone;
+					if(clone){
+						clone.style.transition='all 0.5s';
+						clone.style.transform='scale(1.2)';
+						clone.delete();
+						game.addVideo('deletenode',player,get.cardsInfo([clone]));
+					}
+					target.loseHp();
+				}
+				else{
+					player.$gain2(event.card1);
+					target.$gain2(event.card2);
+					target.addTempSkill('dujian2','phaseBegin');
+				}
+				ui.arena.classList.remove('thrownhighlight');
+				game.addVideo('thrownhighlight2');
+			},
+			ai:{
+				basic:{
+					order:2,
+					value:3,
+					useful:1,
+				},
+				result:{
+					player:function(player,target){
+						if(player.num('h')<=Math.min(5,Math.max(2,player.hp))&&_status.event.name=='chooseToUse'){
+							if(typeof _status.event.filterCard=='function'&&
+								_status.event.filterCard({name:'dujian'})){
+								return -10;
+							}
+							if(_status.event.skill){
+								var viewAs=get.info(_status.event.skill).viewAs;
+								if(viewAs=='dujian') return -10;
+								if(viewAs&&viewAs.name=='dujian') return -10;
+							}
+						}
+						return 0;
+					},
+					target:function(player,target){
+						if(target.hasSkill('dujian2')||target.num('h')==0) return 0;
+						if(player.num('h')<=1) return 0;
+						return -1.5;
+					}
+				},
+				tag:{
+					loseHp:1
+				}
+			}
+		},
 		yangpijuan:{
 			fullskin:true,
 			type:'trick',
@@ -605,6 +687,8 @@ card.swd={
 			type:'equip',
 			subtype:'equip5',
 			nomod:true,
+			equipDelay:false,
+			loseDelay:false,
 			onEquip:function(){
 				player.markSkill('lianyaohu_skill');
 			},
@@ -1503,6 +1587,9 @@ card.swd={
 				if(target==_status.event.getParent(2).dying||target==_status.dying) target.recover();
 				else{
 					target.addTempSkill('tianxianjiu',['phaseAfter','shaAfter']);
+					if(cards&&cards.length){
+						card=cards[0];
+					}
 					if(target==targets[0]&&card.clone&&(card.clone.parentNode==player.parentNode||card.clone.parentNode==ui.arena)){
 						card.clone.moveDelete(target);
 						game.addVideo('gain2',target,get.cardsInfo([card]));
@@ -1794,6 +1881,8 @@ card.swd={
 					}
 				}
 			},
+			equipDelay:false,
+			loseDelay:false,
 			onLose:function(){
 				player.storage.nigong=0;
 				player.unmarkSkill('nigong');
@@ -1807,6 +1896,8 @@ card.swd={
 			type:'equip',
 			subtype:'equip5',
 			skills:['xujin'],
+			equipDelay:false,
+			loseDelay:false,
 			onLose:function(){
 				player.storage.xujin=0;
 			},
@@ -1872,6 +1963,7 @@ card.swd={
 		},
 	},
 	skill:{
+		dujian2:{},
 		_yuchan_swap:{
 			trigger:{player:'useCardAfter'},
 			forced:true,
@@ -4887,6 +4979,8 @@ card.swd={
 		nvwashi_bg:'石',
 		kongxin:'控心',
 		lianhua:'炼化',
+		dujian:'毒箭',
+		dujian_info:'出牌阶段，对一名有手牌或装备牌的角色使用，令其展示一张手牌，若与你选择的手牌颜色相同，其流失一点体力',
 		lianhua_info:'出牌阶段限一次，你可以弃置两张炼妖壶中的牌，从牌堆中获得一张与弃置的牌类别均不相同的牌',
 		shouna:'收纳',
 		shouna_info:'出牌阶段限一次，你可以弃置一张手牌，并将一名其他角色的一张手牌置入炼妖壶',
@@ -5038,5 +5132,9 @@ card.swd={
 		['club',6,'yuchanli'],
 		['diamond',7,'yuchangen'],
 		['heart',8,'yuchandui'],
+
+		['spade',3,'dujian','poison'],
+		['club',11,'dujian','poison'],
+		['club',12,'dujian','poison'],
 	],
 }
diff --git a/card/yunchou.js b/card/yunchou.js
index e58eff939..ce507e7e9 100644
--- a/card/yunchou.js
+++ b/card/yunchou.js
@@ -586,88 +586,6 @@ card.yunchou={
 				}
 			}
 		},
-		dujian:{
-			fullskin:true,
-			type:'basic',
-			enable:true,
-			filterTarget:function(card,player,target){
-				return target.num('h')>0;
-			},
-			content:function(){
-				"step 0"
-				if(target.num('h')==0||player.num('h')==0){
-					event.finish();
-					return;
-				}
-				player.chooseCard(true);
-				"step 1"
-				event.card1=result.cards[0];
-				var rand=Math.random()<0.5;
-				target.chooseCard(true).ai=function(card){
-					if(rand) return Math.random();
-					return ai.get.value(card);
-				};
-				"step 2"
-				event.card2=result.cards[0];
-				ui.arena.classList.add('thrownhighlight');
-				game.addVideo('thrownhighlight1');
-				player.$compare(event.card1,target,event.card2);
-				game.delay(4);
-				"step 3"
-				game.log(player,'展示了',event.card1);
-				game.log(target,'展示了',event.card2);
-				if(get.color(event.card2)==get.color(event.card1)){
-					player.discard(event.card1).animate=false;
-					target.$gain2(event.card2);
-					var clone=event.card1.clone;
-					if(clone){
-						clone.style.transition='all 0.5s';
-						clone.style.transform='scale(1.2)';
-						clone.delete();
-						game.addVideo('deletenode',player,get.cardsInfo([clone]));
-					}
-					target.loseHp();
-				}
-				else{
-					player.$gain2(event.card1);
-					target.$gain2(event.card2);
-					target.addTempSkill('dujian2','phaseBegin');
-				}
-				ui.arena.classList.remove('thrownhighlight');
-				game.addVideo('thrownhighlight2');
-			},
-			ai:{
-				basic:{
-					order:2,
-					value:3,
-					useful:1,
-				},
-				result:{
-					player:function(player,target){
-						if(player.num('h')<=Math.min(5,Math.max(2,player.hp))&&_status.event.name=='chooseToUse'){
-							if(typeof _status.event.filterCard=='function'&&
-								_status.event.filterCard({name:'dujian'})){
-								return -10;
-							}
-							if(_status.event.skill){
-								var viewAs=get.info(_status.event.skill).viewAs;
-								if(viewAs=='dujian') return -10;
-								if(viewAs&&viewAs.name=='dujian') return -10;
-							}
-						}
-						return 0;
-					},
-					target:function(player,target){
-						if(target.hasSkill('dujian2')||target.num('h')==0) return 0;
-						if(player.num('h')<=1) return 0;
-						return -1.5;
-					}
-				},
-				tag:{
-					loseHp:1
-				}
-			}
-		},
 		qiankundai:{
 			fullskin:true,
 			type:'equip',
@@ -738,7 +656,6 @@ card.yunchou={
 				},trigger.player,-1).targetRequired=true;
 			}
 		},
-		dujian2:{},
 		qiankundai:{
 			mod:{
 				maxHandcard:function(player,num){
@@ -812,8 +729,6 @@ card.yunchou={
 		hongshui_info:'出牌阶段，对自己使用。若判定结果为梅花2~9，该角色随机弃置3张牌，距离该角色为X的角色随机弃置3-X张牌，若没有牌则失去一点体力，X至少为1',
 		liuxinghuoyu:'流星火羽',
 		liuxinghuoyu_info:'出牌阶段，对一名角色使用，令目标弃置2张牌，或受到一点火焰伤害',
-		dujian:'毒箭',
-		dujian_info:'出牌阶段，对一名有手牌或装备牌的角色使用，令其展示一张手牌，若与你选择的手牌颜色相同，其流失一点体力',
 		qiankundai:'乾坤袋',
 		qiankundai_info:'你的手牌上限+1。当你失去该装备时，你摸取一张牌。',
 		hufu:'虎符',
@@ -832,9 +747,6 @@ card.yunchou={
 		['diamond',3,'liuxinghuoyu','fire'],
 		['heart',6,'liuxinghuoyu','fire'],
 		['heart',9,'liuxinghuoyu','fire'],
-		['spade',3,'dujian','poison'],
-		['club',11,'dujian','poison'],
-		['club',12,'dujian','poison'],
 		['heart',3,'yihuajiemu'],
 		["diamond",3,'guohe'],
 
diff --git a/game/asset.js b/game/asset.js
index a59e56053..ea4a33187 100644
--- a/game/asset.js
+++ b/game/asset.js
@@ -48,6 +48,7 @@ window.noname_asset_list=[
     'image/card/guohe.png',
     'image/card/hanbing.png',
     'image/card/haotianta.png',
+    'image/card/heilonglinpian.png',
     'image/card/hongshui.png',
     'image/card/hsbaowu_cangbaotu.jpg',
     'image/card/hsbaowu_huangjinyuanhou.jpg',
@@ -115,6 +116,7 @@ window.noname_asset_list=[
     'image/card/molicha.png',
     'image/card/muniu.png',
     'image/card/mujiaren.png',
+    'image/card/mutoumianju.png',
     'image/card/nanman.png',
     'image/card/nvwashi.png',
     'image/card/pangufu.png',
@@ -146,6 +148,7 @@ window.noname_asset_list=[
     'image/card/shuchui.png',
     'image/card/shuiyanqijun.png',
     'image/card/shuiyanqijunx.png',
+    'image/card/shujinsan.png',
     'image/card/shunshou.png',
     'image/card/shushangkaihua.png',
     'image/card/sifeizhenmian.png',
@@ -199,6 +202,7 @@ window.noname_asset_list=[
     'image/card/yuchanli.png',
     'image/card/yuchangen.png',
     'image/card/yuchandui.png',
+    'image/card/yuheng.png',
     'image/card/yuxi.png',
     'image/card/yuansuhuimie.png',
     'image/card/yufulu.png',
diff --git a/image/card/heilonglinpian.png b/image/card/heilonglinpian.png
new file mode 100644
index 000000000..5f366eb77
Binary files /dev/null and b/image/card/heilonglinpian.png differ
diff --git a/image/card/mutoumianju.png b/image/card/mutoumianju.png
new file mode 100644
index 000000000..a1cf422b8
Binary files /dev/null and b/image/card/mutoumianju.png differ
diff --git a/image/card/shujinsan.png b/image/card/shujinsan.png
new file mode 100644
index 000000000..883780874
Binary files /dev/null and b/image/card/shujinsan.png differ
diff --git a/image/card/yuheng.png b/image/card/yuheng.png
new file mode 100644
index 000000000..515d448b6
Binary files /dev/null and b/image/card/yuheng.png differ
diff --git a/image/class/druid.png b/image/class/druid.png
deleted file mode 100644
index 2a1e0da72..000000000
Binary files a/image/class/druid.png and /dev/null differ
diff --git a/image/class/hunter.png b/image/class/hunter.png
deleted file mode 100644
index 71b10e0a7..000000000
Binary files a/image/class/hunter.png and /dev/null differ
diff --git a/image/class/knight.png b/image/class/knight.png
deleted file mode 100644
index 4f1a70cc8..000000000
Binary files a/image/class/knight.png and /dev/null differ
diff --git a/image/class/mage.png b/image/class/mage.png
deleted file mode 100644
index b77f6c807..000000000
Binary files a/image/class/mage.png and /dev/null differ
diff --git a/image/class/paladin.png b/image/class/paladin.png
deleted file mode 100644
index 7ab9ce60d..000000000
Binary files a/image/class/paladin.png and /dev/null differ
diff --git a/image/class/priest.png b/image/class/priest.png
deleted file mode 100644
index ef77865ec..000000000
Binary files a/image/class/priest.png and /dev/null differ
diff --git a/image/class/rogue.png b/image/class/rogue.png
deleted file mode 100644
index 252efe771..000000000
Binary files a/image/class/rogue.png and /dev/null differ
diff --git a/image/class/shaman.png b/image/class/shaman.png
deleted file mode 100644
index 0795a1f3d..000000000
Binary files a/image/class/shaman.png and /dev/null differ
diff --git a/image/class/warlock.png b/image/class/warlock.png
deleted file mode 100644
index 2b2ac4594..000000000
Binary files a/image/class/warlock.png and /dev/null differ
diff --git a/image/class/warrior.png b/image/class/warrior.png
deleted file mode 100644
index 9c9002bb0..000000000
Binary files a/image/class/warrior.png and /dev/null differ
diff --git a/image/hearthstone/ailongbakebaohuzhe.jpg b/image/hearthstone/ailongbakebaohuzhe.jpg
deleted file mode 100644
index ddfbd5de7..000000000
Binary files a/image/hearthstone/ailongbakebaohuzhe.jpg and /dev/null differ
diff --git a/image/hearthstone/beici.jpg b/image/hearthstone/beici.jpg
deleted file mode 100755
index c26949959..000000000
Binary files a/image/hearthstone/beici.jpg and /dev/null differ
diff --git a/image/hearthstone/beijunmushi.jpg b/image/hearthstone/beijunmushi.jpg
deleted file mode 100755
index 49e3f2a97..000000000
Binary files a/image/hearthstone/beijunmushi.jpg and /dev/null differ
diff --git a/image/hearthstone/chiyanzhanfu.jpg b/image/hearthstone/chiyanzhanfu.jpg
deleted file mode 100644
index b38453cf6..000000000
Binary files a/image/hearthstone/chiyanzhanfu.jpg and /dev/null differ
diff --git a/image/hearthstone/cikezhiren.jpg b/image/hearthstone/cikezhiren.jpg
deleted file mode 100644
index e2a14a99b..000000000
Binary files a/image/hearthstone/cikezhiren.jpg and /dev/null differ
diff --git a/image/hearthstone/diyulieyan.jpg b/image/hearthstone/diyulieyan.jpg
deleted file mode 100755
index 24a9ec236..000000000
Binary files a/image/hearthstone/diyulieyan.jpg and /dev/null differ
diff --git a/image/hearthstone/dongwuhuoban.jpg b/image/hearthstone/dongwuhuoban.jpg
deleted file mode 100755
index fef012455..000000000
Binary files a/image/hearthstone/dongwuhuoban.jpg and /dev/null differ
diff --git a/image/hearthstone/fengxian.jpg b/image/hearthstone/fengxian.jpg
deleted file mode 100755
index 0f95c7741..000000000
Binary files a/image/hearthstone/fengxian.jpg and /dev/null differ
diff --git a/image/hearthstone/hanbingjian.jpg b/image/hearthstone/hanbingjian.jpg
deleted file mode 100755
index 7de4e0a02..000000000
Binary files a/image/hearthstone/hanbingjian.jpg and /dev/null differ
diff --git a/image/hearthstone/huoyuansu.jpg b/image/hearthstone/huoyuansu.jpg
deleted file mode 100644
index 423431de3..000000000
Binary files a/image/hearthstone/huoyuansu.jpg and /dev/null differ
diff --git a/image/hearthstone/lansaizhanshi.jpg b/image/hearthstone/lansaizhanshi.jpg
deleted file mode 100644
index 0bc4fb4e8..000000000
Binary files a/image/hearthstone/lansaizhanshi.jpg and /dev/null differ
diff --git a/image/hearthstone/liewangshouwei.jpg b/image/hearthstone/liewangshouwei.jpg
deleted file mode 100644
index a019256dd..000000000
Binary files a/image/hearthstone/liewangshouwei.jpg and /dev/null differ
diff --git a/image/hearthstone/shuiyuansu.jpg b/image/hearthstone/shuiyuansu.jpg
deleted file mode 100644
index 7fe53d925..000000000
Binary files a/image/hearthstone/shuiyuansu.jpg and /dev/null differ
diff --git a/image/hearthstone/xukongxingzhe.jpg b/image/hearthstone/xukongxingzhe.jpg
deleted file mode 100644
index f2ab0a75d..000000000
Binary files a/image/hearthstone/xukongxingzhe.jpg and /dev/null differ
diff --git a/image/hearthstone/xunshoushi.jpg b/image/hearthstone/xunshoushi.jpg
deleted file mode 100644
index cd92f903b..000000000
Binary files a/image/hearthstone/xunshoushi.jpg and /dev/null differ
diff --git a/image/hearthstone/yaoshu.jpg b/image/hearthstone/yaoshu.jpg
deleted file mode 100755
index 280c38ccc..000000000
Binary files a/image/hearthstone/yaoshu.jpg and /dev/null differ
diff --git a/image/hearthstone/yexingchengzhang.jpg b/image/hearthstone/yexingchengzhang.jpg
deleted file mode 100755
index 0cacccd02..000000000
Binary files a/image/hearthstone/yexingchengzhang.jpg and /dev/null differ
diff --git a/image/hearthstone/zhangezhihuiguan.jpg b/image/hearthstone/zhangezhihuiguan.jpg
deleted file mode 100755
index 46477f315..000000000
Binary files a/image/hearthstone/zhangezhihuiguan.jpg and /dev/null differ
diff --git a/image/hearthstone/zhenyanshudun.jpg b/image/hearthstone/zhenyanshudun.jpg
deleted file mode 100755
index ae28c2045..000000000
Binary files a/image/hearthstone/zhenyanshudun.jpg and /dev/null differ
diff --git a/image/hearthstone/zhurufamingjia.jpg b/image/hearthstone/zhurufamingjia.jpg
deleted file mode 100755
index 0b6d186f8..000000000
Binary files a/image/hearthstone/zhurufamingjia.jpg and /dev/null differ