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

v1.9.24.2

This commit is contained in:
libccy 2017-04-17 14:33:52 +08:00
parent dcebdc8096
commit e4aefea233
4 changed files with 83 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extension/boss/extension.js
View File

@ -192,7 +192,7 @@ game.import('play',function(lib,game,ui,get,ai,_status){
for(var i in mode.skill){ for(var i in mode.skill){
if(lib.skill[i]) console.log(i); if(lib.skill[i]) console.log(i);
if(i!='versus_ladder'){ if(i!='versus_ladder'){
lib.skill[i]=lib.init.eval(mode.skill[i]); lib.skill[i]=mode.skill[i];
game.finishSkill(i); game.finishSkill(i);
} }
} }
@ -206,7 +206,7 @@ game.import('play',function(lib,game,ui,get,ai,_status){
} }
for(var i in mode.skill){ for(var i in mode.skill){
if(lib.skill[i]) console.log(i); if(lib.skill[i]) console.log(i);
lib.skill[i]=lib.init.eval(mode.skill[i]); lib.skill[i]=mode.skill[i];
game.finishSkill(i); game.finishSkill(i);
} }
loadversus(); loadversus();

83
game/game.js
View File

@ -8614,8 +8614,7 @@
loadPackage:function(){ loadPackage:function(){
'step 0' 'step 0'
if(event.packages.length){ if(event.packages.length){
window.character={}; window.game=game;
window.card={};
var pack=event.packages.shift().split('/'); var pack=event.packages.shift().split('/');
lib.init.js(lib.assetURL+pack[0],pack[1],game.resume); lib.init.js(lib.assetURL+pack[0],pack[1],game.resume);
game.pause(); game.pause();
@ -8624,8 +8623,9 @@
event.finish(); event.finish();
} }
'step 1' 'step 1'
var character=window.character; if(!lib.config.dev) delete window.game;
var card=window.card; var character=lib.imported.character;
var card=lib.imported.card;
var i,j,k; var i,j,k;
for(i in character){ for(i in character){
if(character[i].character){ if(character[i].character){
@ -8653,7 +8653,7 @@
} }
else{ else{
if(lib[j][k]==undefined){ if(lib[j][k]==undefined){
lib[j][k]=lib.init.eval(character[i][j][k]); lib[j][k]=character[i][j][k];
} }
else{ else{
console.log('dublicate '+j+' in character '+i+':\n'+k+'\n'+': '+lib[j][k]+'\n'+character[i][j][k]); console.log('dublicate '+j+' in character '+i+':\n'+k+'\n'+': '+lib[j][k]+'\n'+character[i][j][k]);
@ -8679,7 +8679,7 @@
lib[j][k+'_card_config']=card[i][j][k]; lib[j][k+'_card_config']=card[i][j][k];
} }
else{ else{
if(lib[j][k]==undefined) lib[j][k]=lib.init.eval(card[i][j][k]); if(lib[j][k]==undefined) lib[j][k]=card[i][j][k];
else console.log('dublicate '+j+' in card '+i+':\n'+k+'\n'+lib[j][k]+'\n'+card[i][j][k]); else console.log('dublicate '+j+' in card '+i+':\n'+k+'\n'+lib[j][k]+'\n'+card[i][j][k]);
} }
} }
@ -19819,40 +19819,40 @@
if(typeof mode.ai[i]=='object'){ if(typeof mode.ai[i]=='object'){
if(ai[i]==undefined) ai[i]={}; if(ai[i]==undefined) ai[i]={};
for(var j in mode.ai[i]){ for(var j in mode.ai[i]){
ai[i][j]=lib.init.eval(mode.ai[i][j]); ai[i][j]=mode.ai[i][j];
} }
} }
else{ else{
ai[i]=lib.init.eval(mode.ai[i]); ai[i]=mode.ai[i];
} }
} }
for(var i in mode.get){ for(var i in mode.get){
if(typeof mode.get[i]=='object'){ if(typeof mode.get[i]=='object'){
if(get[i]==undefined) get[i]={}; if(get[i]==undefined) get[i]={};
for(var j in mode.get[i]){ for(var j in mode.get[i]){
get[i][j]=lib.init.eval(mode.get[i][j]); get[i][j]=mode.get[i][j];
} }
} }
else{ else{
get[i]=lib.init.eval(mode.get[i]); get[i]=mode.get[i];
} }
} }
for(var i in mode.translate){ for(var i in mode.translate){
lib.translate[i]=mode.translate[i]; lib.translate[i]=mode.translate[i];
} }
if(mode.game){ if(mode.game){
game.getIdentityList=lib.init.eval(mode.game.getIdentityList); game.getIdentityList=mode.game.getIdentityList;
game.updateState=lib.init.eval(mode.game.updateState); game.updateState=mode.game.updateState;
game.getRoomInfo=lib.init.eval(mode.game.getRoomInfo); game.getRoomInfo=mode.game.getRoomInfo;
} }
if(mode.element&&mode.element.player){ if(mode.element&&mode.element.player){
for(var i in mode.element.player){ for(var i in mode.element.player){
lib.element.player[i]=lib.init.eval(mode.element.player[i]); lib.element.player[i]=mode.element.player[i];
} }
} }
if(mode.skill){ if(mode.skill){
for(var i in mode.skill){ for(var i in mode.skill){
lib.skill[i]=lib.init.eval(mode.skill[i]); lib.skill[i]=mode.skill[i];
} }
} }
game.finishCards(); game.finishCards();
@ -19907,39 +19907,39 @@
if(typeof mode.ai[i]=='object'){ if(typeof mode.ai[i]=='object'){
if(ai[i]==undefined) ai[i]={}; if(ai[i]==undefined) ai[i]={};
for(var j in mode.ai[i]){ for(var j in mode.ai[i]){
ai[i][j]=lib.init.eval(mode.ai[i][j]); ai[i][j]=mode.ai[i][j];
} }
} }
else{ else{
ai[i]=lib.init.eval(mode.ai[i]); ai[i]=mode.ai[i];
} }
} }
for(var i in mode.get){ for(var i in mode.get){
if(typeof mode.get[i]=='object'){ if(typeof mode.get[i]=='object'){
if(get[i]==undefined) get[i]={}; if(get[i]==undefined) get[i]={};
for(var j in mode.get[i]){ for(var j in mode.get[i]){
get[i][j]=lib.init.eval(mode.get[i][j]); get[i][j]=mode.get[i][j];
} }
} }
else{ else{
get[i]=lib.init.eval(mode.get[i]); get[i]=mode.get[i];
} }
} }
for(var i in mode.translate){ for(var i in mode.translate){
lib.translate[i]=mode.translate[i]; lib.translate[i]=mode.translate[i];
} }
if(mode.game){ if(mode.game){
game.getIdentityList=lib.init.eval(mode.game.getIdentityList); game.getIdentityList=mode.game.getIdentityList;
game.updateState=lib.init.eval(mode.game.updateState); game.updateState=mode.game.updateState;
} }
if(mode.element&&mode.element.player){ if(mode.element&&mode.element.player){
for(var i in mode.element.player){ for(var i in mode.element.player){
lib.element.player[i]=lib.init.eval(mode.element.player[i]); lib.element.player[i]=mode.element.player[i];
} }
} }
if(mode.skill){ if(mode.skill){
for(var i in mode.skill){ for(var i in mode.skill){
lib.skill[i]=lib.init.eval(mode.skill[i]); lib.skill[i]=mode.skill[i];
} }
} }
game.finishCards(); game.finishCards();
@ -19949,7 +19949,7 @@
} }
} }
if(mode.onreinit){ if(mode.onreinit){
(lib.init.eval(mode.onreinit))(); mode.onreinit();
} }
state=get.parsedResult(state); state=get.parsedResult(state);
game.players=[]; game.players=[];
@ -20107,6 +20107,7 @@
if(!observe&&game.me&&game.me.isDead()){ if(!observe&&game.me&&game.me.isDead()){
ui.exit=ui.create.control('退出联机',ui.click.exit); ui.exit=ui.create.control('退出联机',ui.click.exit);
} }
ui.updatehl();
}); });
}, },
exec:function(func){ exec:function(func){
@ -20790,9 +20791,6 @@
}, },
import:function(type,content){ import:function(type,content){
if(type=='extension'){ if(type=='extension'){
if(typeof content=='function'){
content=content(lib,game,ui,get,ai,_status);
}
game.loadExtension(content); game.loadExtension(content);
} }
else{ else{
@ -20807,6 +20805,11 @@
} }
}, },
loadExtension:function(obj){ loadExtension:function(obj){
var noeval=false;
if(typeof obj=='function'){
obj=obj(lib,game,ui,get,ai,_status);
noeval=true;
}
lib.extensionMenu['extension_'+obj.name]={ lib.extensionMenu['extension_'+obj.name]={
enable:{ enable:{
name:'开启', name:'开启',
@ -20870,7 +20873,7 @@
if(!_status.importingExtension){ if(!_status.importingExtension){
if(obj&&lib.config['extension_'+obj.name+'_enable']){ if(obj&&lib.config['extension_'+obj.name+'_enable']){
lib.init.eval(obj); if(!noeval) lib.init.eval(obj);
var cfg={}; var cfg={};
for(var j in lib.config){ for(var j in lib.config){
if(j.indexOf('extension_'+obj.name)==0&& if(j.indexOf('extension_'+obj.name)==0&&
@ -23087,7 +23090,7 @@
} }
} }
if(lib[i][j]==undefined){ if(lib[i][j]==undefined){
lib[i][j]=lib.init.eval(pack[i][j]); lib[i][j]=pack[i][j];
} }
} }
} }
@ -23180,7 +23183,7 @@
pack[i][j].audio='ext:'+extname+':'+pack[i][j].audio; pack[i][j].audio='ext:'+extname+':'+pack[i][j].audio;
} }
} }
if(lib[i][j]==undefined) lib[i][j]=lib.init.eval(pack[i][j]); if(lib[i][j]==undefined) lib[i][j]=pack[i][j];
} }
} }
}, },
@ -24805,10 +24808,10 @@
for(j in mode[lib.config.mode].element[i]){ for(j in mode[lib.config.mode].element[i]){
if(j=='init'){ if(j=='init'){
if(!lib.element[i].inits) lib.element[i].inits=[]; if(!lib.element[i].inits) lib.element[i].inits=[];
lib.element[i].inits.push(lib.init.eval(mode[lib.config.mode].element[i][j])); lib.element[i].inits.push(mode[lib.config.mode].element[i][j]);
} }
else{ else{
lib.element[i][j]=lib.init.eval(mode[lib.config.mode].element[i][j]); lib.element[i][j]=mode[lib.config.mode].element[i][j];
} }
} }
} }
@ -24816,29 +24819,29 @@
if(typeof mode[lib.config.mode].ai[i]=='object'){ if(typeof mode[lib.config.mode].ai[i]=='object'){
if(ai[i]==undefined) ai[i]={}; if(ai[i]==undefined) ai[i]={};
for(j in mode[lib.config.mode].ai[i]){ for(j in mode[lib.config.mode].ai[i]){
ai[i][j]=lib.init.eval(mode[lib.config.mode].ai[i][j]); ai[i][j]=mode[lib.config.mode].ai[i][j];
} }
} }
else{ else{
ai[i]=lib.init.eval(mode[lib.config.mode].ai[i]); ai[i]=mode[lib.config.mode].ai[i];
} }
} }
for(i in mode[lib.config.mode].ui){ for(i in mode[lib.config.mode].ui){
if(typeof mode[lib.config.mode].ui[i]=='object'){ if(typeof mode[lib.config.mode].ui[i]=='object'){
if(ui[i]==undefined) ui[i]={}; if(ui[i]==undefined) ui[i]={};
for(j in mode[lib.config.mode].ui[i]){ for(j in mode[lib.config.mode].ui[i]){
ui[i][j]=lib.init.eval(mode[lib.config.mode].ui[i][j]); ui[i][j]=mode[lib.config.mode].ui[i][j];
} }
} }
else{ else{
ui[i]=lib.init.eval(mode[lib.config.mode].ui[i]); ui[i]=mode[lib.config.mode].ui[i];
} }
} }
for(i in mode[lib.config.mode].game){ for(i in mode[lib.config.mode].game){
game[i]=lib.init.eval(mode[lib.config.mode].game[i]); game[i]=mode[lib.config.mode].game[i];
} }
for(i in mode[lib.config.mode].get){ for(i in mode[lib.config.mode].get){
get[i]=lib.init.eval(mode[lib.config.mode].get[i]); get[i]=mode[lib.config.mode].get[i];
} }
if(game.onwash){ if(game.onwash){
lib.onwash.push(game.onwash); lib.onwash.push(game.onwash);
@ -24862,7 +24865,7 @@
if(i=='startBefore') continue; if(i=='startBefore') continue;
if(lib[i]==undefined) lib[i]=(get.objtype(mode[lib.config.mode][i])=='array')?[]:{}; if(lib[i]==undefined) lib[i]=(get.objtype(mode[lib.config.mode][i])=='array')?[]:{};
for(j in mode[lib.config.mode][i]){ for(j in mode[lib.config.mode][i]){
lib[i][j]=lib.init.eval(mode[lib.config.mode][i][j]); lib[i][j]=mode[lib.config.mode][i][j];
} }
} }
@ -34932,7 +34935,7 @@
lib.status.dateDelayed=0; lib.status.dateDelayed=0;
while(lib.arenaReady.length){ while(lib.arenaReady.length){
(lib.init.eval(lib.arenaReady.shift()))(); (lib.arenaReady.shift())();
} }
delete lib.arenaReady; delete lib.arenaReady;
if(lib.config.auto_check_update){ if(lib.config.auto_check_update){

57
mode/brawl.js
View File

@ -425,7 +425,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
if(init){ if(init){
player1=ui.create.player(null,true).init('huangyueying'); player1=ui.create.player(null,true).init('huangyueying');
player2=ui.create.player(null,true); player2=ui.create.player(null,true);
if(lib.character.re_huangyueying){ if(lib.character.jsp_huangyueying){
player2.init('jsp_huangyueying');
}
else if(lib.character.re_huangyueying){
player2.init('re_huangyueying'); player2.init('re_huangyueying');
} }
else{ else{
@ -609,32 +612,36 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
player.show(); player.show();
},500); },500);
},700); },700);
for(var i=0;i<5;i++){
switch(i){
case 0:dx=-180;dy=0;break;
case 1:dx=-140;dy=100;break;
case 2:dx=0;dy=155;break;
case 3:dx=140;dy=100;break;
case 4:dx=180;dy=0;break;
}
var card=game.createCard('sha','noclick');
card.style.left='calc(50% - 52px)';
card.style.top='68px';
card.style.position='absolute';
card.style.margin=0;
card.style.zIndex=2;
card.style.opacity=0;
node.appendChild(card);
ui.refresh(card);
card.style.opacity=1;
card.style.transform='translate('+dx+'px,'+dy+'px)';
setTimeout((function(card){
return function(){
card.delete();
};
})(card),700);
}
} }
num2++; num2++;
switch(num++){
case 0:dx=-180;dy=0;break;
case 1:dx=-140;dy=100;break;
case 2:dx=0;dy=155;break;
case 3:dx=140;dy=100;break;
case 4:dx=180;dy=0;break;
}
if(num>=5){ if(num>=5){
num=0; num=0;
} }
var card=game.createCard('sha','noclick');
card.style.left='calc(50% - 52px)';
card.style.top='68px';
card.style.position='absolute';
card.style.margin=0;
card.style.zIndex=2;
card.style.opacity=0;
node.appendChild(card);
ui.refresh(card);
card.style.opacity=1;
card.style.transform='translate('+dx+'px,'+dy+'px)';
setTimeout(function(){
card.delete();
},700);
},700); },700);
}, },
init:function(){ init:function(){
@ -720,7 +727,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
var list=[['guanyu','guanping','guansuo','guanyinping'], var list=[['guanyu','guanping','guansuo','guanyinping'],
['caocao','caopi','caozhi','caorui'],['liubei','liushan','liuchen'], ['caocao','caopi','caozhi','caorui'],['liubei','liushan','liuchen'],
['xiahouyuan','xiahouba','xiahoushi'],['sunjian','sunquan','sunce'], ['xiahouyuan','xiahouba','xiahoushi'],['sunjian','sunquan','sunce'],
['zhangjiao','zhangliang','zhangbao'],['zhugeliang','zhugeguo','zhugejin','zhugeke'], ['sp_zhangjiao','zhangliang','zhangbao'],['zhugeliang','zhugeguo','zhugejin','zhugeke'],
['mateng','machao','madai','mayunlu']]; ['mateng','machao','madai','mayunlu']];
list.randomSort(); list.randomSort();
var list2=[]; var list2=[];
@ -923,8 +930,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
} }
} }
} }
func3(); // func3();
node.showcaseinterval=setInterval(func3,5000); // node.showcaseinterval=setInterval(func3,5000);
}, },
content:{ content:{
cardPile:function(list){ cardPile:function(list){

12
mode/tafang.js
View File

@ -12,25 +12,25 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
for(var i in result.element){ for(var i in result.element){
for(var j in result.element[i]){ for(var j in result.element[i]){
if(j!='dieAfter'){ if(j!='dieAfter'){
lib.element[i][j]=lib.init.eval(result.element[i][j]); lib.element[i][j]=result.element[i][j];
} }
} }
} }
for(var i in result.ui){ for(var i in result.ui){
for(var j in result.ui[i]){ for(var j in result.ui[i]){
ui[i][j]=lib.init.eval(result.ui[i][j]); ui[i][j]=result.ui[i][j];
} }
} }
get.chessDistance=lib.init.eval(result.get.chessDistance); get.chessDistance=result.get.chessDistance;
get.rawAttitude=lib.init.eval(result.get.rawAttitude); get.rawAttitude=result.get.rawAttitude;
var toLoad=['addChessPlayer','addObstacle','removeObstacle','isChessNeighbour', var toLoad=['addChessPlayer','addObstacle','removeObstacle','isChessNeighbour',
'draw2','updateCanvas2','setChessInfo','modeSwapPlayer']; 'draw2','updateCanvas2','setChessInfo','modeSwapPlayer'];
for(var i=0;i<toLoad.length;i++){ for(var i=0;i<toLoad.length;i++){
game[toLoad[i]]=lib.init.eval(result.game[toLoad[i]]); game[toLoad[i]]=result.game[toLoad[i]];
} }
toLoad=['_attackmove','_phasequeue','_chessmove','_chesscenter']; toLoad=['_attackmove','_phasequeue','_chessmove','_chesscenter'];
for(var i=0;i<toLoad.length;i++){ for(var i=0;i<toLoad.length;i++){
lib.skill[toLoad[i]]=lib.init.eval(result.skill[toLoad[i]]); lib.skill[toLoad[i]]=result.skill[toLoad[i]];
} }
for(var i in lib.skill){ for(var i in lib.skill){
if(lib.skill[i].changeSeat){ if(lib.skill[i].changeSeat){