From df3ff4af780b6ef343bd5d11a4fd0e46ee9d408c Mon Sep 17 00:00:00 2001 From: WEBXOSS Date: Sat, 5 Nov 2016 18:40:21 +0800 Subject: [PATCH] Hotfix --- Card.js | 2 +- Zone.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Card.js b/Card.js index bf2cb40..20a0ecb 100644 --- a/Card.js +++ b/Card.js @@ -717,7 +717,7 @@ Card.prototype.moveTo = function (zone,arg) { // 是 SIGNI 下方的卡,比如魅饰卡 // 处理魅饰卡 var signi = card.zone.getActualCards()[0]; - if (card === signi.charm) { + if (signi && card === signi.charm) { moveEvent.isCharm = true; signi.charm = null; } diff --git a/Zone.js b/Zone.js index 9e6a569..1e8d0d7 100644 --- a/Zone.js +++ b/Zone.js @@ -54,7 +54,7 @@ Zone.prototype.getActualCards = function () { return this.cards.filter(function (card) { return !inArr(card,this.game.trashingCharms) && !inArr(card,this.game.trashingCards); - }); + },this); }; Zone.prototype.moveCardsToTop = function (cards) {