ulith/webxoss-fixed
1
0
Fork 0
forked from mirrors/webxoss-core
Code Activity

Fix PR-305

Browse source
This commit is contained in:
WEBXOSS 2016-12-23 22:38:09 +08:00
parent bd3cce3e5d
commit 01eba6f5c1
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Card.js
View file

@ -1088,11 +1088,11 @@ Card.prototype.attackAsyn = function () {
if (opposingSigni && !card.assassin) {
// 战斗
// 触发"进行战斗"时点
var onBattleEvent = {
card: card,
opposingSigni: opposingSigni
};
return this.game.blockAsyn(this,function () {
var onBattleEvent = {
card: card,
opposingSigni: opposingSigni
};
this.game.frameStart();
card.onBattle.trigger(onBattleEvent);
opposingSigni.onBattle.trigger(onBattleEvent);
@ -1118,8 +1118,8 @@ Card.prototype.attackAsyn = function () {
});
}
}).callback(this,function () {
if (event._1877 && inArr(opposingSigni,opposingSigni.player.signis)) {
return this.game.blockAsyn(event._1877,this,function () {
if (onBattleEvent._1877 && inArr(opposingSigni,opposingSigni.player.signis)) {
return this.game.blockAsyn(onBattleEvent._1877,this,function () {
opposingSigni.moveTo(opposingSigni.player.mainDeck,{bottom: true});
});
}

2
CardInfo.js
View file

@ -115267,7 +115267,7 @@ var CardInfo = {
description: '1877-const-0',
optional: true,
actionAsyn: function (event) {
return this.discardAsyn(1).callback(this,function (cards) {
return this.player.discardAsyn(1).callback(this,function (cards) {
if (!cards.length) return;
event._1877 = this;
});