diff --git a/game/game.js b/game/game.js index b6ac1fcc4..c60d37970 100644 --- a/game/game.js +++ b/game/game.js @@ -26426,6 +26426,9 @@ var menuTab=ui.create.div('.menu-tab',menu); var menuTabBar=ui.create.div('.menu-tab-bar',menu); 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 clickTab=function(){ if(this.classList.contains('disabled')) return; @@ -26435,12 +26438,13 @@ active._link.remove(); } this.classList.add('active'); - 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'; - } + menuTabBar.style.transform='translateX('+(this.getBoundingClientRect().left-this.parentNode.firstChild.getBoundingClientRect().left)+'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'; + // } menuContent.appendChild(this._link); }; ui.click.menuTab=function(tab){ @@ -34077,10 +34081,6 @@ ui.replay=ui.create.system('重来',game.reload,true); ui.replay.id='restartbutton'; 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.id='pausebutton'; if(!_status.video){ @@ -34100,6 +34100,10 @@ } ui.auto=ui.create.system('托管',ui.click.auto); 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.transition='all 0.5s'; lib.onfree.push(function(){ @@ -34249,6 +34253,7 @@ lib.onfree.push(function(){ ui.create.menu(); ui.config2.classList.remove('hidden'); + ui.roundmenu.classList.remove('transparent2'); setTimeout(function(){ ui.config2.style.transition=''; },500); @@ -37589,7 +37594,8 @@ e.preventDefault(); } else{ - if(this.scrollWidth<=this.offsetWidth+5&& + if(lib.device=='ios'&& + this.scrollWidth<=this.offsetWidth+5&& this.scrollHeight<=this.offsetHeight+5){ e.preventDefault(); } diff --git a/layout/default/menu.css b/layout/default/menu.css index 54154d904..f98f3c62a 100644 --- a/layout/default/menu.css +++ b/layout/default/menu.css @@ -336,7 +336,8 @@ top:35px; position:absolute; background-color:rgb(0, 133, 255); - transition:left 0.3s; + transition:transform 0.3s; + left: 0; } .menu.main>.menu-tab>div{ display:inline-block; diff --git a/mode/brawl.js b/mode/brawl.js index a5266ccc6..6f58bbacf 100644 --- a/mode/brawl.js +++ b/mode/brawl.js @@ -363,7 +363,7 @@ mode.brawl={ game.save('directStage'); clickStart(directStage); } - console.log(lib.onfree[0]); + lib.init.onfree(); }, brawl:{ duzhansanguo:{