This commit is contained in:
libccy 2017-03-18 13:19:32 +08:00
parent 4d239b9693
commit 5cf4269245
3 changed files with 33 additions and 13 deletions

View File

@ -1788,7 +1788,6 @@
init:true, init:true,
item:{ item:{
music_default:'默认', music_default:'默认',
music_custom:'自定',
}, },
onclick:function(item){ onclick:function(item){
game.saveConfig('background_music',item); game.saveConfig('background_music',item);
@ -4717,6 +4716,9 @@
} }
} }
if(music&&music.pack){ if(music&&music.pack){
if(lib.device||typeof window.require=='function'){
lib.configMenu.audio.config.background_music.item.music_custom='自定';
}
for(i in music.pack){ for(i in music.pack){
lib.configMenu.audio.config.background_music.item[i]=music.pack[i]; lib.configMenu.audio.config.background_music.item[i]=music.pack[i];
} }
@ -23977,18 +23979,18 @@
popupContainer.appendChild(node); popupContainer.appendChild(node);
var rect=node.getBoundingClientRect(); var rect=node.getBoundingClientRect();
if(node.classList.contains('visual')){ if(node.classList.contains('visual')){
if(node.querySelectorAll('.menu.visual>div').length>9){
node.style.overflow='scroll';
}
else{
node.style.overflow='';
}
node.style.top=(e.y-node.offsetHeight/2+30)+'px'; node.style.top=(e.y-node.offsetHeight/2+30)+'px';
for(var i=0;i<node.childElementCount;i++){ for(var i=0;i<node.childElementCount;i++){
if(node.childNodes[i].update){ if(node.childNodes[i].update){
node.childNodes[i].update(); node.childNodes[i].update();
} }
} }
if(node.childElementCount>9){
node.style.overflow='scroll';
}
else{
node.style.overflow='';
}
if(node.offsetTop<10){ if(node.offsetTop<10){
node.style.top='10px'; node.style.top='10px';
} }
@ -24017,7 +24019,15 @@
if(this._link.menu){ if(this._link.menu){
var pos1=this.lastChild.getBoundingClientRect(); var pos1=this.lastChild.getBoundingClientRect();
var pos2=ui.window.getBoundingClientRect(); var pos2=ui.window.getBoundingClientRect();
if(this._link.menu.childElementCount>10){ if(this._link.menu.classList.contains('visual')){
openMenu(this._link.menu,{
x:pos1.left+pos1.width+5-pos2.left,
y:pos1.top-pos2.top
},function(){
node.classList.remove('on');
});
}
else if(this._link.menu.childElementCount>10){
openMenu(this._link.menu,{ openMenu(this._link.menu,{
x:pos1.left+pos1.width+5-pos2.left, x:pos1.left+pos1.width+5-pos2.left,
y:Math.min((ui.window.offsetHeight-400)/2,pos1.top-pos2.top) y:Math.min((ui.window.offsetHeight-400)/2,pos1.top-pos2.top)
@ -24175,6 +24185,16 @@
visualMenu.update=updateVisual; visualMenu.update=updateVisual;
node._link.menu.appendChild(visualMenu); node._link.menu.appendChild(visualMenu);
} }
lib.setScroll(node._link.menu);
var split=[];
for(var i=1;i<node._link.menu.childElementCount;i++){
if(i%3==0){
split.push(node._link.menu.childNodes[i]);
}
}
for(var i=0;i<split.length;i++){
node._link.menu.insertBefore(ui.create.node('br'),split[i]);
}
} }
else{ else{
for(var i in config.item){ for(var i in config.item){

View File

@ -1,11 +1,11 @@
window.noname_update={ window.noname_update={
version:'1.9.11', version:'1.9.11.1',
// update:'1.9.10.7', update:'1.9.11',
changeLog:[ changeLog:[
'bug修复', 'bug修复',
], ],
files:[ files:[
// 'game/game.js', 'game/game.js',
// 'game/package.js', // 'game/package.js',
// 'game/config.js', // 'game/config.js',
// 'game/source.js', // 'game/source.js',
@ -26,7 +26,7 @@ window.noname_update={
// 'mode/stone.js', // 'mode/stone.js',
// 'theme/simple/style.css', // 'theme/simple/style.css',
// 'layout/default/layout.css', // 'layout/default/layout.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',

View File

@ -476,7 +476,7 @@
} }
.popup-container>.menu.visual{ .popup-container>.menu.visual{
padding: 5px; padding: 5px;
max-width: 300px; /*max-width: 300px;*/
max-height: 305px; max-height: 305px;
overflow: hidden; overflow: hidden;
} }