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

b

This commit is contained in:
libccy 2017-03-27 12:27:01 +08:00
parent 3b8e2377cf
commit 0495584910
3 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
game/game.js
View File

@ -18982,7 +18982,7 @@
ui.rooms=[]; ui.rooms=[];
game.ip=get.trimip(_status.ip); game.ip=get.trimip(_status.ip);
for(var i=0;i<list.length;i++){ for(var i=0;i<list.length;i++){
var player=ui.create.player(ui.window); var player=ui.create.player(ui.window).animate('start');
player.dataset.position='c'+i; player.dataset.position='c'+i;
player.classList.add('connect'); player.classList.add('connect');
player.roomindex=i; player.roomindex=i;
@ -19024,6 +19024,7 @@
else if(typeof game.roomId=='number'){ else if(typeof game.roomId=='number'){
game.send('server','enter',game.roomId,lib.config.connect_nickname,lib.config.connect_avatar); game.send('server','enter',game.roomId,lib.config.connect_nickname,lib.config.connect_avatar);
} }
lib.init.onfree();
} }
if(_status.event.parent){ if(_status.event.parent){
game.forceOver('noover',proceed); game.forceOver('noover',proceed);

40
mode/boss.js
View File

@ -129,8 +129,16 @@ mode.boss={
} }
ui.create.div(bosslist); ui.create.div(bosslist);
lib.translate.boss_pangtong='涅槃凤雏'; lib.translate.boss_pangtong='涅槃凤雏';
ui.create.cards(); if(lib.onfree){
game.finishCards(); lib.onfree.push(function(){
ui.create.cards();
game.finishCards();
});
}
else{
ui.create.cards();
game.finishCards();
}
game.addGlobalSkill('autoswap'); game.addGlobalSkill('autoswap');
ui.arena.setNumber(8); ui.arena.setNumber(8);
ui.control.style.transitionProperty='opacity'; ui.control.style.transitionProperty='opacity';
@ -611,7 +619,7 @@ mode.boss={
// dialog.add('0/3'); // dialog.add('0/3');
dialog.add([list.slice(0,20),'character']); dialog.add([list.slice(0,20),'character']);
dialog.noopen=true; dialog.noopen=true;
var next=game.me.chooseButton(dialog,true); var next=game.me.chooseButton(dialog,true).set('onfree',true);
next._triggered=null; next._triggered=null;
next.custom.replace.target=event.customreplacetarget; next.custom.replace.target=event.customreplacetarget;
next.selectButton=[3,3]; next.selectButton=[3,3];
@ -644,10 +652,21 @@ mode.boss={
ui.cheat=ui.create.control('更换',event.changeDialog); ui.cheat=ui.create.control('更换',event.changeDialog);
delete _status.createControl; delete _status.createControl;
}; };
event.dialogxx=ui.create.characterDialog(); var createCharacterDialog=function(){
event.dialogxx.classList.add('bosscharacter'); event.dialogxx=ui.create.characterDialog();
event.dialogxx.classList.add('withbg'); event.dialogxx.classList.add('bosscharacter');
event.dialogxx.classList.add('fixed'); event.dialogxx.classList.add('withbg');
event.dialogxx.classList.add('fixed');
if(ui.cheat2){
ui.cheat2.classList.remove('disabled');
}
};
if(lib.onfree){
lib.onfree.push(createCharacterDialog);
}
else{
createCharacterDialog();
}
ui.create.cheat2=function(){ ui.create.cheat2=function(){
_status.createControl=event.asboss; _status.createControl=event.asboss;
ui.cheat2=ui.create.control('自由选将',function(){ ui.cheat2=ui.create.control('自由选将',function(){
@ -662,7 +681,7 @@ mode.boss={
game.uncheck(); game.uncheck();
game.check(); game.check();
if(ui.cheat){ if(ui.cheat){
ui.cheat.style.opacity=1; ui.cheat.classList.remove('disabled');
} }
} }
else{ else{
@ -677,10 +696,13 @@ mode.boss={
game.uncheck(); game.uncheck();
game.check(); game.check();
if(ui.cheat){ if(ui.cheat){
ui.cheat.style.opacity=0.6; ui.cheat.classList.add('disabled');
} }
} }
}); });
if(lib.onfree){
ui.cheat2.classList.add('disabled');
}
delete _status.createControl; delete _status.createControl;
} }
if(!ui.cheat&&get.config('change_choice')) if(!ui.cheat&&get.config('change_choice'))

2
mode/connect.js
View File

@ -104,6 +104,7 @@ mode.connect={
}); });
return uiintro; return uiintro;
},220); },220);
lib.init.onfree();
} }
if(window.isNonameServer){ if(window.isNonameServer){
game.connect(window.isNonameServerIp||'localhost'); game.connect(window.isNonameServerIp||'localhost');
@ -135,5 +136,6 @@ mode.connect={
add:{}, add:{},
replace:{} replace:{}
}; };
setTimeout(lib.init.onfree,1000);
} }
}; };