diff --git a/game/asset.js b/game/asset.js index 032cb83c3..90cf6bcb4 100644 --- a/game/asset.js +++ b/game/asset.js @@ -4,6 +4,7 @@ window.noname_asset_list=[ 'audio/background/aozhan_online.mp3', 'audio/background/aozhan_rewrite.mp3', 'audio/background/music_danji.mp3', + 'audio/background/music_phliosophy.mp3', 'audio/background/music_default.mp3', 'audio/background/music_diaochan.mp3', 'audio/background/music_shezhan.mp3', diff --git a/game/game.js b/game/game.js index e1f306150..fea943cd1 100644 --- a/game/game.js +++ b/game/game.js @@ -24128,11 +24128,11 @@ forced:true, popup:false, logv:false, - priority:-5, + forceDie:true, + //priority:-5, content:function(){ "step 0" - event.forceDie=true; - player.link(); + player[player.isAlive()?'link':'removeLink'](); event.logvid=trigger.getLogv(); if(!trigger.notLink()) event.finish(); "step 1" @@ -24156,6 +24156,7 @@ _lianhuan2:{ trigger:{global:'damageAfter'}, filter:function(event,player){ + return false; return (event.nature&&lib.linked.contains(event.nature)&&event.player.isLinked()&& event.player.classList.contains('dead')&&player.isLinked()); }, @@ -24192,6 +24193,7 @@ forced:true, popup:false, filter:function(event,player){ + return false; return event.player.classList.contains('dead'); }, content:function(){ @@ -24199,12 +24201,15 @@ } }, _lianhuan4:{ - trigger:{global:'dieAfter'}, + trigger:{player:'dieAfter'}, priority:-10, forced:true, popup:false, + forceDie:true, filter:function(event,player){ - return event.player.classList.contains('dead')&&event.getParent(2).name!='damage'; + if(!player.isLinked()) return false; + var evt=event.getParent(2); + return evt.name!='damage'||!event.nature||!lib.linked.contains(event.nature); }, content:function(){ trigger.player.removeLink(); diff --git a/game/package.js b/game/package.js index 01d48c048..456961542 100644 --- a/game/package.js +++ b/game/package.js @@ -100,6 +100,7 @@ window.noname_package={ xinsha_bg:'新杀', }, music:{ + music_phliosophy:'罚抄', music_diaochan:'貂蝉', music_shezhan:'舌战', music_danji:'单骑', diff --git a/game/update.js b/game/update.js index e50326a9b..bc8315f2b 100644 --- a/game/update.js +++ b/game/update.js @@ -1,12 +1,12 @@ window.noname_update={ - version:'1.9.95.2.1', - update:'1.9.95.2', + version:'1.9.95.2.2', + update:'1.9.95.2.1', changeLog:[ - 'BUG修复', + '铁索BUG修复', ], files:[ //'card/extra.js', - 'card/sp.js', + //'card/sp.js', //'card/standard.js', //'card/swd.js', //'card/guozhan.js', @@ -14,12 +14,12 @@ window.noname_update={ //'character/extra.js', //'character/mobile.js', //'character/old.js', - 'character/refresh.js', + //'character/refresh.js', //'character/shenhua.js', //'character/sp.js', //'character/tw.js', //'character/standard.js', - 'character/xinghuoliaoyuan.js', + //'character/xinghuoliaoyuan.js', //'character/yijiang.js', //'mode/doudizhu.js', //'mode/guozhan.js', @@ -28,7 +28,7 @@ window.noname_update={ //'mode/boss.js', 'game/game.js', //'game/config.js', - //'game/package.js', + 'game/package.js', //'game/source.js', ] };