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

m

This commit is contained in:
libccy 2017-03-27 13:19:23 +08:00
parent fa09433e09
commit c2c6f96de7
1 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
game/game.js
View File

@ -5583,9 +5583,6 @@
else if(e.keyCode==74&&(e.ctrlKey||e.metaKey)&&lib.node){ else if(e.keyCode==74&&(e.ctrlKey||e.metaKey)&&lib.node){
lib.node.debug(); lib.node.debug();
} }
// else if(e.keyCode==27){
// if(!ui.arena.classList.contains('paused')) ui.click.configMenu();
// }
} }
else{ else{
game.closePopped(); game.closePopped();
@ -33758,31 +33755,33 @@
},3000); },3000);
} }
if(!lib.config.asset_version){ if(!lib.config.asset_version){
setTimeout(function(){ lib.onfree.push(function(){
if(!game.download){ setTimeout(function(){
game.saveConfig('asset_version','无'); if(!game.download){
} game.saveConfig('asset_version','无');
else{ }
var func=function(){ else{
if(confirm('是否下载图片和字体素材？（约40MB）')){ var func=function(){
if(!ui.arena.classList.contains('menupaused')){ if(confirm('是否下载图片和字体素材？（约40MB）')){
ui.click.configMenu(); if(!ui.arena.classList.contains('menupaused')){
ui.click.menuTab('其它'); ui.click.configMenu();
} ui.click.menuTab('其它');
setTimeout(game.checkForAssetUpdate,500); }
} setTimeout(game.checkForAssetUpdate,500);
else{ }
game.saveConfig('asset_version','无'); else{
} game.saveConfig('asset_version','无');
} }
if(_status.new_tutorial){ }
_status.new_tutorial=func; if(_status.new_tutorial){
} _status.new_tutorial=func;
else{ }
func(); else{
} func();
} }
},4000); }
},3000);
});
} }
clearTimeout(window.resetGameTimeout); clearTimeout(window.resetGameTimeout);
delete window.resetGameTimeout; delete window.resetGameTimeout;
@ -34637,11 +34636,13 @@
ui.click.shortcut(); ui.click.shortcut();
break; break;
case 'menu': case 'menu':
game.closePopped(); if(ui.click.configMenu){
game.pause2(); game.closePopped();
ui.click.configMenu(); game.pause2();
ui.system1.classList.remove('shown'); ui.click.configMenu();
ui.system2.classList.remove('shown'); ui.system1.classList.remove('shown');
ui.system2.classList.remove('shown');
}
break; break;
case 'pause': case 'pause':
ui.click.pause(); ui.click.pause();
@ -35337,11 +35338,13 @@
ui.click.shortcut(); ui.click.shortcut();
break; break;
case 'menu': case 'menu':
game.closePopped(); if(ui.click.configMenu){
game.pause2(); game.closePopped();
ui.click.configMenu(); game.pause2();
ui.system1.classList.remove('shown'); ui.click.configMenu();
ui.system2.classList.remove('shown'); ui.system1.classList.remove('shown');
ui.system2.classList.remove('shown');
}
break; break;
case 'pause': case 'pause':
ui.click.pause(); ui.click.pause();