From d196294b86f874d9628d00652b8e9dee6fb42643 Mon Sep 17 00:00:00 2001 From: kuangthree Date: Sat, 20 Jan 2024 11:26:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=BA=E5=85=A8=E5=B1=80=E6=8A=80?= =?UTF-8?q?=E8=83=BD=E6=B7=BB=E5=8A=A0silent=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- card/standard.js | 1 + noname/library/index.js | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/card/standard.js b/card/standard.js index e979cc202..b8bc21f08 100644 --- a/card/standard.js +++ b/card/standard.js @@ -2679,6 +2679,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ priority:5, popup:false, forced:true, + silent:true, filter:function(event,player){ if(event.card.storage&&event.card.storage.nowuxie) return false; var card=event.card; diff --git a/noname/library/index.js b/noname/library/index.js index 2c63d5759..ef055f271 100644 --- a/noname/library/index.js +++ b/noname/library/index.js @@ -11228,6 +11228,7 @@ export class Library extends Uninstantable { charlotte: true, priority: -100, lastDo: true, + silent:true, content: function () { player.removeSkill('counttrigger'); delete player.storage.counttrigger; @@ -11253,6 +11254,7 @@ export class Library extends Uninstantable { priority: 100, firstDo: true, popup: false, + silent:true, filter: function (event, player) { return player.hp >= player.maxHp; }, @@ -11341,6 +11343,7 @@ export class Library extends Uninstantable { popup: false, priority: -100, lastDo: true, + silent:true, filter: function (event) { return !event._cleared && event.card.name != 'wuxie'; }, @@ -11357,6 +11360,7 @@ export class Library extends Uninstantable { popup: false, priority: -100, lastDo: true, + silent:true, filter: function (event) { return ui.todiscard[event.discardid] ? true : false; }, @@ -11386,6 +11390,7 @@ export class Library extends Uninstantable { priority: 5, forced: true, popup: false, + silent:true, filter: function (event, player) { //if(!event.player.isDying()) return false; //if(event.source&&event.source.isIn()&&event.source!=player) return false; @@ -11539,6 +11544,7 @@ export class Library extends Uninstantable { popup: false, logv: false, forceDie: true, + silent:true, //priority:-5, content: function () { "step 0"; @@ -11567,6 +11573,7 @@ export class Library extends Uninstantable { forced: true, popup: false, forceDie: true, + silent:true, filter: function (event, player) { var evt = event.getParent(); return evt && evt.name == 'damage' && evt.hasNature('linked') && player.isLinked(); From 63be1163f5a9815ebd9f6d98a11ad703aef0c4a7 Mon Sep 17 00:00:00 2001 From: kuangthree Date: Sat, 20 Jan 2024 12:12:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E7=9A=84=E6=8A=80=E8=83=BD=E4=B8=8D=E5=8F=82=E4=B8=8E=E4=BC=98?= =?UTF-8?q?=E5=85=88=E7=BA=A7=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- noname/library/element/content.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/noname/library/element/content.js b/noname/library/element/content.js index 3e97d22a0..b2abb91f0 100644 --- a/noname/library/element/content.js +++ b/noname/library/element/content.js @@ -2030,10 +2030,10 @@ export const Content = { } else { event.choice = usableSkills.filter(n => n.priority == usableSkills[0].priority); - //现在只要找到一个同优先度技能为silent 便优先执行该技能 + //现在只要找到一个同优先度技能为silent,或没有技能描述的技能 便优先执行该技能 const silentSkill = event.choice.find(item => { const skillInfo = lib.skill[item.skill]; - return (skillInfo && skillInfo.silent); + return (skillInfo && (skillInfo.silent || !lib.translate[item.skill])); }) if (silentSkill){ event.current = silentSkill;