This commit is contained in:
libccy 2017-03-27 14:27:17 +08:00
parent 1167be7289
commit 4cf51202e3
2 changed files with 16 additions and 10 deletions

View File

@ -19485,13 +19485,16 @@
var game={ var game={
online:false, online:false,
onlineID:null, onlineID:null,
showHistory:function(){ showHistory:function(pause){
if(lib.config.show_history=='left'){ if(lib.config.show_history=='left'){
ui.window.classList.add('leftbar'); ui.window.classList.add('leftbar');
} }
else if(lib.config.show_history=='right'){ else if(lib.config.show_history=='right'){
ui.window.classList.add('rightbar'); ui.window.classList.add('rightbar');
} }
if(pause!=false&&ui.pause){
ui.pause.show();
}
}, },
createBackground:function(src,blur){ createBackground:function(src,blur){
var current=document.body.querySelector('.background.upper'); var current=document.body.querySelector('.background.upper');
@ -24776,7 +24779,7 @@
}, },
prepareArena:function(num){ prepareArena:function(num){
_status.prepareArena=true; _status.prepareArena=true;
game.showHistory(); game.showHistory(false);
ui.create.players(num); ui.create.players(num);
ui.create.me(); ui.create.me();
ui.create.cardsAsync(); ui.create.cardsAsync();
@ -33599,6 +33602,9 @@
ui.config2.style.transition='all 0.5s'; 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){
ui.pause.hide();
}
if(!lib.config.touchscreen){ if(!lib.config.touchscreen){
lib.setPopped(ui.pause,ui.click.pausehistory,220,400,null,true); lib.setPopped(ui.pause,ui.click.pausehistory,220,400,null,true);
} }

View File

@ -1,6 +1,6 @@
window.noname_update={ window.noname_update={
version:'1.9.17', version:'1.9.17',
update:'1.9.15', // update:'1.9.15',
changeLog:[ changeLog:[
'提高载入速度', '提高载入速度',
], ],
@ -20,17 +20,17 @@ window.noname_update={
// 'mode/identity.js', // 'mode/identity.js',
// 'mode/chess.js', // 'mode/chess.js',
// 'mode/tafang.js', // 'mode/tafang.js',
'mode/stone.js', // 'mode/stone.js',
'theme/music/style.css', // 'theme/music/style.css',
'theme/woodden/style.css', // 'theme/woodden/style.css',
'layout/default/layout.css', // 'layout/default/layout.css',
'layout/default/phone.css', // 'layout/default/phone.css',
'layout/default/menu.css', // 'layout/default/menu.css',
// 'theme/style/cardback/*', // 'theme/style/cardback/*',
// 'layout/long/layout.css', // 'layout/long/layout.css',
// 'layout/long2/layout.css', // 'layout/long2/layout.css',
// 'layout/mobile/layout.css', // 'layout/mobile/layout.css',
'layout/newlayout/global.css', // 'layout/newlayout/global.css',
// 'layout/mode/chess.css', // 'layout/mode/chess.css',
// 'extension/boss/extension.js', // 'extension/boss/extension.js',
] ]