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

menu

This commit is contained in:
libccy 2016-04-09 11:06:48 +08:00
parent df81ef3f22
commit bab929a282
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
game/game.js
View File

@ -12098,6 +12098,11 @@
var game={ var game={
online:false, online:false,
onlineID:null, onlineID:null,
closeMenu:function(){
if(!ui.menuContainer.classList.contains('hidden')){
ui.click.configMenu();
}
},
closePopped:function(){ closePopped:function(){
if(ui.currentpopped){ if(ui.currentpopped){
if(ui.currentpopped._uiintro){ if(ui.currentpopped._uiintro){
@ -17600,6 +17605,7 @@
ui.shortcut=ui.create.div('#shortcut.hidden',ui.window); ui.shortcut=ui.create.div('#shortcut.hidden',ui.window);
ui.shortcut.listen(ui.click.shortcut); ui.shortcut.listen(ui.click.shortcut);
ui.create.div(ui.shortcut,function(e){e.stopPropagation()});
ui.create.div('.menubutton.round','<span>重来</span>',ui.shortcut,game.reload).dataset.position=1; ui.create.div('.menubutton.round','<span>重来</span>',ui.shortcut,game.reload).dataset.position=1;
ui.create.div('.menubutton.round','<span>退出</span>',ui.shortcut,game.exit).dataset.position=3; ui.create.div('.menubutton.round','<span>退出</span>',ui.shortcut,game.exit).dataset.position=3;
ui.create.div('.menubutton.round','<span>记录</span>',ui.shortcut,ui.click.pause).dataset.position=4; ui.create.div('.menubutton.round','<span>记录</span>',ui.shortcut,ui.click.pause).dataset.position=4;
@ -21201,9 +21207,7 @@
game.closePopped(); game.closePopped();
ui.system1.classList.add('shown'); ui.system1.classList.add('shown');
ui.system2.classList.add('shown'); ui.system2.classList.add('shown');
if(!ui.menuContainer.classList.contains('hidden')){ game.closeMenu();
ui.click.configMenu();
}
ui.click.shortcut(); ui.click.shortcut();
break; break;
case 'menu': case 'menu':
@ -21879,9 +21883,7 @@
game.closePopped(); game.closePopped();
ui.system1.classList.add('shown'); ui.system1.classList.add('shown');
ui.system2.classList.add('shown'); ui.system2.classList.add('shown');
if(!ui.menuContainer.classList.contains('hidden')){ game.closeMenu();
ui.click.configMenu();
}
ui.click.shortcut(); ui.click.shortcut();
break; break;
case 'menu': case 'menu':
@ -21898,6 +21900,7 @@
ui.click.auto(); ui.click.auto();
break; break;
case 'chat': case 'chat':
game.closeMenu();
if(ui.chatButton){ if(ui.chatButton){
ui.click.hoverpopped.call(ui.chatButton); ui.click.hoverpopped.call(ui.chatButton);
} }

1
game/update.js
View File

@ -1,6 +1,7 @@
window.noname_update={ window.noname_update={
version:'1.8.4.1', version:'1.8.4.1',
changeLog:[ changeLog:[
'修复几处界面问题',
'修复完杀和双将bug', '修复完杀和双将bug',
'旁观可切换视角', '旁观可切换视角',
'聊天手势', '聊天手势',

9
layout/default/layout.css
View File

@ -65,7 +65,14 @@ table{table-layout: fixed;}
text-align: center; text-align: center;
letter-spacing: -6px; letter-spacing: -6px;
transform: scale(1.3); transform: scale(1.3);
/*transition: all 0.3s;*/ }
#shortcut>div:not(.menubutton){
width: 100%;
height: 80px;
margin: 0;
padding: 0;
left: 0;
top:0;
} }
#shortcut>div>span{ #shortcut>div>span{
width: 200px; width: 200px;