This commit is contained in:
libccy 2017-03-22 12:14:44 +08:00
parent 43f8367c3f
commit 8e3062000e
3 changed files with 29 additions and 28 deletions

View File

@ -608,25 +608,25 @@
} }
} }
}, },
fewplayer:{ // fewplayer:{
name:'启用人数', // name:'启用人数',
intro:'设置启用新版布局的最小人数(不足时切换至默认布局)', // intro:'设置启用新版布局的最小人数(不足时切换至默认布局)',
init:'3', // init:'3',
// unfrequent:true, // // unfrequent:true,
item:{ // item:{
'2':'两人', // '2':'两人',
'3':'三人', // '3':'三人',
'4':'四人', // '4':'四人',
'5':'五人', // '5':'五人',
'6':'六人', // '6':'六人',
'7':'七人', // '7':'七人',
'8':'八人', // '8':'八人',
}, // },
onclick:function(item){ // onclick:function(item){
game.saveConfig('fewplayer',item); // game.saveConfig('fewplayer',item);
if(ui.arena) ui.arena.setNumber(ui.arena.dataset.number); // if(ui.arena) ui.arena.setNumber(ui.arena.dataset.number);
} // }
}, // },
player_height:{ player_height:{
name:'角色高度', name:'角色高度',
init:'long', init:'long',
@ -2329,11 +2329,11 @@
} }
} }
if(lib.config.layout=='long'){ if(lib.config.layout=='long'){
map.fewplayer.show(); // map.fewplayer.show();
map.player_height.show(); map.player_height.show();
} }
else{ else{
map.fewplayer.hide(); // map.fewplayer.hide();
if(lib.config.layout=='long2'){ if(lib.config.layout=='long2'){
map.player_height.show(); map.player_height.show();
} }
@ -32950,12 +32950,12 @@
ui.arena=ui.create.div('#arena.nome',ui.window); ui.arena=ui.create.div('#arena.nome',ui.window);
ui.arena.setNumber=function(num){ ui.arena.setNumber=function(num){
this.dataset.number=num; this.dataset.number=num;
if(game.layout=='long'&&parseInt(num)<parseInt(lib.config.fewplayer)){ // if(game.layout=='long'&&parseInt(num)<parseInt(lib.config.fewplayer)){
this.classList.add('fewplayer'); // this.classList.add('fewplayer');
} // }
else{ // else{
this.classList.remove('fewplayer'); // this.classList.remove('fewplayer');
} // }
} }
if(game.layout=='mobile'||game.layout=='long'){ if(game.layout=='mobile'||game.layout=='long'){

View File

@ -24,7 +24,7 @@ window.noname_update={
// 'layout/default/layout.css', // 'layout/default/layout.css',
// 'layout/default/phone.css', // 'layout/default/phone.css',
// 'layout/default/menu.css', // 'layout/default/menu.css',
// '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',

View File

@ -19,6 +19,7 @@
border-radius: 0; border-radius: 0;
top: 0; top: 0;
height: calc(100% - 121px); height: calc(100% - 121px);
z-index: 1;
} }
#window.oblongcard #historybar{ #window.oblongcard #historybar{
height: calc(100% - 141px); height: calc(100% - 141px);