From 8a46eeaf9de09c0d909204b7f7760d7ea26e27f9 Mon Sep 17 00:00:00 2001 From: mengxinzxz <2223529500@qq.com> Date: Thu, 22 Feb 2024 18:39:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8DremoveAdditionalSkill(s)?= =?UTF-8?q?=E5=9C=A8additionalSkills[skill]=E4=B8=BA=E7=A9=BA=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E5=88=A0=E9=99=A4additionalSkills[skill]=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- noname/library/element/player.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/noname/library/element/player.js b/noname/library/element/player.js index ecc809d94..553bfd1b8 100644 --- a/noname/library/element/player.js +++ b/noname/library/element/player.js @@ -7462,7 +7462,7 @@ export class Player extends HTMLDivElement { const player = this, skills = this.getRemovableAdditionalSkills(skill, target); if(skills.length){ player.removeSkill(skills); - if (player.additionalSkills[skill]&&player.additionalSkills[skill].length) delete player.additionalSkills[skill]; + if (player.additionalSkills[skill]&&!player.additionalSkills[skill].length) delete player.additionalSkills[skill]; } _status.event.clearStepCache(); return this; @@ -7475,7 +7475,7 @@ export class Player extends HTMLDivElement { return '#g【' + get.translation(i) + '】'; })); player.removeSkill(skills); - if (player.additionalSkills[skill]&&player.additionalSkills[skill].length) delete player.additionalSkills[skill]; + if (player.additionalSkills[skill]&&!player.additionalSkills[skill].length) delete player.additionalSkills[skill]; }); } } From 6d2cc32d336b7e16f873f3f6db962c8f7dabe049 Mon Sep 17 00:00:00 2001 From: mengxinzxz <2223529500@qq.com> Date: Fri, 23 Feb 2024 18:08:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?OL=E8=B0=8B=E8=A2=81=E7=BB=8D=E3=80=90?= =?UTF-8?q?=E6=80=9D=E5=8F=AC=E5=89=91=E3=80=91=E3=80=81=E3=80=90=E5=A3=AB?= =?UTF-8?q?=E9=A6=96=E3=80=91=E6=95=88=E6=9E=9C=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/onlyOL.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/character/onlyOL.js b/character/onlyOL.js index 05c62059e..fa7f4eb9b 100644 --- a/character/onlyOL.js +++ b/character/onlyOL.js @@ -205,8 +205,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ let evt=_status.event; if(evt.name!='chooseToUse') evt=evt.getParent('chooseToUse'); if(!evt||!evt.respondTo||!storage.includes(evt.respondTo[1])) return; - const num=get.number(card); - if(typeof num!='number'||num=get.number(evt.respondTo[1]))) return false; }, }, onremove(player){ @@ -237,7 +237,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ audio:2, trigger:{global:['loseAfter','equipAfter','addJudgeAfter','gainAfter','loseAsyncAfter','addToExpansionAfter']}, filter(event,player){ - if(!player.hasEquipableSlot(1)||player.getEquip('sizhaojian')) return false; + if(!player.hasEquipableSlot(1)||player.getEquip(1)||player.getEquip('sizhaojian')) return false; const card=get.cardPile('sizhaojian','field'); if(!card||!player.canEquip(card,true)) return false; return game.hasPlayer(target=>{ @@ -1025,9 +1025,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ olsbyufeng_block:'思召剑', olsbyufeng_info:'游戏开始时，若【思召剑】未加入本局游戏，若你可装备【思召剑】，则你将【思召剑】置入装备区。', sizhaojian:'思召剑', - sizhaojian_info:'当你使用有点数的【杀】指定目标后，你令目标角色只能使用有点数且点数大于等于此【杀】的【闪】响应此牌。', + sizhaojian_info:'当你使用有点数的【杀】指定目标后，你令目标角色只能使用无点数或点数大于等于此【杀】的【闪】响应此牌。', olsbshishou:'士首', - olsbshishou_info:'主公技，其他群势力角色失去装备区的牌后，若你的装备区中没有【思召剑】，且【思召剑】存在于场上/牌堆/弃牌堆中，其可令你将【思召剑】置入装备区。', + olsbshishou_info:'主公技，其他群势力角色失去装备区的牌后，若你的装备区中没有武器牌，且【思召剑】存在于场上/牌堆/弃牌堆中，其可令你将【思召剑】置入装备区。', onlyOL_yijiang1:'OL专属·将1', onlyOL_yijiang2:'OL专属·将2', From 341e7bb2037a052b8233ae9b677055f1cf136a18 Mon Sep 17 00:00:00 2001 From: mengxinzxz <2223529500@qq.com> Date: Sat, 24 Feb 2024 10:23:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A1=A5=E5=85=85re=5Fguanzhang=E7=9A=84au?= =?UTF-8?q?dioname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/refresh.js | 2 +- character/yijiang.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/character/refresh.js b/character/refresh.js index 498a65866..fb704d643 100755 --- a/character/refresh.js +++ b/character/refresh.js @@ -8922,7 +8922,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ trigger:{source:'damageBegin1'}, forced:true, audio:'paoxiao', - audioname:['re_zhangfei','guanzhang','xiahouba'], + audioname:['re_zhangfei','guanzhang','xiahouba','re_guanzhang'], filter:function(event,player){ return event.card&&event.card.name=='sha'&&player.countMark('olpaoxiao2')>0; }, diff --git a/character/yijiang.js b/character/yijiang.js index 4f34266ad..3b0e9373b 100755 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -9538,6 +9538,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ group:'fuhun2' }, fuhun2:{ + audio:'fuhun', + audioname:['re_guanzhang'], trigger:{source:'damageSource'}, forced:true, filter:function(event,player){