From 2b8d2fb25e9b2c81965df4b3bd2963a1c4744efb Mon Sep 17 00:00:00 2001 From: copcap Date: Mon, 31 Jul 2023 10:21:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=A1=93=E8=8C=83?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=92=8C=E5=AD=99=E5=AF=92=E5=8D=8E=E4=B8=80?= =?UTF-8?q?=E4=B8=AAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/huicui.js | 2 +- character/xianding.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/character/huicui.js b/character/huicui.js index 18b9dd342..402a814fd 100644 --- a/character/huicui.js +++ b/character/huicui.js @@ -1488,7 +1488,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ intro:{ name2:'灵', mark:function(dialog,storage,player){ - dialog.addText('共有'+player.countMark(storage)+'个标记'); + dialog.addText('共有'+(storage||0)+'个标记'); dialog.addText('注：图标的颜色代表弃牌堆中较多的颜色'); }, }, diff --git a/character/xianding.js b/character/xianding.js index d6e46944b..9d75158cb 100644 --- a/character/xianding.js +++ b/character/xianding.js @@ -1429,7 +1429,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ 'step 2' if(result.bool){ var targets=result.targets; - targets.sortBySeat(_status.currentPhase); + targets.sortBySeat(player); event.targets=targets; player.logSkill('dcfumou',targets); event.num--; @@ -10944,7 +10944,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ dcjianzheng:'谏诤', dcjianzheng_info:'出牌阶段限一次。你可以观看一名其他角色的手牌，然后若其中有你可以使用的手牌，你获得并使用其中一张。若你以此法使用牌指定了其为目标，你令你与其横置，然后其观看你的手牌。', dcfumou:'腹谋', - dcfumou_info:'当你受到伤害后，你可以令至多X名角色依次选择一项：1.移动场上的一张牌；2.弃置所有手牌并摸两张牌；3.弃置装备区里的所有牌并回复1点体力（X为你已损失的体力值）。', + dcfumou_info:'当你受到伤害后，你可以令至多X名角色从你开始逆时针依次选择一项：1.移动场上的一张牌；2.弃置所有手牌并摸两张牌；3.弃置装备区里的所有牌并回复1点体力（X为你已损失的体力值）。', chentai:'陈泰', dcctjiuxian:'救陷', dcctjiuxian_info:'出牌阶段限一次。你可以重铸一半数量的手牌（向上取整），然后视为使用一张【决斗】。当此牌对目标角色造成伤害后，你可以令其攻击范围内的一名其他角色回复1点体力。', From c0ff8cc326bf82e653fa319d7b1fce03e43badc1 Mon Sep 17 00:00:00 2001 From: copcap Date: Mon, 31 Jul 2023 10:39:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AD=99=E5=AF=92=E5=8D=8E=E6=A0=87?= =?UTF-8?q?=E8=AE=B0bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/huicui.js | 8 ++++++++ character/sp.js | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/character/huicui.js b/character/huicui.js index 402a814fd..460070663 100644 --- a/character/huicui.js +++ b/character/huicui.js @@ -1562,6 +1562,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(color=='red') red++; if(color=='black') black++; } + if(trigger.name.indexOf('lose')==0){ + var cards=trigger.getd().filterInD('d'); + for(var i=0;i灵'; for(var player of game.players){ diff --git a/character/sp.js b/character/sp.js index 29cc1ad06..572c36cdf 100755 --- a/character/sp.js +++ b/character/sp.js @@ -12144,7 +12144,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ player:'enterGame', }, forced:true, - filter:function(event){ + filter:function(event,player){ return game.hasPlayer(current=>current!=player)&&(event.name!='phase'||game.phaseNumber==0); }, audio:6,