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

Hotfix

Browse source
This commit is contained in:
WEBXOSS 2016-11-05 18:40:21 +08:00
parent 975e26901a
commit df3ff4af78
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Card.js
View file

@ -717,7 +717,7 @@ Card.prototype.moveTo = function (zone,arg) {
// 是 SIGNI 下方的卡,比如魅饰卡 // 是 SIGNI 下方的卡,比如魅饰卡
// 处理魅饰卡 // 处理魅饰卡
var signi = card.zone.getActualCards()[0]; var signi = card.zone.getActualCards()[0];
if (card === signi.charm) { if (signi && card === signi.charm) {
moveEvent.isCharm = true; moveEvent.isCharm = true;
signi.charm = null; signi.charm = null;
} }

2
Zone.js
View file

@ -54,7 +54,7 @@ Zone.prototype.getActualCards = function () {
return this.cards.filter(function (card) { return this.cards.filter(function (card) {
return !inArr(card,this.game.trashingCharms) && return !inArr(card,this.game.trashingCharms) &&
!inArr(card,this.game.trashingCards); !inArr(card,this.game.trashingCards);
}); },this);
}; };
Zone.prototype.moveCardsToTop = function (cards) { Zone.prototype.moveCardsToTop = function (cards) {