From 448937978874fb0cbc010f820489eac7d5c85442 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Sun, 21 Apr 2024 13:04:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?OL=E8=91=A3=E7=99=BD=E9=BB=A0=E6=85=A7?= =?UTF-8?q?=E8=B5=A0=E6=AF=92=E5=BC=B9=E7=AA=97=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/sp.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/character/sp.js b/character/sp.js index 8b9ace269..915ad0956 100755 --- a/character/sp.js +++ b/character/sp.js @@ -23921,17 +23921,16 @@ game.import("character", function () { filter: function (event, player) { if (event.name == "loseAsync") { if (event.type != "gain") return false; - var hs = current.getCards("h"), - cards = event.getl(player).cards2; return game.hasPlayer(function (current) { if (current == player) return false; + var hs = current.getCards("h"), + cards = event.getl(player).cards2; var cardsx = event.getg(current); for (var i of cardsx) { if ( + hs.includes(i) && cards.includes(i) && - hs.includes(card) && - cards.includes(card) && - get.color(card, player) == "black" + get.color(i, player) == "black" ) return true; } From effbeeb8f0ce95e10f29d342b1ec3c61c3b4b9cf Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Sun, 21 Apr 2024 13:04:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=99=88=E7=99=BB=E6=9C=9B=E6=97=8F?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/huicui.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/character/huicui.js b/character/huicui.js index 72a1c7331..3a979c9fc 100644 --- a/character/huicui.js +++ b/character/huicui.js @@ -12962,14 +12962,13 @@ game.import("character", function () { }, usable: 1, async cost(event, trigger, player) { - "step 0"; var num = player.getFriends().length; if ( !game.hasPlayer(function (current) { return current != player && current.getFriends().length > num; }) ) { - player + event.result = await player .chooseToDiscard( "h", get.prompt("rewangzu"), @@ -12978,12 +12977,11 @@ game.import("character", function () { ) .set("ai", function (card) { return 7 - get.value(card); - }); + }) + .forResult(); } else { - player.chooseBool(get.prompt("rewangzu"), "随机弃置一张牌并令伤害-1"); + event.result = await player.chooseBool(get.prompt("rewangzu"), "随机弃置一张牌并令伤害-1").forResult(); } - "step 1"; - event.result = result; }, async content(event, trigger, player) { trigger.num--;