diff --git a/character/extra.js b/character/extra.js index b4c2be2b3..f6f38955c 100755 --- a/character/extra.js +++ b/character/extra.js @@ -3413,7 +3413,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ trigger:{global:'useCard'}, forced:true, filter:function(event,player){ - return (event.card.name=='qizhengxiangsheng'||get.zhinangs().includes(event.card.name)||player.getStorage('dinghan').includes(event.card.name))&&event.card.isCard&&event.cards.length==1; + if(!event.card.isCard||!event.cards||event.cards.length!==1) return false; + return event.card.name=='qizhengxiangsheng'||get.zhinangs().includes(event.card.name)||player.getStorage('dinghan').includes(event.card.name); }, content:function(){ player.draw(); diff --git a/character/huicui.js b/character/huicui.js index 12d2c3166..5e2edd5ce 100644 --- a/character/huicui.js +++ b/character/huicui.js @@ -2179,6 +2179,19 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } } } + }, + count:{ + intro:{ + content:function(s,p){ + let str='此阶段已转化过的卡牌花色:'; + for(let i=0;icard.hasGaintag('sbguanxing'),'s'); + var bool=player.hasCard(card=>card.hasGaintag('sbguanxing'),'s'); if(event.name=='phaseZhunbei'){ var num=player.countMark('sbguanxingx'); return bool||num<=3;