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 ( diff --git a/character/huicui/skill.js b/character/huicui/skill.js index c530210d0..c609125e3 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/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;