v1.9.95.2.2

This commit is contained in:
Spmario233 2019-11-15 19:33:46 +08:00 committed by GitHub
parent 1d3d2b3a6d
commit e6f14a09c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 12 deletions

View File

@ -4,6 +4,7 @@ window.noname_asset_list=[
'audio/background/aozhan_online.mp3', 'audio/background/aozhan_online.mp3',
'audio/background/aozhan_rewrite.mp3', 'audio/background/aozhan_rewrite.mp3',
'audio/background/music_danji.mp3', 'audio/background/music_danji.mp3',
'audio/background/music_phliosophy.mp3',
'audio/background/music_default.mp3', 'audio/background/music_default.mp3',
'audio/background/music_diaochan.mp3', 'audio/background/music_diaochan.mp3',
'audio/background/music_shezhan.mp3', 'audio/background/music_shezhan.mp3',

View File

@ -24128,11 +24128,11 @@
forced:true, forced:true,
popup:false, popup:false,
logv:false, logv:false,
priority:-5, forceDie:true,
//priority:-5,
content:function(){ content:function(){
"step 0" "step 0"
event.forceDie=true; player[player.isAlive()?'link':'removeLink']();
player.link();
event.logvid=trigger.getLogv(); event.logvid=trigger.getLogv();
if(!trigger.notLink()) event.finish(); if(!trigger.notLink()) event.finish();
"step 1" "step 1"
@ -24156,6 +24156,7 @@
_lianhuan2:{ _lianhuan2:{
trigger:{global:'damageAfter'}, trigger:{global:'damageAfter'},
filter:function(event,player){ filter:function(event,player){
return false;
return (event.nature&&lib.linked.contains(event.nature)&&event.player.isLinked()&& return (event.nature&&lib.linked.contains(event.nature)&&event.player.isLinked()&&
event.player.classList.contains('dead')&&player.isLinked()); event.player.classList.contains('dead')&&player.isLinked());
}, },
@ -24192,6 +24193,7 @@
forced:true, forced:true,
popup:false, popup:false,
filter:function(event,player){ filter:function(event,player){
return false;
return event.player.classList.contains('dead'); return event.player.classList.contains('dead');
}, },
content:function(){ content:function(){
@ -24199,12 +24201,15 @@
} }
}, },
_lianhuan4:{ _lianhuan4:{
trigger:{global:'dieAfter'}, trigger:{player:'dieAfter'},
priority:-10, priority:-10,
forced:true, forced:true,
popup:false, popup:false,
forceDie:true,
filter:function(event,player){ 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(){ content:function(){
trigger.player.removeLink(); trigger.player.removeLink();

View File

@ -100,6 +100,7 @@ window.noname_package={
xinsha_bg:'新杀', xinsha_bg:'新杀',
}, },
music:{ music:{
music_phliosophy:'罚抄',
music_diaochan:'貂蝉', music_diaochan:'貂蝉',
music_shezhan:'舌战', music_shezhan:'舌战',
music_danji:'单骑', music_danji:'单骑',

View File

@ -1,12 +1,12 @@
window.noname_update={ window.noname_update={
version:'1.9.95.2.1', version:'1.9.95.2.2',
update:'1.9.95.2', update:'1.9.95.2.1',
changeLog:[ changeLog:[
'BUG修复', '铁索BUG修复',
], ],
files:[ files:[
//'card/extra.js', //'card/extra.js',
'card/sp.js', //'card/sp.js',
//'card/standard.js', //'card/standard.js',
//'card/swd.js', //'card/swd.js',
//'card/guozhan.js', //'card/guozhan.js',
@ -14,12 +14,12 @@ window.noname_update={
//'character/extra.js', //'character/extra.js',
//'character/mobile.js', //'character/mobile.js',
//'character/old.js', //'character/old.js',
'character/refresh.js', //'character/refresh.js',
//'character/shenhua.js', //'character/shenhua.js',
//'character/sp.js', //'character/sp.js',
//'character/tw.js', //'character/tw.js',
//'character/standard.js', //'character/standard.js',
'character/xinghuoliaoyuan.js', //'character/xinghuoliaoyuan.js',
//'character/yijiang.js', //'character/yijiang.js',
//'mode/doudizhu.js', //'mode/doudizhu.js',
//'mode/guozhan.js', //'mode/guozhan.js',
@ -28,7 +28,7 @@ window.noname_update={
//'mode/boss.js', //'mode/boss.js',
'game/game.js', 'game/game.js',
//'game/config.js', //'game/config.js',
//'game/package.js', 'game/package.js',
//'game/source.js', //'game/source.js',
] ]
}; };