From 8de7cf57bfafd4548d9573251830631e9b79ef1e Mon Sep 17 00:00:00 2001 From: kuangshen04 <2832899707@qq.com> Date: Thu, 7 Mar 2024 23:51:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=80=9F=E5=88=80=E6=9D=80?= =?UTF-8?q?=E4=BA=BAcomplexTarget=E6=B2=A1=E6=9C=89=E7=94=9F=E6=95=88?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- noname/game/index.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/noname/game/index.js b/noname/game/index.js index 5407f0c13..f0ffc7fdf 100644 --- a/noname/game/index.js +++ b/noname/game/index.js @@ -5874,17 +5874,18 @@ export class Game extends Uninstantable { return false; } - const useCache = !lib.config.compatiblemode && !event.skill && !event.multitarget - && ['button', 'card', 'target'].every(type => { - if (!event[`filter${uppercaseType(type)}`]) return true; - // if (typeof event[`select${uppercaseType(type)}`] === 'function') return false; - if (get.select(event[`select${uppercaseType(type)}`])[1] < 0) return false; - if (type === "button") type = "select"; - return !event[`complex${uppercaseType(type)}`]; - }); + let useCache = !lib.config.compatiblemode && !event.skill && !event.multitarget; + const filterCache = type => { + if (get.select(event[`select${uppercaseType(type)}`])[1] < 0) return false; + const cardinfo = get.info(get.card() || {}); + if (cardinfo && cardinfo.complexTarget) return false; + if (type === "button") type = "select"; + return !event[`complex${uppercaseType(type)}`]; + }; ['button', 'card', 'target'].forEach(type => { if (!event[`filter${uppercaseType(type)}`]) return; + if (!filterCache(type)) useCache = false; if (!ok) game.uncheck(type); else ({ ok, auto = auto } = game.Check[type](event, useCache)); });