diff --git a/character/ow.js b/character/ow.js
index 843023e1c..5edf4e1f6 100644
--- a/character/ow.js
+++ b/character/ow.js
@@ -1859,14 +1859,13 @@ character.ow={
             }
         },
         feiren:{
-			trigger:{player:'useCard'},
+            trigger:{source:'damageBegin'},
 			forced:true,
-			priority:10,
-			filter:function(event){
-				return event.card.name=='sha';
+			filter:function(event,player){
+				return event.card&&event.card.name=='sha'&&get.suit(event.card)=='spade'&&event.notLink();
 			},
 			content:function(){
-				player.addTempSkill('unequip','useCardAfter');
+				trigger.num++;
 			},
             mod:{
                 targetInRange:function(card){
@@ -1878,22 +1877,10 @@ character.ow={
                     }
                 },
             },
-            group:['feiren2'],
             ai:{
                 threaten:1.4
             }
 		},
-        feiren2:{
-            trigger:{source:'damageBegin'},
-			forced:true,
-            popup:false,
-			filter:function(event,player){
-				return event.card&&event.card.name=='sha'&&get.suit(event.card)=='spade';
-			},
-			content:function(){
-				trigger.num++;
-			}
-        },
         feiren3:{
 			trigger:{player:'useCardAfter'},
 			filter:function(event,player){
@@ -2993,7 +2980,7 @@ character.ow={
         mujing_old_info:'每当你对攻击范围不含你的角色使用一张牌，你可以弃置目标一张牌；若你的手牌数不多于目标，你摸一张牌',
         feiren:'飞刃',
         feiren2:'飞刃',
-        feiren_info:'你的杀无视距离和防具；你的黑桃杀造成的伤害+1，梅花杀可以额外指定一个目标',
+        feiren_info:'你的杀无视距离；你的黑桃杀造成的伤害+1，梅花杀可以额外指定一个目标',
         zhanlong:'斩龙',
         zhanlong_info:'限定技，准备阶段，若你体力值为1，你可以弃置所有牌（至少一张），然后将三张杀置入你的手牌，若如此做，你本回合使用杀无次数限制',
         xie:'谐',
diff --git a/character/rank.js b/character/rank.js
index 08f40aaf9..593bc9713 100644
--- a/character/rank.js
+++ b/character/rank.js
@@ -60,6 +60,8 @@ window.characterRank={
         'hs_morgl',
         'ow_luxiao',
         'gjqt_ouyangshaogong',
+        'ow_liekong',
+        'ow_ana',
     ],
     a:[
         'hs_khadgar',
@@ -113,8 +115,6 @@ window.characterRank={
         'bulianshi',
         'sp_pangtong',
         'liubiao',
-        'jianyong',
-        'zhoutai',
         'zhongyao',
         'liuchen',
         'baiwuchang',
@@ -125,9 +125,6 @@ window.characterRank={
         'hs_lafamu',
         'ow_chanyata',
         'ow_tianshi',
-        'ow_liekong',
-        'ow_ana',
-        'ow_heibaihe',
         'ow_maikelei',
         'ow_kuangshu',
         'ow_tuobiang',
@@ -145,6 +142,8 @@ window.characterRank={
     ],
     am:[
         'old_wangyi',
+        'jianyong',
+        'zhoutai',
         'zhugejin',
         'hs_totemic',
         'swd_duanmeng',
@@ -242,6 +241,7 @@ window.characterRank={
         'xiaoqiao',
         'sp_zhangjiao',
         'hs_tanghangu',
+        'ow_heibaihe',
         'ow_luba',
         'pal_leiyuange',
         'dongbai',
diff --git a/character/swd.js b/character/swd.js
index 22b22e7f9..f78a681c9 100644
--- a/character/swd.js
+++ b/character/swd.js
@@ -5846,6 +5846,10 @@ character.swd={
 			content:function(){
 				"step 0"
 				var card=target.get('h').randomGet();
+				if(!card){
+					event.finish();
+					return;
+				}
 				target.discard(card);
 				var color=get.color(card);
 				var suit=get.suit(card);
@@ -7552,6 +7556,7 @@ character.swd={
 			check:function(event,player){
 				return ai.get.attitude(player,event.target)<=0;
 			},
+			logTarget:'target',
 			content:function(){
 				"step 0"
 				player.judge(function(){
diff --git a/game/game.js b/game/game.js
index 99cf57498..01163363f 100644
--- a/game/game.js
+++ b/game/game.js
@@ -20061,6 +20061,9 @@
 				ui.me.hide();
 				ui.mebg.hide()
 				ui.autonode.hide();
+				if(lib.config.radius_size!='off'){
+					ui.historybar.style.borderRadius='0 0 0 4px';
+				}
 			}
             if(game.online){
                 var dialog=ui.create.dialog();