From b1de663eb6c068782e71accd92a0efc6a3b88772 Mon Sep 17 00:00:00 2001 From: kuangshen04 <2832899707@qq.com> Date: Fri, 19 Jan 2024 12:10:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?arrangeTrigger>event.finish=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- noname/library/element/content.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noname/library/element/content.js b/noname/library/element/content.js index 478902a09..d36550f5c 100644 --- a/noname/library/element/content.js +++ b/noname/library/element/content.js @@ -2005,8 +2005,8 @@ export const Content = { arrangeTrigger: async function (event,trigger,player) { while(event.doingList.length>0){ event.doing = event.doingList.shift(); - if (trigger.filterStop && trigger.filterStop()) return event.finish(); while(true){ + if (trigger.filterStop && trigger.filterStop()) return; const usableSkills = event.doing.todoList.filter(info => { 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); From 8616e14a1709e48c26449dec2924d16d408cc834 Mon Sep 17 00:00:00 2001 From: kuangshen04 <2832899707@qq.com> Date: Fri, 19 Jan 2024 14:40:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?ol=E6=9D=8E=E5=A9=89=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E5=90=8D=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/sp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/character/sp.js b/character/sp.js index 5c3e0ab60..5627da30a 100755 --- a/character/sp.js +++ b/character/sp.js @@ -954,7 +954,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ forced:true, content:function(){ 'step 0' - player.addTempSkill('olsilv'+(trigger.getg?'gain':'lose')); + player.addTempSkill('olsilv_'+(trigger.getg?'gain':'lose')); if(!trigger.visible){ var cards,name=player.storage.ollianju; if(trigger.getg) cards=trigger.getg(player).filter(card=>card.name==name); From e791d615d6616c95090804ef8899d56ff280465f Mon Sep 17 00:00:00 2001 From: kuangshen04 <2832899707@qq.com> Date: Fri, 19 Jan 2024 14:47:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?boss=E5=AD=99=E7=AD=96=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=8F=AF=E6=9E=9A=E4=B8=BE=E5=88=A4=E5=AE=9A=EF=BC=88=E7=94=B1?= =?UTF-8?q?=E4=BA=8E=E7=8E=B0=E5=9C=A8game.over=E4=B8=8D=E5=8F=AF=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mode/boss.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mode/boss.js b/mode/boss.js index 9b01e7c20..36dabf984 100644 --- a/mode/boss.js +++ b/mode/boss.js @@ -8818,7 +8818,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ } function isDefined(opd) { if(opd!=undefined){ - if (opd.get||opd.set||opd.writable!=true||opd.configurable!=true||opd.enumerable!=true){ + if (opd.get||opd.set||opd.writable!=true||opd.configurable!=true){ return true; } }