From 1300dcb0e7a41e2a388de428b611a0e94d69dc12 Mon Sep 17 00:00:00 2001
From: mengxinzxz <139629761+mengxinzxz@users.noreply.github.com>
Date: Sun, 29 Oct 2023 13:09:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=84=E6=89=BF=E5=BD=A6=E3=80=90=E8=A7=A3?=
 =?UTF-8?q?=E9=98=B5=E3=80=91=E6=94=B9=E4=B8=BA=E6=96=B0=E6=9C=8D=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=EF=BC=88=E9=BB=84=E6=89=BF=E5=BD=A6=E6=AD=BB=E4=BA=A1?=
 =?UTF-8?q?=E5=90=8E=E6=8A=80=E8=83=BD=E4=B8=8D=E6=81=A2=E5=A4=8D=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 character/huicui.js | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/character/huicui.js b/character/huicui.js
index 8c5d15c1c..589aaa6a4 100644
--- a/character/huicui.js
+++ b/character/huicui.js
@@ -5749,9 +5749,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				audio:2,
 				enable:'phaseUse',
 				usable:1,
-				filterTarget:function(card,player,target){
-					return target!=player;
-				},
+				filterTarget:lib.filter.notMe,
 				content:function(){
 					var skills=target.getSkills(null,false,false).filter(function(i){
 						if(i=='bazhen') return;
@@ -5797,6 +5795,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						mark:true,
 						marktext:'阵',
 						intro:{
+							markcount:()=>0,
 							content:function(storage,player,skill){
 								if(storage.length) return '失效技能：'+get.translation(storage);
 								return '无失效技能';
@@ -5815,7 +5814,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						onremove:true,
 						filter:function(event,player){
 							if(event.name=='die'){
-								return player==event.player||player.getStorage('dcjiezhen_clear').contains(event.player);
+								return player.getStorage('dcjiezhen_clear').contains(event.player);
 							}
 							else if(event.name=='judge'){
 								return event.skill=='bagua'&&player.getStorage('dcjiezhen_clear').contains(event.player);
@@ -5829,14 +5828,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						content:function(){
 							'step 0'
 							var targets=player.getStorage('dcjiezhen_clear');
-							if(trigger.name=='die'&&player==trigger.player){
-								for(var target of targets){
-									target.removeSkill('dcjiezhen_blocker');
-								}
-								player.removeSkill('dcjiezhen_clear');
-								event.finish();
-								return;
-							}
 							if(trigger.name=='phase') event.targets=targets.slice(0).sortBySeat();
 							else event.targets=[trigger.player];
 							'step 1'