From f68afdb54212c191d88a611830fa01292b610573 Mon Sep 17 00:00:00 2001 From: WEBXOSS Date: Sun, 13 Aug 2017 19:38:59 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20WX16-027=20summon=20(add?= =?UTF-8?q?=20afterSummonAsyn)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Card.js | 11 ++++++++--- CardInfo.js | 5 +++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Card.js b/Card.js index 416e4d9..2b38d6f 100644 --- a/Card.js +++ b/Card.js @@ -1132,7 +1132,7 @@ Card.prototype.moveTo = function (zone,arg) { } card.game.frameEnd(); - return true; + return moveEvent; }; Card.prototype.changeSigniZone = function (zone) { @@ -1585,10 +1585,15 @@ Card.prototype.handleSummonAsyn = function(zone,arg) { return this.game.blockAsyn(this,function () { return this.beforeSummonAsyn(zone); }); - }).callback(this,function () { + }).callback(this,function (afterSummonAsyn) { arg = Object.create(arg); arg.isSummon = true; - this.moveTo(zone,arg); + var event = this.moveTo(zone,arg); + if (isFunc(afterSummonAsyn)) { + return afterSummonAsyn.call(this,event).callback(this,function () { + this.game.handleFrameEnd(); // 增加一个空帧,以进行两次常计算 + }); + } this.game.handleFrameEnd(); // 增加一个空帧,以进行两次常计算 }); }; diff --git a/CardInfo.js b/CardInfo.js index 1fef40c..f166a24 100644 --- a/CardInfo.js +++ b/CardInfo.js @@ -118010,6 +118010,11 @@ var CardInfo = { },this); cards.push(target); this.game.moveCards(cards,card.zone); + return function afterSummonAsyn (event) { + return this.game.blockAsyn(this,function () { + target.onRised.trigger(event); + }); + }; }); }, // ======================