From ceaaa7018567596e5b8ab191815387ffbc275758 Mon Sep 17 00:00:00 2001 From: mengxinzxz <139629761+mengxinzxz@users.noreply.github.com> Date: Thu, 26 Oct 2023 21:31:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=8F=E8=8D=80=E6=94=B8=E3=80=90=E7=99=BE?= =?UTF-8?q?=E5=87=BA=E3=80=91=E9=99=90=E5=88=B6=E6=97=A0=E8=89=B2=E7=89=8C?= =?UTF-8?q?=E7=BB=84=E5=90=88=E4=B8=8D=E8=83=BD=E8=A2=AB=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/clan.js | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/character/clan.js b/character/clan.js index b4336712c..7ea0ea235 100644 --- a/character/clan.js +++ b/character/clan.js @@ -40,6 +40,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ trigger:{player:'useCardAfter'}, filter:function(event,player){ if(player.getStorage('clanbaichu').contains(event.card.name)) return true; + if(get.suit(event.card)=='none') return false; var str=(get.suit(event.card)+'、'+get.type2(event.card)); if(!player.getStorage('clanbaichu').contains(str)) return true; return !player.hasSkill('qice'); @@ -47,31 +48,34 @@ game.import('character',function(lib,game,ui,get,ai,_status){ forced:true, content:function(){ 'step 0' - var str=(get.suit(trigger.card)+'+'+get.type2(trigger.card)); if(player.getStorage('clanbaichu').contains(trigger.card.name)){ event.draw=true; } - if(player.getStorage('clanbaichu').contains(str)){ - if(!player.hasSkill('qice')){ - player.addTempSkill('qice','roundStart'); - player.popup('奇策'); - game.log(player,'获得了技能','#g【奇策】'); + if(get.suit(trigger.card)!='none'){ + var str=(get.suit(trigger.card)+'+'+get.type2(trigger.card)); + if(player.getStorage('clanbaichu').contains(str)){ + if(!player.hasSkill('qice')){ + player.addTempSkill('qice','roundStart'); + player.popup('奇策'); + game.log(player,'获得了技能','#g【奇策】'); + } + event.goto(2); } - event.goto(2); - } - else{ - player.markAuto('clanbaichu',[str]); - var list=lib.inpile.filter(name=>get.type(name)=='trick'&&!player.getStorage('clanbaichu').contains(name)); - if(list.length){ - var dialog=['请选择【百出】记录的普通锦囊牌牌名',[list,'vcard']]; - player.chooseButton(dialog,true).set('ai',function(button){ - var player=_status.event.player,name=button.link[2]; - if(name=='wuxie') return 114514; - return get.effect(player,{name:name},player,player)*(1+player.countCards('hs',name)); - }); + else{ + player.markAuto('clanbaichu',[str]); + var list=lib.inpile.filter(name=>get.type(name)=='trick'&&!player.getStorage('clanbaichu').contains(name)); + if(list.length){ + var dialog=['请选择【百出】记录的普通锦囊牌牌名',[list,'vcard']]; + player.chooseButton(dialog,true).set('ai',function(button){ + var player=_status.event.player,name=button.link[2]; + if(name=='wuxie') return 114514; + return get.effect(player,{name:name},player,player)*(1+player.countCards('hs',name)); + }); + } + else event.goto(2); } - else event.goto(2); } + else event.goto(2); 'step 1' if(result.bool){ var name=result.links[0][2];