diff --git a/ConstEffectManager.js b/ConstEffectManager.js index 13965ec..db0a977 100644 --- a/ConstEffectManager.js +++ b/ConstEffectManager.js @@ -160,6 +160,11 @@ ConstEffectManager.prototype.compute = function () { cardsAbilityLost.forEach(function (card) { if (!oldAbilityLostMap[card.gid]) { // 从"不失去能力"变为"失去能力" + this.game.triggeringEffects.forEach(function (effect) { + if (effect.source === card) { + effect.disabled = true; + } + }); this.game.effectManager.removeTriggeredEffectBySource(card); } },this); diff --git a/Effect.js b/Effect.js index 8cb988e..cb5cc31 100644 --- a/Effect.js +++ b/Effect.js @@ -65,6 +65,7 @@ Effect.prototype.triggerAndHandleAsyn = function (event) { }; Effect.prototype.checkCondition = function () { + if (this.disabled) return false; // "结束这个回合",如<终结之洞> var game = this.effectManager.game; if (game.getData(game,'endThisTurn')) return false;