This commit is contained in:
libccy 2016-09-14 23:37:48 +08:00
parent c9fc4075c9
commit 48b6303971
2 changed files with 4 additions and 7 deletions

View File

@ -13215,8 +13215,11 @@
} }
var list=[]; var list=[];
var roles=['player','source','target']; var roles=['player','source','target'];
var listAdded;
var addList=function(skill,player){ var addList=function(skill,player){
if(listAdded[skill]) return;
if(player.forbiddenSkills[skill]) return; if(player.forbiddenSkills[skill]) return;
listAdded[skill]=true;
var info=lib.skill[skill]; var info=lib.skill[skill];
var num=0; var num=0;
if(info.priority){ if(info.priority){
@ -13232,6 +13235,7 @@
var globalskill='global_'+name; var globalskill='global_'+name;
var map=_status.connectMode?lib.playerOL:game.playerMap; var map=_status.connectMode?lib.playerOL:game.playerMap;
for(var iwhile=0;iwhile<totalPopulation;iwhile++){ for(var iwhile=0;iwhile<totalPopulation;iwhile++){
listAdded={};
for(var j in player.tempSkills){ for(var j in player.tempSkills){
var expire=player.tempSkills[j]; var expire=player.tempSkills[j];
if(expire==name|| if(expire==name||
@ -13250,26 +13254,20 @@
} }
} }
} }
var listAdded=false;
for(var i=0;i<roles.length;i++){ for(var i=0;i<roles.length;i++){
if(event[roles[i]]==player){ if(event[roles[i]]==player){
var triggername=player.playerid+'_'+roles[i]+'_'+name; var triggername=player.playerid+'_'+roles[i]+'_'+name;
if(lib.hook[triggername]){ if(lib.hook[triggername]){
for(var j=0;j<lib.hook[triggername].length;j++){ for(var j=0;j<lib.hook[triggername].length;j++){
addList(lib.hook[triggername][j],player); addList(lib.hook[triggername][j],player);
listAdded=true;
break;
} }
} }
triggername=roles[i]+'_'+name; triggername=roles[i]+'_'+name;
if(lib.hook.globalskill[triggername]){ if(lib.hook.globalskill[triggername]){
for(var j=0;j<lib.hook.globalskill[triggername].length;j++){ for(var j=0;j<lib.hook.globalskill[triggername].length;j++){
addList(lib.hook.globalskill[triggername][j],player); addList(lib.hook.globalskill[triggername][j],player);
listAdded=true;
break;
} }
} }
if(listAdded) break;
} }
} }
if(lib.hook.globalskill[globalskill]){ if(lib.hook.globalskill[globalskill]){

View File

@ -9018,7 +9018,6 @@ mode.stone={
popup:false, popup:false,
priority:15, priority:15,
filter:function(event,player){ filter:function(event,player){
console.log(1);
return !player.isMin(); return !player.isMin();
}, },
content:function(){ content:function(){