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

zz

This commit is contained in:
libccy 2017-04-03 09:42:38 +08:00
parent 63a5a3d315
commit 9b2e920e36
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
game/game.js
View File

@ -26426,6 +26426,9 @@
var menuTab=ui.create.div('.menu-tab',menu); var menuTab=ui.create.div('.menu-tab',menu);
var menuTabBar=ui.create.div('.menu-tab-bar',menu); var menuTabBar=ui.create.div('.menu-tab-bar',menu);
menuTabBar.style.left=(config.bar||0)+'px'; menuTabBar.style.left=(config.bar||0)+'px';
if(Math.round(2*game.documentZoom)<2){
menuTabBar.style.height='3px';
}
var menuContent=ui.create.div('.menu-content',menu); var menuContent=ui.create.div('.menu-content',menu);
var clickTab=function(){ var clickTab=function(){
if(this.classList.contains('disabled')) return; if(this.classList.contains('disabled')) return;
@ -26435,12 +26438,13 @@
active._link.remove(); active._link.remove();
} }
this.classList.add('active'); this.classList.add('active');
if((game.deviceZoom!=1||lib.crosswalk||lib.device=='ios')&&get.is.phoneLayout()){ menuTabBar.style.transform='translateX('+(this.getBoundingClientRect().left-this.parentNode.firstChild.getBoundingClientRect().left)+'px)';
menuTabBar.style.left=(this.offsetLeft/game.documentZoom)+'px'; // if((game.deviceZoom!=1||lib.crosswalk||lib.device=='ios')&&get.is.phoneLayout()){
} // menuTabBar.style.left=(this.offsetLeft/game.documentZoom)+'px';
else{ // }
menuTabBar.style.left=this.offsetLeft+'px'; // else{
} // menuTabBar.style.left=this.offsetLeft+'px';
// }
menuContent.appendChild(this._link); menuContent.appendChild(this._link);
}; };
ui.click.menuTab=function(tab){ ui.click.menuTab=function(tab){
@ -34077,10 +34081,6 @@
ui.replay=ui.create.system('重来',game.reload,true); ui.replay=ui.create.system('重来',game.reload,true);
ui.replay.id='restartbutton'; ui.replay.id='restartbutton';
ui.config2=ui.create.system('选项',ui.click.config); ui.config2=ui.create.system('选项',ui.click.config);
if(!game.syncMenu){
ui.config2.classList.add('hidden');
}
ui.config2.style.transition='all 0.5s';
ui.pause=ui.create.system('暂停',ui.click.pause); ui.pause=ui.create.system('暂停',ui.click.pause);
ui.pause.id='pausebutton'; ui.pause.id='pausebutton';
if(!_status.video){ if(!_status.video){
@ -34100,6 +34100,10 @@
} }
ui.auto=ui.create.system('托管',ui.click.auto); ui.auto=ui.create.system('托管',ui.click.auto);
if(!game.syncMenu){ if(!game.syncMenu){
ui.config2.classList.add('hidden');
ui.config2.style.transition='all 0.5s';
ui.roundmenu.classList.add('transparent2');
ui.auto.style.opacity=0.5; ui.auto.style.opacity=0.5;
ui.auto.style.transition='all 0.5s'; ui.auto.style.transition='all 0.5s';
lib.onfree.push(function(){ lib.onfree.push(function(){
@ -34249,6 +34253,7 @@
lib.onfree.push(function(){ lib.onfree.push(function(){
ui.create.menu(); ui.create.menu();
ui.config2.classList.remove('hidden'); ui.config2.classList.remove('hidden');
ui.roundmenu.classList.remove('transparent2');
setTimeout(function(){ setTimeout(function(){
ui.config2.style.transition=''; ui.config2.style.transition='';
},500); },500);
@ -37589,7 +37594,8 @@
e.preventDefault(); e.preventDefault();
} }
else{ else{
if(this.scrollWidth<=this.offsetWidth+5&& if(lib.device=='ios'&&
this.scrollWidth<=this.offsetWidth+5&&
this.scrollHeight<=this.offsetHeight+5){ this.scrollHeight<=this.offsetHeight+5){
e.preventDefault(); e.preventDefault();
} }

3
layout/default/menu.css
View File

@ -336,7 +336,8 @@
top:35px; top:35px;
position:absolute; position:absolute;
background-color:rgb(0, 133, 255); background-color:rgb(0, 133, 255);
transition:left 0.3s; transition:transform 0.3s;
left: 0;
} }
.menu.main>.menu-tab>div{ .menu.main>.menu-tab>div{
display:inline-block; display:inline-block;

2
mode/brawl.js
View File

@ -363,7 +363,7 @@ mode.brawl={
game.save('directStage'); game.save('directStage');
clickStart(directStage); clickStart(directStage);
} }
console.log(lib.onfree[0]); lib.init.onfree();
}, },
brawl:{ brawl:{
duzhansanguo:{ duzhansanguo:{