From c212e2fa65caee73567262af91b4ccaa25dc3d44 Mon Sep 17 00:00:00 2001 From: libccy Date: Sat, 29 Apr 2017 11:32:50 +0800 Subject: [PATCH] 2 --- character/refresh.js | 12 ++++++------ game/update.js | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/character/refresh.js b/character/refresh.js index f8ca7f8bc..48e7223e9 100644 --- a/character/refresh.js +++ b/character/refresh.js @@ -441,14 +441,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){ return 0; }).set('eff',ai.get.damageEffect(trigger.source,player,player)); "step 2" - if(result.judge==1&&trigger.source.countCards('he')){ - player.discardPlayerCard(trigger.source,'he',true); - } - else{ - if(result.judge==2){ - trigger.source.damage(); + if(result.color=='black'){ + if(trigger.source.countCards('he')){ + player.discardPlayerCard(trigger.source,'he',true); } } + else if(trigger.source.isIn()){ + trigger.source.damage(); + } event.num--; if(event.num>0){ player.chooseBool('是否继续发动?'); diff --git a/game/update.js b/game/update.js index 72c9ebbe1..e64920dac 100644 --- a/game/update.js +++ b/game/update.js @@ -1,5 +1,5 @@ window.noname_update={ - version:'1.9.26.2', + version:'1.9.26.3', update:'1.9.26', changeLog:[ 'bug修复' @@ -15,6 +15,8 @@ window.noname_update={ // 'card/sp.js', // 'card/yunchou.js', // 'character/*', + 'character/refresh.js', + 'character/ow.js', // 'mode/boss.js', // 'mode/versus.js', // 'mode/guozhan.js',