From d54147f9bef8a6d056e593ec24115e71cdaaaa5d Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Thu, 14 Nov 2019 14:05:56 +0800 Subject: [PATCH] Add files via upload --- card/sp.js | 2 +- character/refresh.js | 2 +- character/xinghuoliaoyuan.js | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/card/sp.js b/card/sp.js index fe551bece..306c8f891 100644 --- a/card/sp.js +++ b/card/sp.js @@ -541,7 +541,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ popup:false, filter:function(event,player){ if(event.player==player) return false; - if(event.getParent().directHitcontains(player)) return false; + if(event.getParent().directHit.contains(player)) return false; var num=player.countCards('h','jinchan'); return num&&num==player.countCards('h'); }, diff --git a/character/refresh.js b/character/refresh.js index 70798235b..4b10f8618 100755 --- a/character/refresh.js +++ b/character/refresh.js @@ -2811,7 +2811,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ content:function(){ player.chooseToUse({name:'sha'},'诛害：是否对'+get.translation(trigger.player)+'使用一张杀？').set('logSkill','zhuhai').set('complexSelect',true).set('filterTarget',function(card,player,target){ if(target!=_status.event.sourcex&&!ui.selected.targets.contains(_status.event.sourcex)) return false; - return lib.filter.filterTarget.apply(this,arguments); + return lib.filter.targetEnabled.apply(this,arguments); }).set('sourcex',trigger.player); } }, diff --git a/character/xinghuoliaoyuan.js b/character/xinghuoliaoyuan.js index f14fb1817..3354ce58b 100755 --- a/character/xinghuoliaoyuan.js +++ b/character/xinghuoliaoyuan.js @@ -4443,10 +4443,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ content:function(){ var evt=event.getParent('arrangeTrigger'); if(evt&&evt.map){ - for(var i in evt.map){ - evt.map[i].list=[]; - } - evt.list=[]; + evt.map=[]; + evt.doing.list=[]; } game.log(player,'跳过了',event.triggername=='phaseBegin'?'准备阶段':'结束阶段'); },