From 2c66172a564e51112502604e5e9707229fd10031 Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Thu, 29 Feb 2024 22:11:31 +0800
Subject: [PATCH] bugfix

---
 card/guozhan.js     | 2 +-
 character/huicui.js | 6 +++---
 character/mobile.js | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/card/guozhan.js b/card/guozhan.js
index b039871be..3e5ad1a4f 100644
--- a/card/guozhan.js
+++ b/card/guozhan.js
@@ -801,7 +801,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					target.draw();
 				},
 				destroy:function(card,targetPosition,player,event){
-					if(event.name!='lose'||event.name!='cardsDiscard'||targetPosition!='discardPile') return false;
+					if((event.name!='lose'&&event.name!='cardsDiscard')||targetPosition!='discardPile') return false;
 					var evt=event.getParent().relatedEvent;
 					if(evt&&evt.name=='useCard') return false;
 					return true;
diff --git a/character/huicui.js b/character/huicui.js
index 2464da9f4..8ddc57dc6 100644
--- a/character/huicui.js
+++ b/character/huicui.js
@@ -1043,14 +1043,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					if(bool){
 						const name=links.find(i=>typeof i=='string'),card=links.find(j=>j!=name),cardname=map[name];
 						const {result:{bool,targets}}=await player.chooseTarget('请选择【'+name+'（'+get.translation(card)+'）】置入的目标',(cardx,player,target)=>{
-							return target.canAddJudge(get.autoViewAs({name:'dczixi_'+get.event('name')},[get.event('card')]));
+							return target.canAddJudge(get.autoViewAs({name:'dczixi_'+get.event('cardname')},[get.event('card')]));
 						},true).set('ai',target=>{
 							const player=get.event('player'),card=get.event('card');
 							if(game.hasPlayer(current=>{
-								return get.attitude(player,current)<0&&current.canAddJudge(get.autoViewAs({name:'dczixi_'+get.event('name')},[card]));
+								return get.attitude(player,current)<0&&current.canAddJudge(get.autoViewAs({name:'dczixi_'+get.event('cardname')},[card]));
 							})) return -target.countCards('j')-1;
 							return target.countCards('j')+1;
-						}).set('card',card).set('name',cardname);
+						}).set('card',card).set('cardname',cardname);
 						if(bool){
 							const target=targets[0];
 							player.logSkill('dczixi',target);
diff --git a/character/mobile.js b/character/mobile.js
index e09cc052b..2a1a2744d 100644
--- a/character/mobile.js
+++ b/character/mobile.js
@@ -543,7 +543,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						'令其摸一张牌',
 					][['豹','鹰','熊','兔'].indexOf(zhoufa)]:'令其随机执行一个效果';
 					const {result:{bool,targets}}=await player.chooseTarget(get.prompt('shoufa'),'选择一名距离'+(event.triggername=='damageEnd'?'':'不')+'大于2的角色，'+str,(card,player,target)=>{
-						const name=_status.event.name;
+						const name=_status.event.triggername;
 						if(name=='damageEnd'&&get.distance(player,target)<=2) return false;
 						if(name=='damageSource'&&get.distance(player,target)>2) return false;
 						const zhoufa=player.storage.zhoulin_zhoufa;
@@ -570,7 +570,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							case '兔':
 								return get.effect(target,{name:'draw'},player,player);
 						}
-					}).set('name',event.triggername);
+					}).set('triggername',event.triggername);
 					if(!bool) return;
 					const target=targets[0];
 					player.logSkill('shoufa',target);