diff --git a/character/shenhua.js b/character/shenhua.js index d3a079455..47ca6381b 100644 --- a/character/shenhua.js +++ b/character/shenhua.js @@ -4514,7 +4514,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ roulin_info:'你对女性角色、女性角色对你使用【杀】时,都需连续使用两张【闪】才能抵消。', benghuai_info:'结束阶段,若你的体力不是全场最少的(或之一),你须减1点体力或体力上限。', baonue_info:'主公技,其他群雄角色每造成一次伤害,可进行一次判定,若为♠,你回复1点体力。', - luanwu_info:'出牌阶段,可令除你外的所有角色依次对与其距离最近的另一名角色使用一张【杀】,无法如此做者失去1点体力。', + luanwu_info:'限定技,出牌阶段,可令除你外的所有角色依次对与其距离最近的另一名角色使用一张【杀】,无法如此做者失去1点体力。', wansha_info:'在你的回合,除你以外,只有处于濒死状态的角色才能使用【桃】。', weimu_info:'你不能成为♠或♣锦囊的目标。', diff --git a/character/sp.js b/character/sp.js index b8f3b15f3..88fbe0285 100644 --- a/character/sp.js +++ b/character/sp.js @@ -8091,6 +8091,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ trigger:{source:'dieAfter'}, priority:-10, silent:true, + locked:false, + onremove:function(player){ + delete player.storage.qiluan; + }, filter:function(event){ return _status.currentPhase!=event.player; }, @@ -8102,12 +8106,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){ player.storage.qiluan++; } }, - group:['qiluan2','qiluan3'] + group:['qiluan2','qiluan3','qiluan4'] }, qiluan2:{ audio:2, trigger:{global:'phaseAfter'}, - forced:true, + frequent:true, filter:function(event,player){ return player.storage.qiluan?true:false; }, @@ -8123,7 +8127,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, qiluan3:{ trigger:{source:'dieAfter'}, - forced:true, + frequent:true, priority:-10, filter:function(event){ return _status.currentPhase==event.player; @@ -8131,12 +8135,21 @@ game.import('character',function(lib,game,ui,get,ai,_status){ content:function(){ var num=3; if(player.storage.qiluan){ - num+=3*player.storage.qiluan; + if(get.mode()!='guozhan'){ + num+=3*player.storage.qiluan; + } player.storage.qiluan=0; } player.draw(num); }, }, + qiluan4:{ + trigger:{global:'phaseBegin'}, + silent:true, + content:function(){ + player.storage.qiluan=0; + } + }, shangyi:{ audio:2, enable:'phaseUse', diff --git a/game/update.js b/game/update.js index 769fe94f8..391fbe282 100644 --- a/game/update.js +++ b/game/update.js @@ -1,8 +1,9 @@ window.noname_update={ - version:'1.9.54', + version:'1.9.54.1', update:'1.9.53.1', changeLog:[ - '变包武将' + '变包武将', + 'bug修复' ], files:[ 'card/standard.js', @@ -16,7 +17,6 @@ window.noname_update={ 'character/yijiang.js', 'character/standard.js', 'character/xianjian.js', - 'character/yijiang.js', 'game/asset.js', 'game/game.js', 'game/directory.js', diff --git a/mode/guozhan.js b/mode/guozhan.js index 418ec507a..8d9df5d2f 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -1339,6 +1339,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ hookTrigger:{ after:function(event,player){ if(event._direct&&!player.storage.gzhuashen_removing.contains(event.skill)) return false; + if(lib.skill[event.skill].silent) return false; return lib.skill.gzhuashen.getSkillSources(player,event.skill).length>0; } },