diff --git a/game/game.js b/game/game.js index 36abcaa45..db2615157 100644 --- a/game/game.js +++ b/game/game.js @@ -19485,13 +19485,16 @@ var game={ online:false, onlineID:null, - showHistory:function(){ + showHistory:function(pause){ if(lib.config.show_history=='left'){ ui.window.classList.add('leftbar'); } else if(lib.config.show_history=='right'){ ui.window.classList.add('rightbar'); } + if(pause!=false&&ui.pause){ + ui.pause.show(); + } }, createBackground:function(src,blur){ var current=document.body.querySelector('.background.upper'); @@ -24776,7 +24779,7 @@ }, prepareArena:function(num){ _status.prepareArena=true; - game.showHistory(); + game.showHistory(false); ui.create.players(num); ui.create.me(); ui.create.cardsAsync(); @@ -33599,6 +33602,9 @@ ui.config2.style.transition='all 0.5s'; ui.pause=ui.create.system('暂停',ui.click.pause); ui.pause.id='pausebutton'; + if(!_status.video){ + ui.pause.hide(); + } if(!lib.config.touchscreen){ lib.setPopped(ui.pause,ui.click.pausehistory,220,400,null,true); } diff --git a/game/update.js b/game/update.js index 87becd7b9..380910d62 100644 --- a/game/update.js +++ b/game/update.js @@ -1,6 +1,6 @@ window.noname_update={ version:'1.9.17', - update:'1.9.15', + // update:'1.9.15', changeLog:[ '提高载入速度', ], @@ -20,17 +20,17 @@ window.noname_update={ // 'mode/identity.js', // 'mode/chess.js', // 'mode/tafang.js', - 'mode/stone.js', - 'theme/music/style.css', - 'theme/woodden/style.css', - 'layout/default/layout.css', - 'layout/default/phone.css', - 'layout/default/menu.css', + // 'mode/stone.js', + // 'theme/music/style.css', + // 'theme/woodden/style.css', + // 'layout/default/layout.css', + // 'layout/default/phone.css', + // 'layout/default/menu.css', // 'theme/style/cardback/*', // 'layout/long/layout.css', // 'layout/long2/layout.css', // 'layout/mobile/layout.css', - 'layout/newlayout/global.css', + // 'layout/newlayout/global.css', // 'layout/mode/chess.css', // 'extension/boss/extension.js', ]