diff --git a/card/extra.js b/card/extra.js
index 7d1ab7dcf..f0bda800c 100644
--- a/card/extra.js
+++ b/card/extra.js
@@ -424,7 +424,7 @@ card.extra={
 			priority:6,
 			audio:true,
 			filter:function(event,player){
-				if(event.player.num('s','unequip')) return false;
+				if(event.player.hasSkillTag('unequip',false,event.card)) return false;
 				if(event.card.name=='nanman') return true;
 				if(event.card.name=='wanjian') return true;
 				if(event.card.name=='sha'&&!event.card.nature) return true;
@@ -436,7 +436,7 @@ card.extra={
 			ai:{
 				effect:{
 					target:function(card,player,target,current){
-						if(player.num('s','unequip')) return;
+						if(player.hasSkillTag('unequip',false,card)) return;
 						if(card.name=='nanman'||card.name=='wanjian') return 'zerotarget';
 						if(card.name=='sha'){
     						var equip1=player.get('e','1');
@@ -475,7 +475,7 @@ card.extra={
 			audio:true,
 			filter:function(event,player){
 				if(event.num<=1) return false;
-				if(event.parent.player.num('s','unequip')) return false;
+				if(event.source&&event.source.hasSkillTag('unequip',false,event.card)) return false;
 				return true;
 			},
 			priority:-10,
diff --git a/card/guozhan.js b/card/guozhan.js
index 2b1e4717e..7542726f0 100644
--- a/card/guozhan.js
+++ b/card/guozhan.js
@@ -758,7 +758,7 @@ card.guozhan={
 		taipingyaoshu:{
 			trigger:{player:'damageBefore'},
 			filter:function(event){
-				if(event.source&&event.source.num('s','unequip')) return;
+				if(event.source&&event.source.hasSkillTag('unequip',false,event.card)) return false;
 				if(event.nature) return true;
 			},
 			forced:true,
diff --git a/card/standard.js b/card/standard.js
index fe58472a1..7cbe6f561 100644
--- a/card/standard.js
+++ b/card/standard.js
@@ -1342,7 +1342,7 @@ card.standard={
 			priority:6,
 			audio:true,
 			filter:function(event){
-				if(event.player.num('s','unequip')) return false;
+				if(event.player.hasSkillTag('unequip',false,event.card)) return false;
 				return (event.card.name=='sha'&&get.color(event.card)=='black')
 			},
 			content:function(){
@@ -1352,9 +1352,7 @@ card.standard={
 			ai:{
 				effect:{
 					target:function(card,player){
-						var equip1=player.get('e','1');
-						if(equip1&&equip1.name=='qinggang') return 1;
-						if(player.num('s','unequip')) return;
+						if(player.hasSkillTag('unequip',false,card)) return;
 						if(card.name=='sha'&&get.color(card)=='black') return 'zerotarget';
 					}
 				}
@@ -1393,14 +1391,12 @@ card.standard={
 			}
 		},
 		qinggang_skill:{
-			trigger:{player:'useCard'},
-			forced:true,
-			priority:10,
-			filter:function(event){
-				return event.card.name=='sha';
-			},
-			content:function(){
-				player.addTempSkill('unequip','useCardAfter');
+			ai:{
+				unequip:true,
+				skillTagFilter:function(player,tag,arg){
+					if(arg&&arg.name=='sha') return true;
+					return false;
+				}
 			}
 		},
 		qinglong_skill:{
@@ -1529,7 +1525,8 @@ card.standard={
 			filter:function(event,player){
 				if(event.responded) return false;
 				if(!event.filterCard({name:'shan'})) return false;
-				if(event.getParent().player.num('s','unequip')) return false;
+				var evt=event.getParent();
+				if(evt.player&&evt.player.hasSkillTag('unequip',false,evt.card)) return false;
 				return true;
 			},
 			audio:true,
@@ -1550,7 +1547,7 @@ card.standard={
 			ai:{
 				effect:{
 					target:function(card,player,target,effect){
-						if(player.num('s','unequip')) return;
+						if(player.hasSkillTag('unequip',false,card)) return;
 						if(get.tag(card,'respondShan')) return 0.5;
 					}
 				}