diff --git a/card/guozhan.js b/card/guozhan.js index a805e624d..88b7009bb 100644 --- a/card/guozhan.js +++ b/card/guozhan.js @@ -386,9 +386,7 @@ card.guozhan={ chongzhu:true, filterTarget:function(card,player,target){ if(player==target) return false; - return (target.get('h').length|| - target.classList.contains('unseen')|| - target.classList.contains('unseen2')) + return (target.get('h').length||target.isUnseen(2)); }, content:function(){ "step 0" @@ -398,8 +396,8 @@ card.guozhan={ player.storage.zhibi.add(target); var controls=[]; if(target.get('h').length) controls.push('手牌'); - if(target.classList.contains('unseen')) controls.push('主将'); - if(target.classList.contains('unseen2')) controls.push('副将'); + if(target.isUnseen(0)) controls.push('主将'); + if(target.isUnseen(1)) controls.push('副将'); if(controls.length>1){ player.chooseControl(controls); } @@ -425,7 +423,7 @@ card.guozhan={ content=[str+'手牌',target.get('h')]; game.log(player,'观看了',target,'的手牌'); } - else if(target.classList.contains('unseen')){ + else if(target.isUnseen(0)){ content=[str+'主将',[[target.name1],'character']]; game.log(player,'观看了',target,'的主将'); } diff --git a/mode/guozhan.js b/mode/guozhan.js index 019e0d895..6f248ce2d 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -236,6 +236,9 @@ mode.guozhan={ } }, skill:{ + // baoling:{ + // trigger:{player:'phaseEnd'}, + // }, gzmingshi:{ trigger:{player:'damageBegin'}, forced:true, @@ -1868,7 +1871,12 @@ mode.guozhan={ game.tryResult(); }, isUnseen:function(){ - return (this.classList.contains('unseen')&&this.classList.contains('unseen2')); + switch(num){ + case 0:return this.classList.contains('unseen'); + case 1:return this.classList.contains('unseen2'); + case 2:return this.classList.contains('unseen')||this.classList.contains('unseen2'); + default:return this.classList.contains('unseen')&&this.classList.contains('unseen2'); + } }, checkShow:function(skill){ var sourceSkill=get.info(skill);