From 6e9bd21f26c801b0ebe918d3fa936f8ca4e5e305 Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Mon, 6 May 2024 19:25:35 +0800 Subject: [PATCH 1/3] bugfix --- character/huicui/skill.js | 2 +- character/refresh/skill.js | 2 +- mode/guozhan.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/character/huicui/skill.js b/character/huicui/skill.js index 00851c450..580008011 100644 --- a/character/huicui/skill.js +++ b/character/huicui/skill.js @@ -12198,7 +12198,7 @@ const skills = { filter: function (event, player, name) { if (player.hasSkill("zhiwei2")) return false; if (!game.hasPlayer(current => current != player)) return false; - if (get.mode() == "guozhan") return event.name == "showCharacter" && event.toShow(name => { + if (get.mode() == "guozhan") return event.name == "showCharacter" && event.toShow.some(name => { return get.character(name, 3).includes("zhiwei"); }); return event.name != "showCharacter" && (name != "phaseBefore" || game.phaseNumber == 0); diff --git a/character/refresh/skill.js b/character/refresh/skill.js index 0059bb7f3..e48412b8e 100644 --- a/character/refresh/skill.js +++ b/character/refresh/skill.js @@ -14207,7 +14207,7 @@ const skills = { .set("ai", () => { const player = get.event("player"), trigger = get.event().getTrigger(); - const cards = trigger.cards.filterInD(); + const cards = trigger.cards ? trigger.cards.filterInD() : []; if (get.event().controls.includes("拿牌")) { if ( cards.reduce((sum, card) => { diff --git a/mode/guozhan.js b/mode/guozhan.js index 31eb42ca4..1e87abe19 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -2714,7 +2714,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { inherit: "zhiwei", filter: function (event, player, name) { if (!game.hasPlayer(current => current != player)) return false; - return event.name == "showCharacter" && event.toShow(name => { + return event.name == "showCharacter" && event.toShow.some(name => { return get.character(name, 3).includes("fakezhiwei"); }); }, From f4f7ce66fc0489e3e8960e48697a0f62b7f90eab Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Mon, 6 May 2024 19:35:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E7=BB=95=E5=9C=88=E5=AD=90=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- noname/init/polyfill.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/noname/init/polyfill.js b/noname/init/polyfill.js index 1c685b50b..51fc9a8ce 100644 --- a/noname/init/polyfill.js +++ b/noname/init/polyfill.js @@ -142,17 +142,14 @@ Reflect.defineProperty(HTMLDivElement.prototype, "setBackground", { gzbool = false; const mode = get.mode(); if (type == "character") { + nameinfo = get.character(name); if (lib.characterPack[`mode_${mode}`] && lib.characterPack[`mode_${mode}`][name]) { if (mode == "guozhan") { - nameinfo = lib.character[name]; if (name.startsWith("gz_shibing")) name = name.slice(3, 11); else { - if ( - lib.config.mode_config.guozhan.guozhanSkin && - lib.character[name] && - lib.character[name].hasSkinInGuozhan - ) + if (lib.config.mode_config.guozhan.guozhanSkin && nameinfo && nameinfo.hasSkinInGuozhan){ gzbool = true; + } name = name.slice(3); } } else modeimage = mode; @@ -161,8 +158,6 @@ Reflect.defineProperty(HTMLDivElement.prototype, "setBackground", { name = name.split("::"); modeimage = name[0]; name = name[1]; - } else { - nameinfo = get.character(name); } } let imgPrefixUrl; From 1553089c454992c73bda21274d556b03e104416a Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Mon, 6 May 2024 19:39:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A4=E5=90=B4=E6=87=BF=E4=B8=8D?= =?UTF-8?q?=E4=BC=9A=E8=8E=B7=E5=BE=97=E9=9C=80=E8=A6=81=E9=85=8D=E5=90=88?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=8A=80=E8=83=BD=E5=8F=91=E5=8A=A8=E7=9A=84?= =?UTF-8?q?=E5=9E=83=E5=9C=BE=E6=8A=80=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/collab/skill.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/character/collab/skill.js b/character/collab/skill.js index cb5aba437..688e953f0 100644 --- a/character/collab/skill.js +++ b/character/collab/skill.js @@ -84,6 +84,8 @@ const skills = { if (name !== "dc_wuyi") { const skills = get.character(name, 3); skills.forEach(skill => { + const info = get.info(skill); + if (!info || (info.ai && info.ai.combo)) return; if (skill in _status.dcbenxi_map) return; const voices = game.parseSkillText(skill, name); if (