diff --git a/noname/library/element/content.js b/noname/library/element/content.js index a367e9ed8..447d1dd65 100644 --- a/noname/library/element/content.js +++ b/noname/library/element/content.js @@ -5604,7 +5604,7 @@ export const Content = { controls.remove("cancel2"); if ((event.direct && controls.length == 1) || event.forceDirect) { event.result = { - control: event.controls[0].link, + control: event.controls[0], links: get.links([event.controls[0]]), }; return; @@ -5620,7 +5620,7 @@ export const Content = { controls.remove("cancel2"); if ((event.direct && controls.length == 1) || event.forceDirect) { event.result = { - control: event.controls[0].link, + control: event.controls[0], links: get.links([event.controls[0]]), }; return; diff --git a/noname/library/element/player.js b/noname/library/element/player.js index 41e074e0f..5ddfae65d 100644 --- a/noname/library/element/player.js +++ b/noname/library/element/player.js @@ -8037,19 +8037,21 @@ export class Player extends HTMLDivElement { if (log !== false && this.hasSkill(skill)) game.log(this, "的技能", `#g【${get.translation(skill)}】`, "暂时失效了"); - if (!expire) expire = { global: ["phaseAfter", "phaseBeforeStart"] }; - else if (typeof expire == "string" || Array.isArray(expire)) expire = { global: expire }; - this.when(expire, false) - .assign({ - firstDo: true, - }) - .vars({ - bannedSkill: skill, - }) - .then(() => { - delete player.storage[`temp_ban_${bannedSkill}`]; - }) - .finish(); + if (expire !== "forever") { + if (!expire) expire = { global: ["phaseAfter", "phaseBeforeStart"] }; + else if (typeof expire == "string" || Array.isArray(expire)) expire = { global: expire }; + this.when(expire, false) + .assign({ + firstDo: true, + }) + .vars({ + bannedSkill: skill, + }) + .then(() => { + delete player.storage[`temp_ban_${bannedSkill}`]; + }) + .finish(); + } } return skill; }