修复arrangeTrigger忽略invisibleSkills的问题

This commit is contained in:
kuangshen04 2024-01-22 13:37:45 +08:00
parent a3a09af07f
commit b323fd836c
2 changed files with 2 additions and 5 deletions

View File

@ -2017,10 +2017,7 @@ export const Content = {
event.doing = doingList.shift(); event.doing = doingList.shift();
while(true){ while(true){
if (trigger.filterStop && trigger.filterStop()) return; if (trigger.filterStop && trigger.filterStop()) return;
const usableSkills = event.doing.todoList.filter(info => { const usableSkills = event.doing.todoList.filter(info => lib.filter.filterTrigger(trigger, info.player, event.triggername, info.skill));
if (!lib.filter.filterTrigger(trigger, info.player, event.triggername, info.skill)) return false;
return lib.skill.global.includes(info.skill) || info.player.hasSkill(info.skill, true);
});
if (usableSkills.length == 0){ if (usableSkills.length == 0){
break; break;
} }

View File

@ -9703,7 +9703,7 @@ export class Library extends Uninstantable {
console.error(new ReferenceError('缺少info的技能:', skill)); console.error(new ReferenceError('缺少info的技能:', skill));
return false; return false;
} }
if (!game.expandSkills(player.getSkills(true).concat(lib.skill.global)).includes(skill)) return false; if (!game.expandSkills(player.getSkills('invisible').concat(lib.skill.global)).includes(skill)) return false;
if (!game.expandSkills(player.getSkills(false).concat(lib.skill.global)).includes(skill)) {//hiddenSkills if (!game.expandSkills(player.getSkills(false).concat(lib.skill.global)).includes(skill)) {//hiddenSkills
if (get.mode() != 'guozhan') return false; if (get.mode() != 'guozhan') return false;
if (info.noHidden) return false; if (info.noHidden) return false;