This commit is contained in:
libccy 2017-08-01 12:48:14 +08:00
parent 8055b1ca5e
commit ac3773f020
3 changed files with 34 additions and 7 deletions

View File

@ -253,7 +253,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return false; return false;
}, },
filter:function(event,player){ filter:function(event,player){
return event.card&&event.card.name=='sha'&&(get.color(event.card)=='red'||event.player.hasSkill('jiu')); return event.card&&event.card.name=='sha'&&(get.color(event.card)=='red'||event.source.hasSkill('jiu'));
}, },
content:function(){ content:function(){
player.loseMaxHp(); player.loseMaxHp();

View File

@ -33041,7 +33041,7 @@
} }
var loading=ui.create.div('.loading.config.toggle','载入中...',page); var loading=ui.create.div('.loading.config.toggle','载入中...',page);
lib.init.js(extensionURL.replace(/raw\.githubusercontent\.com/,'rawgit.com')+'package.js',null,function(){ var loaded=function(list){
var list=window.noname_extension_list; var list=window.noname_extension_list;
delete window.noname_extension_list; delete window.noname_extension_list;
loading.style.display='none'; loading.style.display='none';
@ -33094,9 +33094,29 @@
download.link=list[i].netdisk; download.link=list[i].netdisk;
} }
} }
};
if(game.download){
lib.init.req(extensionURL+'package.js',function(){
try{
eval(this.responseText);
if(!window.noname_extension_list){
throw('err');
}
}
catch(e){
loading.innerHTML='连接失败';
return;
}
loaded();
},function(){ },function(){
loading.innerHTML='连接失败'; loading.innerHTML='连接失败';
}); });
}
else{
lib.init.js(extensionURL.replace(/raw\.githubusercontent\.com/,'rawgit.com')+'package.js',null,loaded,function(){
loading.innerHTML='连接失败';
});
}
}; };
}()); }());
var active=start.firstChild.querySelector('.active'); var active=start.firstChild.querySelector('.active');
@ -42478,7 +42498,14 @@
td.innerHTML='-'; td.innerHTML='-';
} }
else{ else{
td.innerHTML=get.numStr(Math.max(1,game.me.distanceTo(node))); var dist1=get.numStr(Math.max(1,game.me.distanceTo(node)));
var dist2=get.numStr(Math.max(1,node.distanceTo(game.me)));
if(dist1==dist2){
td.innerHTML=dist1;
}
else{
td.innerHTML=dist1+'/'+dist2;
}
} }
tr.appendChild(td); tr.appendChild(td);
td=document.createElement('td'); td=document.createElement('td');

View File

@ -17,7 +17,7 @@ window.noname_update={
// 'card/gujian.js', // 'card/gujian.js',
// 'character/*', // 'character/*',
// 'character/hearth.js', // 'character/hearth.js',
// 'character/extra.js', 'character/old.js',
'character/gwent.js', 'character/gwent.js',
// 'character/sp.js', // 'character/sp.js',
// 'character/swd.js', // 'character/swd.js',