diff --git a/character/extra/skill.js b/character/extra/skill.js index 8c8c51d2e..4fe0692a0 100644 --- a/character/extra/skill.js +++ b/character/extra/skill.js @@ -1440,7 +1440,7 @@ const skills = { info[3].some(function (skill) { var info = get.skillInfoTranslation(skill); if (!info.includes("【杀】")) return false; - var list = get.skillCategoriesOf(skill); + var list = get.skillCategoriesOf(skill, player); list.remove("锁定技"); return list.length == 0; }) @@ -1472,7 +1472,7 @@ const skills = { var skills = info[3].filter(function (skill) { var info = get.skillInfoTranslation(skill); if (!info.includes("【杀】")) return false; - var list = get.skillCategoriesOf(skill); + var list = get.skillCategoriesOf(skill, get.player()); list.remove("锁定技"); return list.length == 0; }); @@ -1511,7 +1511,7 @@ const skills = { const skills = info[3].filter(function (skill) { var info = get.skillInfoTranslation(skill); if (!info.includes("【杀】")) return false; - var list = get.skillCategoriesOf(skill); + var list = get.skillCategoriesOf(skill, get.player()); list.remove("锁定技"); return list.length == 0; }); @@ -1590,7 +1590,7 @@ const skills = { var skills = info[3].filter(function (skill) { var info = get.skillInfoTranslation(skill); if (!info.includes("【杀】")) return false; - var list = get.skillCategoriesOf(skill); + var list = get.skillCategoriesOf(skill, get.player()); list.remove("锁定技"); return list.length == 0; }); diff --git a/character/mobile/skill.js b/character/mobile/skill.js index 81e6ccc38..e4feeb8e5 100644 --- a/character/mobile/skill.js +++ b/character/mobile/skill.js @@ -936,7 +936,7 @@ const skills = { return true; }, zhuanhuanji2(skill, player) { - return player.countMark("mbxuetu_status") !== 1; + return player && player.countMark("mbxuetu_status") !== 1; }, position: "he", onremove: ["mbxuetu", "mbxuetu_status"], diff --git a/character/refresh/skill.js b/character/refresh/skill.js index d66bb70c4..48edbef81 100644 --- a/character/refresh/skill.js +++ b/character/refresh/skill.js @@ -11159,7 +11159,7 @@ const skills = { let name = _status.characterlist[i]; if (name.indexOf("zuoci") != -1 || name.indexOf("key_") == 0 || name.indexOf("sp_key_") == 0 || get.is.double(name) || lib.skill.rehuashen.banned.includes(name) || player.storage.rehuashen.character.includes(name)) continue; let skills = lib.character[name][3].filter(skill => { - const categories = get.skillCategoriesOf(skill); + const categories = get.skillCategoriesOf(skill, player); return !categories.some(type => lib.skill.rehuashen.bannedType.includes(type)); }); if (skills.length) { @@ -11213,7 +11213,7 @@ const skills = { node = ui.create.buttonPresets.character(item, "character", position, noclick); const info = lib.character[item]; const skills = info[3].filter(function (skill) { - const categories = get.skillCategoriesOf(skill); + const categories = get.skillCategoriesOf(skill, get.player()); return !categories.some(type => lib.skill.rehuashen.bannedType.includes(type)); }); if (skills.length) { diff --git a/character/shenhua/skill.js b/character/shenhua/skill.js index 9e114bb56..9a499782f 100644 --- a/character/shenhua/skill.js +++ b/character/shenhua/skill.js @@ -4219,7 +4219,7 @@ const skills = { let name = _status.characterlist[i]; if (name.indexOf("zuoci") != -1 || name.indexOf("key_") == 0 || name.indexOf("sp_key_") == 0 || lib.skill.rehuashen.banned.includes(name) || player.storage.huashen.owned[name]) continue; let skills = lib.character[name][3].filter(skill => { - const categories = get.skillCategoriesOf(skill); + const categories = get.skillCategoriesOf(skill, player); return !categories.some(type => lib.skill.rehuashen.bannedType.includes(type)); }); if (skills.length) { diff --git a/mode/guozhan.js b/mode/guozhan.js index 0dabca389..d2bb7ad67 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -8168,7 +8168,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { event.target = target; player.awakenSkill("gzshigong"); var list = lib.character[player.name2][3].filter(function (skill) { - return get.skillCategoriesOf(skill).length == 0; + return get.skillCategoriesOf(skill, player).length == 0; }); if (!list.length) { event._result = { control: "cancel2" };