YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4

This commit is contained in:
libccy 2016-08-12 20:54:55 +08:00
parent 293979e5ad
commit 14f0d75b6c
4 changed files with 83 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
character/shenhua.js
View File

@ -685,6 +685,7 @@ character.shenhua={
player.loseMaxHp(); player.loseMaxHp();
if(player.hp>player.maxHp) player.loseHp(); if(player.hp>player.maxHp) player.loseHp();
player.addSkill('reyingzi'); player.addSkill('reyingzi');
player.addSkill('yinghun');
delete player.tempSkills.yinghun; delete player.tempSkills.yinghun;
player.removeSkill('hunzi'); player.removeSkill('hunzi');
player.storage.hunzi=true; player.storage.hunzi=true;

4
character/sp.js
View File

@ -4085,9 +4085,7 @@ character.sp={
filter:function(event,player){ filter:function(event,player){
return event.player!=player&&!player.storage.wangzun; return event.player!=player&&!player.storage.wangzun;
}, },
prompt:function(event,player){ logTarget:'player',
return '是否对'+get.translation(event.player)+'发动【妄尊】？';
},
content:function(){ content:function(){
player.draw(); player.draw();
player.markSkill('wangzun'); player.markSkill('wangzun');

112
game/game.js
View File

@ -12073,38 +12073,83 @@
notLink:function(){ notLink:function(){
return this.getParent().name!='_lianhuan'&&this.getParent().name!='_lianhuan2'; return this.getParent().name!='_lianhuan'&&this.getParent().name!='_lianhuan2';
}, },
// triggerx:function(name){ triggerx:function(name){
// if(_status.video) return; if(_status.video) return;
// if(name=='gameStart'){ if(name=='gameStart'){
// _status.gameStarted=true; _status.gameStarted=true;
// } }
// for(i=0;i<game.players.length;i++){ for(var i=0;i<game.players.length;i++){
// for(j in game.players[i].tempSkills){ for(var j in game.players[i].tempSkills){
// var expire=game.players[i].tempSkills[j]; var expire=game.players[i].tempSkills[j];
// if(expire==name|| if(expire==name||
// (get.objtype(expire)=='array'&&expire.contains(name))|| (get.objtype(expire)=='array'&&expire.contains(name))||
// (typeof expire=='function'&&expire(event,game.players[i],name))){ (typeof expire=='function'&&expire(event,game.players[i],name))){
// delete game.players[i].tempSkills[j]; delete game.players[i].tempSkills[j];
// game.players[i].removeSkill(j); game.players[i].removeSkill(j);
// } }
// else if(typeof expire=='object'){ else if(typeof expire=='object'){
// if(expire.player==name&&event.player==game.players[i]|| if(expire.player==name&&event.player==game.players[i]||
// expire.target==name&&event.target==game.players[i]|| expire.target==name&&event.target==game.players[i]||
// expire.source==name&&event.source==game.players[i]){ expire.source==name&&event.source==game.players[i]){
// delete game.players[i].tempSkills[j]; delete game.players[i].tempSkills[j];
// game.players[i].removeSkill(j); game.players[i].removeSkill(j);
// } }
// } }
// } }
// } }
// var event=this; var event=this;
// var start=event.player||game.me||game.players[0]; var start=event.player||game.me||game.players[0];
// if(!game.players.contains(start)){ if(!game.players.contains(start)){
// start=game.findNext(start); start=game.findNext(start);
// } }
// var list=[]; var list=[];
// var roles=['player','source','target'];
// }, for(var i=0;i<roles.length;i++){
if(event[roles[i]]){
var triggername=event[roles[i]].playerid+'_'+roles[i]+'_'+name;
if(lib.hook[triggername]){
for(var j=0;j<lib.hook[triggername].length;j++){
list.push([lib.hook[triggername][j],event[roles[i]]]);
}
}
triggername=roles[i]+'_'+name;
if(lib.hook.globalskill[triggername]){
for(var j=0;j<lib.hook.globalskill[triggername].length;j++){
list.push([lib.hook.globalskill[triggername][j],event[roles[i]]]);
}
}
}
}
var triggername='global_'+name;
if(lib.hook.globalskill[triggername]){
for(var i=0;i<game.players.length;i++){
for(var j=0;j<lib.hook.globalskill[triggername].length;j++){
list.push([lib.hook.globalskill[triggername][j],game.players[i]]);
}
}
}
var map=_status.connectMode?lib.playerOL:game.playerMap;
for(var i in lib.hook.globaltrigger[name]){
if(map[i]&&map[i].isAlive()){
for(var j=0;j<lib.hook.globaltrigger[name][i].length;j++){
list.push([lib.hook.globaltrigger[name][i][j],map[i]]);
}
}
}
list.sort(function(a,b){
var priority=lib.sort.priority(a,b);
if(priority) return priority;
if(start){
return get.distance(start,a[1],'absolute')-get.distance(start,b[1],'absolute');
}
return 0;
});
if(list.length){
for(i=0;i<list.length;i++){
game.createTrigger(name,list[i][0],list[i][1],event);
}
}
},
trigger:function(name){ trigger:function(name){
if(_status.video) return; if(_status.video) return;
if(name=='gameStart'){ if(name=='gameStart'){
@ -28605,15 +28650,16 @@
if(this.classList.contains('selectable')==false) return; if(this.classList.contains('selectable')==false) return;
if(this.classList.contains('selected')){ if(this.classList.contains('selected')){
ui.selected.buttons.remove(this); ui.selected.buttons.remove(this);
this.classList.remove('selected');
if(_status.multitarget||_status.event.complexSelect){ if(_status.multitarget||_status.event.complexSelect){
game.uncheck(); game.uncheck();
game.check(); game.check();
} }
} }
else{ else{
this.classList.add('selected');
ui.selected.buttons.add(this); ui.selected.buttons.add(this);
} }
this.classList.toggle('selected');
if(custom.add.button){ if(custom.add.button){
custom.add.button(); custom.add.button();
} }

5
game/update.js
View File

@ -1,12 +1,11 @@
window.noname_update={ window.noname_update={
version:'1.8.20.3', version:'1.8.20.4',
changeLog:[ changeLog:[
'修bug' '无'
], ],
files:{ files:{
global:[ global:[
// 'game/game.js', // 'game/game.js',
'character/standard.js',
], ],
} }
} }