From d5f6114813cfb945f699b1bcdeb846ce49f8603c Mon Sep 17 00:00:00 2001
From: mengxinzxz <2223529500@qq.com>
Date: Thu, 21 Mar 2024 20:56:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A2=E5=BC=88=E3=80=90=E9=82=80=E5=BC=88?=
 =?UTF-8?q?=E3=80=91=E3=80=81=E8=B0=8B=E9=B2=81=E8=82=83=E3=80=90=E5=AD=9F?=
 =?UTF-8?q?=E8=B0=8B=E3=80=91bugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 character/xianding.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/character/xianding.js b/character/xianding.js
index bf564614e..2054f99f2 100644
--- a/character/xianding.js
+++ b/character/xianding.js
@@ -1396,7 +1396,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						charlotte:true,
 						trigger:{global:'damageSource'},
 						filter:function(event,player){
-							if(event.getParent().type!='card') return false;
+							if(!event.source||event.getParent().type!='card') return false;
 							if(event.source.isHealthy()||event.card.name!='sha') return false;
 							return event.getParent(4).name=='dcsbmengmou'&&event.getParent(4).player==player;
 						},
@@ -7968,8 +7968,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				audio:2,
 				getZhuanhuanji:function(player,bool){
 					var skills=player.getSkills(null,false,false).filter(function(i){
-						const list=get.skillCategoriesOf(i);
-						return !list.includes('Charlotte')&&list.includes('转换技');
+						return get.is.zhuanhuanji(i,player);
 					});
 					if(!bool) return skills;
 					if(!skills.length) return 'none';
@@ -7981,7 +7980,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 				getState:function(player,skill){
 					var info=get.info(skill),zhuanhuan=info.zhuanhuanji;
-					if(zhuanhuan=='number') return (player.countMark(skill)%2==1);
+					if(zhuanhuan&&zhuanhuan=='number') return (player.countMark(skill)%2==1);
 					return Boolean(player.storage[skill]);
 				},
 				trigger:{