diff --git a/character/sp.js b/character/sp.js index 7aa494bff..3f3fa4c02 100644 --- a/character/sp.js +++ b/character/sp.js @@ -590,7 +590,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var target=player.storage.xianfu2; player.line(target,'green'); target.logSkill('xianfu'); - target[trigger.name](trigger.num); + target[trigger.name](trigger.num,trigger.source||'nosource'); game.delay(); }, group:'xianfu3', @@ -1416,6 +1416,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ chuanxin:{ trigger:{source:'damageBefore'}, filter:function(event,player){ + if(_status.currentPhase!=player) return false; + if(!_status.event.getParent('phaseUse')) return false; if(event.card&&(event.card.name=='sha'||event.card.name=='juedou')){ if(get.mode()=='guozhan'){ return (event.player.identity!='qun'||player.identity=='ye')&& diff --git a/game/game.js b/game/game.js index e315f4f90..bb5297183 100644 --- a/game/game.js +++ b/game/game.js @@ -17265,7 +17265,7 @@ if(player.identity=='unknown'||player.identity=='ye') return false; return this.identity==player.identity; } - if(typeof this.side=='boolean'&&typeof player.side=='boolean'){ + if(this.side!=undefined&&typeof player.side=='boolean'){ return this.side==player.side; } return this==player; @@ -19445,6 +19445,7 @@ cancel:function(){ this.untrigger.call(this,arguments); this.finish(); + this.trigger(this.name+'Cancelled'); }, goto:function(step){ this.step=step-1; diff --git a/game/update.js b/game/update.js index f4e2f8cc6..fd02d3533 100644 --- a/game/update.js +++ b/game/update.js @@ -2,10 +2,10 @@ window.noname_update={ version:'1.9.40', // update:'1.9.38.1', changeLog:[ - '原7武将', - '诸侯伐董', + '原7武将、新张宝', + '诸侯伐董、神之试炼', '武将称号', - 'bug修复(父魂)' + 'bug修复(父魂、截辎、穿心、先辅、魔箭)' ], files:[ // 'game/game.js',