diff --git a/card/guozhan.js b/card/guozhan.js
index ff537482c..e04dad39c 100755
--- a/card/guozhan.js
+++ b/card/guozhan.js
@@ -755,9 +755,9 @@ card.guozhan={
 			forced:true,
 			popup:false,
 			content:function(){
-				var cards=player.get('e','huxinjing');
-				if(cards.length){
-					player.discard(cards);
+				var card=player.get('e','2');
+				if(card){
+					player.discard(card);
 				}
 			}
 		},
diff --git a/card/swd.js b/card/swd.js
index b93b3afd2..d5174b18f 100755
--- a/card/swd.js
+++ b/card/swd.js
@@ -404,19 +404,18 @@ card.swd={
 				}
 			}
 		},
-		yuhuanghua:{
+		xianluhui:{
+			fullskin:true,
 			type:'basic',
 			enable:true,
 			selectTarget:-1,
-			// filterTarget:function(card,player,target){
-			// 	return target.hp<target.maxHp;
-			// },
 			filterTarget:true,
+			targetDelay:false,
 			content:function(){
-				"step 0"
 				target.recover();
-				"step 1"
-				target.draw();
+			},
+			contentAfter:function(){
+				game.asyncDraw(targets);
 			},
 			ai:{
 				basic:{
@@ -498,13 +497,15 @@ card.swd={
 			type:'basic',
 			enable:function(){return game.dead.length>0},
 			notarget:true,
+			mode:['identity','guozhan'],
+			fullskin:true,
 			content:function(){
 				"step 0"
 				var list=[];
 				for(var i=0;i<game.dead.length;i++){
 					list.push(game.dead[i].name);
 				}
-				player.chooseButton(ui.create.dialog([list,'character']),function(button){
+				player.chooseButton(ui.create.dialog('选择要复活的角色',[list,'character']),function(button){
 					for(var i=0;i<game.dead.length&&game.dead[i].name!=button.link;i++);
 					return ai.get.attitude(_status.event.player,game.dead[i]);
 				},true);
@@ -513,17 +514,21 @@ card.swd={
 					for(var i=0;i<game.dead.length&&game.dead[i].name!=result.buttons[0].link;i++);
 					var dead=game.dead[i];
 					dead.revive(1);
-					player.logSkill('huanpodan',dead);
-					player.loseHp();
+					game.addVideo('revive',dead);
+					event.dead=dead;
 				}
+				else{
+					event.finish();
+				}
+				"step 2"
+				if(event.dead) event.dead.draw();
 			},
 			ai:{
 				basic:{
 					useful:[4,2],
-					value:[9,2],
+					value:[7,2],
 				},
 				order:function(card,player){
-					if(player.hp<=2) return -1;
 					for(var i=0;i<game.dead.length;i++){
 						if(ai.get.attitude(player,game.dead[i])>3) return 7;
 					}
@@ -531,7 +536,6 @@ card.swd={
 				},
 				result:{
 					player:function(player){
-						if(player.hp<=2) return -1;
 						for(var i=0;i<game.dead.length;i++){
 							if(ai.get.attitude(player,game.dead[i])>3) return 2;
 						}
@@ -864,6 +868,7 @@ card.swd={
 		guangshatianyi:{
 			fullskin:true,
 			type:'equip',
+			chongzhu:true,
 			enable:function(card,player){
 				return player.sex=='female';
 			},
@@ -878,8 +883,9 @@ card.swd={
 				}
 			}
 		},
-		guilingzhitao:{
+		guilingyupei:{
 			type:'equip',
+			fullskin:true,
 			subtype:'equip5',
 			skills:['nigong'],
 			ai:{
@@ -892,9 +898,11 @@ card.swd={
 			},
 			onLose:function(){
 				player.storage.nigong=0;
+				player.unmarkSkill('nigong');
 			},
 			onEquip:function(){
 				player.storage.nigong=0;
+				player.markSkill('nigong');
 			}
 		},
 		qipoguyu:{
@@ -919,6 +927,17 @@ card.swd={
 				}
 			},
 		},
+		sifeizhenmian:{
+			fullskin:true,
+			type:'equip',
+			subtype:'equip5',
+			skills:['yiluan'],
+			ai:{
+				basic:{
+					equipValue:5.5
+				}
+			},
+		},
 		ximohu:{
 			type:'equip',
 			subtype:'equip5',
@@ -930,6 +949,7 @@ card.swd={
 			},
 		},
 		guiyanfadao:{
+			fullskin:true,
 			type:'equip',
 			subtype:'equip1',
 			distance:{attackFrom:-1},
@@ -942,6 +962,30 @@ card.swd={
 		},
 	},
 	skill:{
+		yiluan:{
+			enable:'phaseUse',
+			usable:1,
+			filterTarget:true,
+			content:function(){
+				'step 0'
+				target.judge(function(card){
+					return get.color(card)=='red'?1:-1;
+				});
+				'step 1'
+				if(result.color=='red'){
+					target.draw();
+				}
+				else{
+					target.goMad({player:'phaseAfter'});
+				}
+			},
+			ai:{
+				order:1,
+				result:{
+					target:-1
+				}
+			}
+		},
 		hslingjian_xuanfengzhiren_equip1:{
 			trigger:{source:'damageEnd'},
 			forced:true,
@@ -1351,26 +1395,24 @@ card.swd={
 			}
 		},
 		hslingjian_shijianhuisu_equip1:{
-			onLose:function(){
-				"step 0"
-				game.delay(0.5);
-				player.chooseTarget([1,1],'是否发动【回溯】？',function(card,player,target){
-					if(player==target) return false;
-					return target.num('he')>0;
-				}).ai=function(target){
-					return -ai.get.attitude(player,target);
-				};
-				"step 1"
-				if(result.bool){
-					player.line(result.targets,'green');
-					player.discardPlayerCard(result.targets[0],'he',true);
-				}
-			}
+			trigger:{player:'equipEnd'},
+			forced:true,
+			filter:function(event,player){
+				return get.subtype(event.card)=='equip2';
+			},
+			content:function(){
+				player.draw();
+			},
 		},
 		hslingjian_shijianhuisu_equip2:{
-			onLose:function(){
+			trigger:{player:'equipEnd'},
+			forced:true,
+			filter:function(event,player){
+				return get.subtype(event.card)=='equip1';
+			},
+			content:function(){
 				player.draw();
-			}
+			},
 		},
 		hslingjian_shijianhuisu_equip3:{
 			mod:{
@@ -1573,12 +1615,6 @@ card.swd={
 				for(var i=0;i<cards.length;i++){
 					var name2=cards[i].name+'_'+get.subtype(equip);
 					lib.card[name].skills.add(name2);
-					if(lib.skill[name2].onEquip){
-						lib.card[name].onEquip=lib.skill[name2].onEquip;
-					}
-					if(lib.skill[name2].onLose){
-						lib.card[name].onLose=lib.skill[name2].onLose;
-					}
 					lib.translate[name2]=lib.translate[cards[i].name+'_duanzao'];
 					str2+='；'+lib.translate[name2+'_info'];
 				}
@@ -2012,7 +2048,7 @@ card.swd={
 			trigger:{player:'damageBegin'},
 			forced:true,
 			filter:function(event,player){
-				if(event.source&&event.source.num('s','unequip')) return;
+				if(event.source&&event.source.num('s','unequip')) return false;
 				if(Math.random()>1/3) return false;
 				if(event.parent.player.num('s','unequip')) return false;
 				return true;
@@ -2030,9 +2066,9 @@ card.swd={
 				if(player.storage.nigong>4){
 					player.storage.nigong=4;
 				}
+				player.updateMarks();
 			},
 			ai:{
-				threaten:0.6,
 				effect:function(card,player,target){
 					if(get.tag(card,'damage')) return [1,0.5];
 				}
@@ -2052,9 +2088,13 @@ card.swd={
 			filterTarget:function(card,player,target){
 				return player!=target;
 			},
+			prompt:function(event){
+				return '弃置所有逆攻标记，并对一名角色造成'+get.cnNumber(Math.floor(event.player.storage.nigong/2))+'点伤害';
+			},
 			content:function(){
 				target.damage(Math.floor(player.storage.nigong/2));
 				player.storage.nigong=0;
+				player.updateMarks();
 			},
 			ai:{
 				order:10,
@@ -2137,15 +2177,20 @@ card.swd={
 			}
 		},
 		guiyanfadao:{
-			trigger:{player:'useCardToBefore'},
-			priority:5,
-			filter:function(event,player){
-				if(event.card.name=='sha'&&!event.card.nature) return true;
+			trigger:{player:'shaHit'},
+			check:function(event,player){
+				var att=ai.get.attitude(player,event.target);
+				if(player.skills.contains('jiu')) return att>0;
+				if(event.target.hasSkillTag('maixie')){
+					return att<=0;
+				}
+				if(event.target.hp==1) return att>0;
+				if(player.skills.contains('tianxianjiu')) return false;
+				return att<=0;
 			},
 			content:function(){
-				trigger.card.nature='poison';
-				player.addSkill('guiyanfadao2');
-				player.storage.zhuque_skill=trigger.card;
+				trigger.unhurt=true;
+				trigger.target.loseHp();
 			}
 		},
 		guiyanfadao2:{
@@ -2216,8 +2261,8 @@ card.swd={
 		hslingjian_shengxiuhaojiao_equip5_info:'出牌阶段限一次，你可以弃置两张牌，然后令一名角色获得或解除嘲讽',
 		hslingjian_shijianhuisu_duanzao:'回溯',
 		hslingjian_shijianhuisu_duanzao2:'溯',
-		hslingjian_shijianhuisu_equip1_info:'当你失去此牌时，你可以弃置一名角色的一张牌',
-		hslingjian_shijianhuisu_equip2_info:'当你失去此牌时，你摸一张牌',
+		hslingjian_shijianhuisu_equip1_info:'当你装备一张防具牌时，你摸一张牌',
+		hslingjian_shijianhuisu_equip2_info:'当你装备一张武器牌时，你摸一张牌',
 		hslingjian_shijianhuisu_equip3_info:'当你的装备区内没有其他牌时，你的防御距离+1',
 		hslingjian_shijianhuisu_equip4_info:'当你的装备区内没有其他牌时，你的进攻距离+1',
 		hslingjian_shijianhuisu_equip5_info:'出牌阶段限一次，你可以弃置一张牌，然后令一名其他角色将其装备区内的牌收回手牌',
@@ -2256,7 +2301,7 @@ card.swd={
 		xingjunyan_info:'你的杀造成的伤害+1；杀对你造成的伤害+1',
 		guiyanfadao:'鬼眼法刀',
 		guiyanfadao_bg:'眼',
-		// guiyanfadao_info:'每当你使用杀命中目标，你可以防止伤害，改为令目标失去一点体力',
+		guiyanfadao_info:'每当你使用杀命中目标，你可以防止伤害，改为令目标失去一点体力',
 		tianxianjiu:'天仙酒',
 		tianxianjiu_bg:'仙',
 		tianxianjiu_info:'出牌阶段对自己使用，你使用的下一张杀造成伤害后可以摸两张牌',
@@ -2264,25 +2309,24 @@ card.swd={
 		xiangyuye_info:'出牌阶段，对一名攻击范围外的角色使用，令其弃置一张黑色手牌或流失一点体力',
 		huanpodan:'还魄丹',
 		huanpodan_bg:'魄',
-		// huanpodan_info:'出牌阶段对一名已死亡角色使用，令其复活并回复一点体力，然后你流失一点体力',
+		huanpodan_info:'出牌阶段对一名已死亡角色使用，令其复活，将体力值变为1，并摸一张牌',
 		ximohu:'吸魔壶',
 		ximohu_bg:'魔',
 		// ximohu_info:'锁定技，你将即将受到的雷属性伤害转化为你的体力值',
 		sadengjinhuan:'萨登荆环',
 		sadengjinhuan_info:'当你的杀被闪避后，可以进行一次判定，若结果为红色目标需再打出一张闪',
-		// sadengjinhuan_info:'锁定技，每当你使用一张杀被闪避后，若此杀在弃牌堆，你有50%的机率对目标再使用一次此杀',
 		sadengjinhuan_bg:'荆',
 		qipoguyu:'奇魄古玉',
 		xujin:'蓄劲',
 		xujin2:'蓄劲',
 		// qipoguyu_info:'装备后获得蓄劲技能',
 		xujin_info:'回合开始前，若你的蓄劲标记数小于当前的体力值，你可以跳过此回合，并获得一枚蓄劲标记。锁定技，每当你即将造成伤害，你令此伤害+X，然后弃置一枚蓄劲标记，X为你拥有的蓄劲标记数',
-		guilingzhitao:'归灵指套',
+		guilingyupei:'归灵玉佩',
 		nigong:'逆攻',
 		nigong2:'逆攻',
 		nigong3:'逆攻',
 		nigong4:'逆攻',
-		// guilingzhitao_info:'装备后获得逆攻技能',
+		guilingyupei_info:'每当你受到一点伤害，你获得一个逆攻标记，标记数不能超4。出牌阶段，你可以弃置所有逆攻标记并令任意一名其他角色X/2点伤害，X为逆攻标记的数量且向下取整',
 		nigong_info:'每当你受到一点伤害，你获得一个逆攻标记，标记数不能超4。出牌阶段，你可以弃置所有逆攻标记并令任意一名其他角色X/2点伤害，X为逆攻标记的数量且向下取整',
 		baihupifeng:'白狐披风',
 		baihupifeng_bg:'狐',
@@ -2306,9 +2350,8 @@ card.swd={
 		pusafazhou:'菩萨发咒',
 		pusafazhou_bg:'发',
 		// pusafazhou_info:'令你抵挡一次死亡，将体力回复至1，并摸一张牌',
-		yuhuanghua:'雨皇花',
-		yuhuanghua_bg:'皇',
-		// yuhuanghua_info:'令所有角色回复一点体力并摸一张牌',
+		xianluhui:'仙炉灰',
+		xianluhui_info:'令所有角色回复一点体力并摸一张牌',
 		caoyao:'草药',
 		caoyao_info:'出牌阶段，对距离为1以内的角色使用，回复一点体力。',
 		pantao:'蟠桃',
@@ -2337,7 +2380,11 @@ card.swd={
 		chiyuxi_info:'出牌阶段，对所有其他角色使用。每名目标角色需打出一张【闪】，否则受到1点火焰伤害。',
 		guangshatianyi:'光纱天衣',
 		guangshatianyi_bg:'纱',
-		// guangshatianyi_info:'仅女性可装备，锁定技，每当你即将受到伤害，有三分之一的概率令伤害减一',
+		guangshatianyi_info:'仅女性可装备，锁定技，每当你即将受到伤害，有三分之一的概率令伤害减一',
+		sifeizhenmian:'四非真面',
+		sifeizhenmian_info:'出牌阶段限一次，你可以指定一名角色进行一次判定，若结果为红色，该角色摸一张牌，若结果为黑色，该角色进入混乱状态直到下一回合结束',
+		yiluan:'意乱',
+		yiluan_info:'出牌阶段限一次，你可以指定一名角色进行一次判定，若结果为红色，该角色摸一张牌，若结果为黑色，该角色进入混乱状态直到下一回合结束',
 	},
 	list:[
 		['spade',1,'baihupifeng'],
@@ -2348,7 +2395,7 @@ card.swd={
 //		['diamond',2,'xiayuncailing'],
 		// ['spade',2,'pusafazhou'],
 //		['heart',2,'pantao'],
-		//['club',2,'huanpodan'],
+		['club',2,'huanpodan'],
 
 		['club',3,'caoyao'],
 		['diamond',3,'chilongya','fire'],
@@ -2357,12 +2404,12 @@ card.swd={
 
 		['club',4,'caoyao'],
 		['spade',4,'zhufangshenshi'],
-		//['spade',4,'huanpodan'],
+		['spade',4,'huanpodan'],
 //		['diamond',4,'xiangyuye','poison'],
 
 		['club',5,'caoyao'],
 		['spade',5,'xixueguizhihuan'],
-		//['diamond',5,'huanpodan'],
+		['diamond',5,'huanpodan'],
 
 		['club',6,'shentoumianju'],
 		['spade',6,'yufulu'],
@@ -2371,16 +2418,16 @@ card.swd={
 
 		['diamond',7,'chiyuxi','fire'],
 		['club',7,'jingleishan','thunder'],
-		// ['spade',7,'guilingzhitao'],
+		['spade',7,'guilingyupei'],
 //		['heart',7,'xiangyuye','poison'],
 
 		['spade',8,'zhufangshenshi'],
-		['club',8,'xiangyuye'],
+		['club',8,'xiangyuye','poison'],
 		//['heart',8,'huanpodan'],
 
 		// ['spade',9,'ximohu','brown'],
 		['club',9,'guiyoujie'],
-		['diamond',9,'xiangyuye'],
+		['diamond',9,'xiangyuye','poison'],
 
 		// ['diamond',9,'tianxianjiu'],
 		['heart',9,'tianxianjiu'],
@@ -2393,14 +2440,14 @@ card.swd={
 		//['spade',10,'qipoguyu'],
 		//['diamond',10,'xiangyuye','poison'],
 
-		['spade',11,'xiangyuye'],
+		['spade',11,'xiangyuye','poison'],
 		// ['club',11,'xiangyuye','poison'],
 
 //		['diamond',12,'xiangyuye','poison'],
-		//['spade',12,'guiyanfadao','poison'],
+		['spade',12,'guiyanfadao','poison'],
 
-		// ['heart',13,'yuhuanghua'],
-		// ['diamond',13,'guangshatianyi'],
+		['spade',13,'xianluhui'],
+		['diamond',3,'guangshatianyi'],
 		['club',13,'sadengjinhuan'],
 		//['spade',6,'xiangyuye','poison'],
 
diff --git a/card/yunchou.js b/card/yunchou.js
index fcc4ad8df..5233a976b 100644
--- a/card/yunchou.js
+++ b/card/yunchou.js
@@ -821,9 +821,9 @@ card.yunchou={
 		['diamond',3,'liuxinghuoyu','fire'],
 		['heart',6,'liuxinghuoyu','fire'],
 		['heart',9,'liuxinghuoyu','fire'],
-		['spade',3,'dujian'],
-		['club',11,'dujian'],
-		['club',12,'dujian'],
+		['spade',3,'dujian','poison'],
+		['club',11,'dujian','poison'],
+		['club',12,'dujian','poison'],
 		['heart',3,'yihuajiemu'],
 		["diamond",3,'guohe'],
 
diff --git a/character/gujian.js b/character/gujian.js
index c79e8c93b..c1410ede0 100755
--- a/character/gujian.js
+++ b/character/gujian.js
@@ -88,7 +88,7 @@ character.gujian={
 				}
 				if(list.length){
 					event.target=list.randomGet();
-					event.target.popup('zuizhan');
+					player.line(event.target,'green');
 					game.log(event.target,'被追加为额外目标');
 					trigger.targets.push(event.target);
 					player.draw();
diff --git a/character/ow.js b/character/ow.js
index e15fd4cc7..775b7b720 100644
--- a/character/ow.js
+++ b/character/ow.js
@@ -15,48 +15,195 @@ character.ow={
         ow_ana:['female','wei',3,['juji','zhiyuan','mianzhen']],
         ow_heibaihe:['female','qun',3,['juji','duwen','dulei']],
         ow_maikelei:['male','shu',4,['shanguang','tiandan','shenqiang']],
+        ow_kuangshu:['male','shu',3,['liudan','shoujia','shihuo']],
 
+        // ow_tuobiang:['male','shu',3,[]],
         // ow_baolei:['female','shu',3,[]],
         // ow_banzang:['male','shu',4,[]],
-        // ow_kuangshu:['male','shu',4,[]],
-        // ow_tuobiang:['male','shu',4,[]],
         // ow_laiyinhate:['male','shu',4,[]],
         // ow_luba:['male','shu',4,[]],
         // ow_wensidun:['male','shu',4,[]],
         // ow_zhaliya:['female','shu',4,[]],
     },
     skill:{
-        shenqiang:{
-            trigger:{player:'shaHit'},
+        shihuo:{
+            trigger:{global:'damageEnd'},
             forced:true,
             filter:function(event){
-                return event.targets&&event.targets.length>1&&_status.currentPhase==player;
+                return event.nature=='fire';
+            },
+            content:function(){
+                player.draw();
+            }
+        },
+        shoujia:{
+			enable:'phaseUse',
+            usable:1,
+			filter:function(event,player){
+				return player.num('h')>0;
+			},
+			filterCard:true,
+			check:function(card){
+				return 6-ai.get.value(card);
+			},
+			discard:false,
+			prepare:function(cards,player,targets){
+				player.$give(1,targets[0]);
+			},
+            filterTarget:function(card,player,target){
+                return target!=player&&!target.hasSkill('shoujia2');
+            },
+			content:function(){
+				target.storage.shoujia=cards[0];
+                target.storage.shoujia2=player;
+				target.addSkill('shoujia2');
+                target.syncStorage('shoujia');
+			},
+			ai:{
+				order:1,
+                expose:0.2,
+                threaten:1.4,
+				result:{
+					target:-1
+				}
+			}
+		},
+		shoujia2:{
+			mark:true,
+			trigger:{player:'useCardToBegin'},
+			forced:true,
+			filter:function(event,player){
+				return get.suit(event.card)==get.suit(player.storage.shoujia)&&event.target!=player;
+			},
+			content:function(){
+				'step 0'
+				player.showCards([player.storage.shoujia],get.translation(player)+'发动了【兽夹】');
+				'step 1'
+				ui.discardPile.appendChild(player.storage.shoujia);
+                delete player.storage.shoujia;
+				delete player.storage.shoujia2;
+				player.removeSkill('shoujia2');
+                game.addVideo('storage',player,['shoujia',null]);
+				game.addVideo('storage',player,['shoujia2',null]);
+				if(!player.isTurnedOver()){
+                    player.turnOver();
+                }
+			},
+			intro:{
+				mark:function(dialog,content,player){
+					if(player.storage.shoujia2&&player.storage.shoujia2.isUnderControl(true)){
+						dialog.add([player.storage.shoujia]);
+					}
+                    else{
+                        return '已成为'+get.translation(player.storage.shoujia2)+'的兽夹目标';
+                    }
+				},
+				content:function(content,player){
+					if(player.storage.shoujia2&&player.storage.shoujia2.isUnderControl(true)){
+						return get.translation(player.storage.shoujia);
+					}
+					return '已成为'+get.translation(player.storage.shoujia2)+'的兽夹目标';
+				}
+			},
+            group:'shoujia3'
+		},
+        shoujia3:{
+            trigger:{source:'damageEnd'},
+            forced:true,
+            filter:function(event,player){
+                return event.player==player.storage.shoujia2;
+            },
+            content:function(){
+                ui.discardPile.appendChild(player.storage.shoujia);
+                player.$throw(player.storage.shoujia);
+                delete player.storage.shoujia;
+				delete player.storage.shoujia2;
+				player.removeSkill('shoujia2');
+                game.addVideo('storage',player,['shoujia',null]);
+				game.addVideo('storage',player,['shoujia2',null]);
+            }
+        },
+        liudan:{
+			trigger:{player:'useCard'},
+			popup:false,
+            check:function(event,player){
+                var list=[];
+                for(var i=0;i<game.players.length;i++){
+					if(event.targets.contains(game.players[i])==false&&
+					game.players[i]!=player&&
+					lib.filter.targetEnabled(event.card,player,game.players[i])){
+						list.push(game.players[i]);
+					}
+				}
+				var num=0;
+                for(var i=0;i<list.length;i++){
+                    num+=ai.get.effect(list[i],event.card,player,player);
+                }
+                return num>=0;
+            },
+			filter:function(event,player){
+				if(event.card.name!='sha') return false;
+				for(var i=0;i<game.players.length;i++){
+					if(event.targets.contains(game.players[i])==false&&
+					game.players[i]!=player&&
+					lib.filter.targetEnabled(event.card,player,game.players[i])){
+						return true;
+					}
+				}
+				return false;
+			},
+			content:function(){
+				var list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(trigger.targets.contains(game.players[i])==false&&
+					game.players[i]!=player&&
+					lib.filter.targetEnabled(trigger.card,player,game.players[i])){
+						list.push(game.players[i]);
+					}
+				}
+				if(list.length){
+                    var list2=[];
+                    for(var i=0;i<list.length;i++){
+                        if(Math.random()<0.5){
+                            list2.push(list[i]);
+                            trigger.targets.push(list[i]);
+                        }
+                    }
+                    if(list2.length){
+                        game.log(list2,'被追加为额外目标');
+                        player.line(list2,'green');
+                    }
+				}
+			}
+		},
+        shenqiang:{
+            trigger:{source:'damageEnd'},
+            forced:true,
+            filter:function(event,player){
+                return event.card&&event.card.name=='sha'&&_status.currentPhase==player;
             },
             content:function(){
                 player.getStat().card.sha--;
             }
         },
         tiandan:{
-            trigger:{player:'phaseUseBefore'},
+            trigger:{player:'phaseDrawBegin'},
             filter:function(event,player){
-                return player.maxHp>player.num('h');
+                return Math.min(5,player.hp)>player.num('h')&&!player.skipList.contains('phaseUse')&&!player.skipList.contains('phaseDiscard');
             },
             check:function(event,player){
                 var nh=player.num('h');
-                if(player.maxHp-nh>=2) return true;
-                if(nh>player.hp) return true;
-                if(nh==player.hp) return nh<=2;
+                if(Math.min(5,player.hp)-nh>=2) return true;
                 return false;
             },
             content:function(){
-                var num=player.maxHp-player.num('h');
+                var num=Math.min(5,player.hp)-player.num('h');
                 var cards=[];
                 while(num--){
                     cards.push(game.createCard('sha'));
                 }
                 player.gain(cards,'gain2');
-                trigger.untrigger();
-                trigger.finish();
+                player.skip('phaseUse');
                 player.skip('phaseDiscard');
             }
         },
@@ -75,10 +222,41 @@ character.ow={
                 target.addTempSkill('shanguang2','phaseAfter');
             },
             ai:{
-                order:10,
+                order:7.9,
                 result:{
                     target:function(player,target){
-                        
+                        var nh=target.num('h');
+                        if(ai.get.attitude(player,target)<0&&nh>=3&&
+                        player.canUse('sha',target)&&player.num('h','sha')&&
+                        ai.get.effect(target,{name:'sha'},player,player)>0){
+                            return -nh-5;
+                        }
+                        return -nh;
+                    }
+                }
+            }
+        },
+        shanguang2:{
+            mod:{
+				cardEnabled:function(){
+					return false;
+				},
+				cardUsable:function(){
+					return false;
+				},
+				cardRespondable:function(){
+					return false;
+				},
+				cardSavable:function(){
+					return false;
+				}
+			},
+            ai:{
+                effect:{
+                    target:function(card,player,target,current){
+                        if(get.tag(card,'respondShan')||get.tag(card,'respondSha')){
+                            if(current<0) return 1.5;
+                        }
                     }
                 }
             }
@@ -2015,12 +2193,20 @@ character.ow={
         }
     },
     translate:{
+        liudan:'榴弹',
+        liudan_info:'每当你使用一张杀，你可以令所有不是此杀目标的其他角色有50%概率成为此杀的额外目标',
+        shoujia:'兽夹',
+        shoujia2:'兽夹',
+        shoujia3:'兽夹',
+        shoujia_info:'出牌阶段限一次，你可以将一张牌背面朝上置于一名其他角色的武将牌上，当该角色使用一张与此牌花色相同的牌指定其他角色为目标时，将此牌置入弃牌堆，该角色将武将牌翻至背面；当该角色对你造成伤害时，将此牌置入弃牌堆',
+        shihuo:'嗜火',
+        shihuo_info:'锁定技，每当一名角色受到火焰伤害，你摸一张牌',
         shanguang:'闪光',
         shanguang_info:'出牌阶段限一次，你可以弃置一张牌令一名其他角色本回合内不能使用或打出卡牌',
         tiandan:'填弹',
-        tiandan_info:'你可以跳过出牌和弃牌阶段，然后获得若干张杀直到你的手牌数等于你的体力上限',
+        tiandan_info:'摸牌阶段开始时，你可以跳过出牌和弃牌阶段，然后获得若干张杀直到你的手牌数等于你的体值（最多为5）',
         shenqiang:'神枪',
-        shenqiang_info:'若你使用杀指定了惟一目标且命中目标，则此杀不计入回合内的出杀次数限制',
+        shenqiang_info:'若你使用杀指定了惟一目标且造成伤害，则此杀不计入回合内的出杀次数限制',
         mianzhen:'眠针',
         mianzhen2:'眠针',
         mianzhen_info:'出牌阶段限一次，你可以弃置一张黑色牌，并令一名其他角色不能使用或打出卡牌直到其受到伤害或下一回合结束',
diff --git a/character/swd.js b/character/swd.js
index a5feca164..6f7fb2b08 100755
--- a/character/swd.js
+++ b/character/swd.js
@@ -1042,6 +1042,7 @@ character.swd={
 				}).ai=function(target){
 					if(ai.get.attitude(player,target)<=0) return 0;
 					var eff=-ai.get.damageEffect(target,target,player)+(player==target?2:0);
+					if(target.hp==1) eff+=2;
 					return Math.min(1,eff);
 				};
 				"step 1"
@@ -7885,7 +7886,7 @@ character.swd={
 		touxi:'偷袭',
 		touxi_info:'在其他角色的回合结束阶段，你可以进行一次判定，若结果为黑色，你对其造成一点雷电伤害，且直到下一回合开始不能再次发动偷袭；若结果为红色，对方可以弃置你的一张牌',
 		minjing:'明镜',
-		minjing_info:'锁定技，每当你受到伤害时，若你没有防具牌，有1/3的概率令伤害-1',
+		minjing_info:'若你没有防具牌，你视为装备了光纱天衣',
 		qimou:'奇谋',
 		qimou_info:'每当你于回合外受到一次伤害，你可以摸一张牌，并立即使用之',
 		mufeng:'沐风',
diff --git a/character/yxs.js b/character/yxs.js
index 0afe9a1a5..daef1d3db 100755
--- a/character/yxs.js
+++ b/character/yxs.js
@@ -1316,11 +1316,13 @@ character.yxs={
 					if(trigger.player.skills.contains('wushuang')) return 0;
 					if(trigger.player.skills.contains('liegong')) return 0;
 					if(trigger.player.skills.contains('tieji')) return 0;
+					if(trigger.player.skills.contains('juji')) return 0;
 					if(trigger.player.skills.contains('retieji')) return 0;
 					if(trigger.player.skills.contains('roulin')&&trigger.target.sex=='female') return 0;
 					if(trigger.player.skills.contains('nvquan')&&trigger.target.sex=='male') return 0;
 					if(trigger.target.skills.contains('yijue2')) return 0;
 					if(trigger.target.skills.contains('shejie2')) return 0;
+					if(trigger.target.skills.contains('shanguang2')) return 0;
 
 					var equip=trigger.target.get('e','2');
 					if(equip&&equip.name=='bagua') return 1;
diff --git a/game/asset.js b/game/asset.js
index e1e808f54..62a1bd6e8 100644
--- a/game/asset.js
+++ b/game/asset.js
@@ -35,8 +35,11 @@ window.noname_asset_list=[
     'image/card/fuxiqin.png',
     'image/card/fuxiqin2.png',
     'image/card/guanshi.png',
+    'image/card/guangshatianyi.png',
     'image/card/guding.png',
     'image/card/guiyoujie.png',
+    'image/card/guiyanfadao.png',
+    'image/card/guilingyupei.png',
     'image/card/guohe.png',
     'image/card/hanbing.png',
     'image/card/haotianta.png',
@@ -64,6 +67,7 @@ window.noname_asset_list=[
     'image/card/hsshenqi_morijingxiang.jpg',
     'image/card/hsshenqi_nengliangzhiguang.jpg',
     'image/card/hualiu.png',
+    'image/card/huanpodan.png',
     'image/card/hufu.png',
     'image/card/huimiezhichui.png',
     'image/card/huogong.png',
@@ -116,6 +120,7 @@ window.noname_asset_list=[
     'image/card/shuiyanqijunx.png',
     'image/card/shunshou.png',
     'image/card/shushangkaihua.png',
+    'image/card/sifeizhenmian.png',
     'image/card/spell_ansezhadan.jpg',
     'image/card/spell_anyingkuangluan.jpg',
     'image/card/spell_anyinglieyan.jpg',
@@ -265,6 +270,7 @@ window.noname_asset_list=[
     'image/card/wuxingpan.png',
     'image/card/wuzhong.png',
     'image/card/xiangyuye.png',
+    'image/card/xianluhui.png',
     'image/card/xietianzi.png',
     'image/card/xingjiegoutong.png',
     'image/card/xingjunyan.png',
diff --git a/game/game.js b/game/game.js
index b7ed577ef..fadaa1e3a 100755
--- a/game/game.js
+++ b/game/game.js
@@ -6147,6 +6147,9 @@
 					next.skill=event.skill;
 					next.multitarget=info.multitarget;
 					next.preResult=event.preResult;
+                    if(info.targetDelay===false){
+                        event.targetDelay=false;
+                    }
 					if(num==0&&next.targets.length>1){
 						if(!info.multitarget){
 							lib.tempSortSeat=player;
@@ -6184,7 +6187,9 @@
 								}
 							}
 						}
-						else game.delayx(0.5);
+						else if(event.targetDelay!==false){
+                            game.delayx(0.5);
+                        }
 					}
 					"step 3"
 					if(!get.info(event.card).multitarget&&num<targets.length-1){
diff --git a/game/update.js b/game/update.js
index 2cc980b2c..075a6550e 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,5 +1,5 @@
 window.noname_update={
-    version:'1.8.17.6',
+    version:'1.8.18',
     changeLog:[
         '修bug',
     ],
@@ -11,11 +11,18 @@ window.noname_update={
             'card/standard.js',
             'card/sp.js',
             'card/yunchou.js',
+            'card/guozhan.js',
             'character/rank.js',
             'character/ow.js',
+            'character/yxs.js',
+            'character/swd.js',
             'character/sp.js',
             'character/hearth.js',
             'character/xianjian.js',
+            'character/gujian.js',
+            'mode/identity.js',
+            'mode/guozhan.js',
+            'layout/default/layout.css',
         ],
         '1.8.17.5':[],
     }
diff --git a/image/card/chilongya.png b/image/card/chilongya.png
index 9bf1d4be6..f3bb978fd 100644
Binary files a/image/card/chilongya.png and b/image/card/chilongya.png differ
diff --git a/image/card/guangshatianyi.png b/image/card/guangshatianyi.png
new file mode 100644
index 000000000..92a5593d0
Binary files /dev/null and b/image/card/guangshatianyi.png differ
diff --git a/image/card/guilingyupei.png b/image/card/guilingyupei.png
new file mode 100644
index 000000000..8abbc1f37
Binary files /dev/null and b/image/card/guilingyupei.png differ
diff --git a/image/card/guiyanfadao.png b/image/card/guiyanfadao.png
new file mode 100644
index 000000000..90959a28e
Binary files /dev/null and b/image/card/guiyanfadao.png differ
diff --git a/image/card/huanpodan.png b/image/card/huanpodan.png
new file mode 100644
index 000000000..a3eea577e
Binary files /dev/null and b/image/card/huanpodan.png differ
diff --git a/image/card/sifeizhenmian.png b/image/card/sifeizhenmian.png
new file mode 100644
index 000000000..79ceef11f
Binary files /dev/null and b/image/card/sifeizhenmian.png differ
diff --git a/image/card/xianluhui.png b/image/card/xianluhui.png
new file mode 100644
index 000000000..052842e81
Binary files /dev/null and b/image/card/xianluhui.png differ
diff --git a/image/character/ow_dva.jpg b/image/character/ow_dva.jpg
index f8ef5a9b5..3fd8d869e 100644
Binary files a/image/character/ow_dva.jpg and b/image/character/ow_dva.jpg differ
diff --git a/image/character/ow_kuangshu.jpg b/image/character/ow_kuangshu.jpg
index 3c973939c..be2b36bc6 100644
Binary files a/image/character/ow_kuangshu.jpg and b/image/character/ow_kuangshu.jpg differ
diff --git a/image/character/ow_tuobiang.jpg b/image/character/ow_tuobiang.jpg
index d6e25d813..8ddb13bc6 100644
Binary files a/image/character/ow_tuobiang.jpg and b/image/character/ow_tuobiang.jpg differ
diff --git a/layout/default/layout.css b/layout/default/layout.css
index 8072c6325..ca0a43608 100755
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -1511,8 +1511,8 @@ span[data-color="unknownm"]{
 	border:1px solid #631515;
 }
 .card.fullskin.poison>.name{
-	color:#631515;
-	border:1px solid #631515;
+	color:#00312d;
+	border:1px solid #00312d;
 }
 .card.fullskin.epic>.name{
 	color: white;
diff --git a/mode/guozhan.js b/mode/guozhan.js
index e93ce80e5..28daebb0a 100755
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -1018,7 +1018,7 @@ mode.guozhan={
 				return false;
 			},
 			logAi:function(targets,card){
-				if(this.ai.shown==1) return;
+				if(this.ai.shown==1||this.isMad()) return;
 				if(typeof targets=='number'){
 					this.ai.shown+=targets;
 				}
diff --git a/mode/identity.js b/mode/identity.js
index 4ed2cdfcb..de483fda5 100755
--- a/mode/identity.js
+++ b/mode/identity.js
@@ -1211,7 +1211,7 @@ mode.identity={
 
 			},
 			logAi:function(targets,card){
-				if(this.ai.shown==1) return;
+				if(this.ai.shown==1||this.isMad()) return;
 				if(typeof targets=='number'){
 					this.ai.shown+=targets;
 				}