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

u

This commit is contained in:
libccy 2016-04-08 18:36:25 +08:00
parent 52c5225514
commit 8e545df871
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
game/game.js
View File

@ -13891,8 +13891,8 @@
window.location.reload(); window.location.reload();
}, },
exit:function(){ exit:function(){
if(navigator.app&&navigator.app.exit){ if(navigator.app&&navigator.app.exitApp){
navigator.app.exit(); navigator.app.exitApp();
} }
}, },
reloadCurrent:function(){ reloadCurrent:function(){
@ -17794,6 +17794,7 @@
menuContainer=ui.create.div('.menu-container.hidden',ui.window,clickContainer); menuContainer=ui.create.div('.menu-container.hidden',ui.window,clickContainer);
ui.menuContainer=menuContainer; ui.menuContainer=menuContainer;
ui.click.configMenu=function(){ ui.click.configMenu=function(){
ui.click.shortcut(false)
if(menuContainer.classList.contains('hidden')){ if(menuContainer.classList.contains('hidden')){
ui.config2.classList.add('pressdown2'); ui.config2.classList.add('pressdown2');
ui.arena.classList.add('menupaused'); ui.arena.classList.add('menupaused');
@ -20673,6 +20674,7 @@
}, },
pause:function(){ pause:function(){
if(_status.pausing) return; if(_status.pausing) return;
ui.click.shortcut(false);
var node=ui.create.div("#paused",ui.window); var node=ui.create.div("#paused",ui.window);
_status.pausing=true; _status.pausing=true;
setTimeout(function(){ setTimeout(function(){
@ -21525,7 +21527,7 @@
if(!lib.config.touchscreen){ if(!lib.config.touchscreen){
uiintro.addEventListener('mouseleave',ui.click.leavehoverpopped); uiintro.addEventListener('mouseleave',ui.click.leavehoverpopped);
} }
ui.click.shortcut(false);
if(uiintro._onopen){ if(uiintro._onopen){
uiintro._onopen(); uiintro._onopen();
} }
@ -21865,18 +21867,18 @@
var goswipe=function(action){ var goswipe=function(action){
switch(action){ switch(action){
case 'system': case 'system':
if(ui.system2.classList.contains('shown')|| // if(ui.system2.classList.contains('shown')||
lib.config.layout!='phone'){ // lib.config.layout!='phone'){
game.pause2(); // game.pause2();
ui.click.configMenu(); // ui.click.configMenu();
ui.system1.classList.remove('shown'); // ui.system1.classList.remove('shown');
ui.system2.classList.remove('shown'); // ui.system2.classList.remove('shown');
} // }
else{ // else{
// }
ui.system1.classList.add('shown'); ui.system1.classList.add('shown');
ui.system2.classList.add('shown'); ui.system2.classList.add('shown');
ui.click.shortcut(); ui.click.shortcut();
}
break; break;
case 'menu': case 'menu':
game.pause2(); game.pause2();
@ -22440,6 +22442,7 @@
} }
} }
} }
ui.click.shortcut(false);
if(lib.config.layout=='phone'&&ui.menuContainer.classList.contains('hidden')){ if(lib.config.layout=='phone'&&ui.menuContainer.classList.contains('hidden')){
if(ui.system2.classList.contains('shown')){ if(ui.system2.classList.contains('shown')){
_status.removinground=true; _status.removinground=true;
@ -22978,6 +22981,7 @@
auto:function(){ auto:function(){
if(ui.auto.classList.contains('hidden')) return; if(ui.auto.classList.contains('hidden')) return;
if(_status.paused2) return; if(_status.paused2) return;
ui.click.shortcut(false);
if(!_status.auto){ if(!_status.auto){
_status.auto=true; _status.auto=true;
ui.auto.classList.add('glow'); ui.auto.classList.add('glow');
@ -23069,8 +23073,6 @@
_status.clicked=true; _status.clicked=true;
game.pause2(); game.pause2();
ui.click.shortcut(false);
ui.click.configMenu(); ui.click.configMenu();
ui.system1.classList.remove('shown'); ui.system1.classList.remove('shown');
ui.system2.classList.remove('shown'); ui.system2.classList.remove('shown');

2
game/update.js
View File

@ -1,5 +1,5 @@
window.noname_update={ window.noname_update={
version:'1.8.4', version:'1.8.4.0',
changeLog:[ changeLog:[
'修复完杀和双将bug', '修复完杀和双将bug',
'旁观可切换视角', '旁观可切换视角',

2
layout/default/layout.css
View File

@ -39,7 +39,7 @@ table{table-layout: fixed;}
position: absolute; position: absolute;
transition: all 1s; transition: all 1s;
} }
#window.shortcutpaused>div:not(.background):not(#shortcut):not(#system):not(#arena):not(.hidden):not(.removing):not(.dialog.popped){opacity: 0.3 !important} #window.shortcutpaused>div:not(.background):not(#shortcut):not(#system):not(#arena):not(.hidden):not(.removing):not(.dialog){opacity: 0.3 !important}
#window.shortcutpaused>#arena>div:not(#timer):not(.removing):not(.hidden){opacity: 0.3 !important} #window.shortcutpaused>#arena>div:not(#timer):not(.removing):not(.hidden){opacity: 0.3 !important}
#window.noclick_important *{pointer-events: none !important;} #window.noclick_important *{pointer-events: none !important;}
#window.noclick_important .noclick_click_important div{pointer-events: auto !important} #window.noclick_important .noclick_click_important div{pointer-events: auto !important}