From 44fc8fca1f9a91060a7351e866f31cc876f0adb8 Mon Sep 17 00:00:00 2001 From: libccy Date: Sat, 11 Jun 2016 08:25:20 +0800 Subject: [PATCH] w --- game/game.js | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/game/game.js b/game/game.js index 8d9ab93de..cefb1fce8 100755 --- a/game/game.js +++ b/game/game.js @@ -4777,10 +4777,17 @@ return; } if(ui.tempnowuxie&&ui.tempnowuxie.classList.contains('glow')&&event.state>0){ - event.result={ - bool:false + var triggerevent=event.getTrigger(); + if(ui.tempnowuxie._origin==triggerevent.parent.id){ + event.result={ + bool:false + } + if(triggerevent.targets&&triggerevent.num==triggerevent.targets.length-1){ + ui.tempnowuxie.close(); + } + return; } - return; + } if(!_status.connectMode&&lib.config.wuxie_self&&event.getParent().state){ var tw=event.getTrigger().parent; @@ -25645,6 +25652,12 @@ this.classList.toggle('glow'); if(this.classList.contains('glow')&&_status.event.type=='wuxie'&& _status.event.isMine()&&ui.confirm&&_status.imchoosing){ + var triggerevent=_status.event.getTrigger(); + if(triggerevent&&this._origin==triggerevent.parent.id){ + if(triggerevent.targets&&triggerevent.num==triggerevent.targets.length-1){ + this.close(); + } + } ui.click.cancel(ui.confirm.lastChild); } },