Fix bugs
This commit is contained in:
parent
f9133aff92
commit
fd08290b73
@ -2782,11 +2782,19 @@ control.prototype.updateStatusBar = function () {
|
||||
|
||||
control.prototype.triggerStatusBar = function (name, showToolbox) {
|
||||
if (name!='hide') name='show';
|
||||
|
||||
// 如果是隐藏 -> 显示工具栏,则先显示
|
||||
if (name == 'hide' && showToolbox && !core.domStyle.showStatusBar && !core.hasFlag("showToolbox")) {
|
||||
this.triggerStatusBar("show");
|
||||
this.triggerStatusBar("hide", showToolbox);
|
||||
return;
|
||||
}
|
||||
|
||||
var statusItems = core.dom.status;
|
||||
var toolItems = core.dom.tools;
|
||||
core.domStyle.showStatusBar = name == 'show';
|
||||
core.setFlag('hideStatusBar', core.domStyle.showStatusBar?null:true);
|
||||
core.setFlag('showToolbox', showToolbox);
|
||||
core.setFlag('showToolbox', showToolbox?true:null);
|
||||
if (!core.domStyle.showStatusBar) {
|
||||
for (var i = 0; i < statusItems.length; ++i)
|
||||
statusItems[i].style.opacity = 0;
|
||||
|
||||
@ -322,7 +322,7 @@ core.prototype.init = function (coreData, callback) {
|
||||
core.musicStatus.bgmStatus = core.getLocalStorage('bgmStatus', true);
|
||||
if (!core.musicStatus.startDirectly) // 如果当前网络环境不允许
|
||||
core.musicStatus.bgmStatus = false;
|
||||
core.setLocalStorage('bgmStatus', core.musicStatus.bgmStatus);
|
||||
// core.setLocalStorage('bgmStatus', core.musicStatus.bgmStatus);
|
||||
|
||||
core.musicStatus.soundStatus = core.getLocalStorage('soundStatus', true);
|
||||
core.setLocalStorage('soundStatus', core.musicStatus.soundStatus);
|
||||
|
||||
@ -250,7 +250,7 @@ loader.prototype.loadMusic = function () {
|
||||
loader.prototype.loadOneMusic = function (name) {
|
||||
var music = new Audio();
|
||||
music.preload = 'none';
|
||||
if (main.bgmRemote) music.src = main.bgmRemoteRoot+core.firstData.name+'/'+t;
|
||||
if (main.bgmRemote) music.src = main.bgmRemoteRoot+core.firstData.name+'/'+name;
|
||||
else music.src = 'project/sounds/'+name;
|
||||
music.loop = 'loop';
|
||||
core.material.bgms[name] = music;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user