jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix bugs

Browse Source
This commit is contained in:
oc 2018-12-17 10:31:04 +08:00
parent f9133aff92
commit fd08290b73
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/control.js
View File

@ -2782,11 +2782,19 @@ control.prototype.updateStatusBar = function () {
control.prototype.triggerStatusBar = function (name, showToolbox) { control.prototype.triggerStatusBar = function (name, showToolbox) {
if (name!='hide') name='show'; 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 statusItems = core.dom.status;
var toolItems = core.dom.tools; var toolItems = core.dom.tools;
core.domStyle.showStatusBar = name == 'show'; core.domStyle.showStatusBar = name == 'show';
core.setFlag('hideStatusBar', core.domStyle.showStatusBar?null:true); core.setFlag('hideStatusBar', core.domStyle.showStatusBar?null:true);
core.setFlag('showToolbox', showToolbox); core.setFlag('showToolbox', showToolbox?true:null);
if (!core.domStyle.showStatusBar) { if (!core.domStyle.showStatusBar) {
for (var i = 0; i < statusItems.length; ++i) for (var i = 0; i < statusItems.length; ++i)
statusItems[i].style.opacity = 0; statusItems[i].style.opacity = 0;

2
libs/core.js
View File

@ -322,7 +322,7 @@ core.prototype.init = function (coreData, callback) {
core.musicStatus.bgmStatus = core.getLocalStorage('bgmStatus', true); core.musicStatus.bgmStatus = core.getLocalStorage('bgmStatus', true);
if (!core.musicStatus.startDirectly) // 如果当前网络环境不允许 if (!core.musicStatus.startDirectly) // 如果当前网络环境不允许
core.musicStatus.bgmStatus = false; core.musicStatus.bgmStatus = false;
core.setLocalStorage('bgmStatus', core.musicStatus.bgmStatus); // core.setLocalStorage('bgmStatus', core.musicStatus.bgmStatus);
core.musicStatus.soundStatus = core.getLocalStorage('soundStatus', true); core.musicStatus.soundStatus = core.getLocalStorage('soundStatus', true);
core.setLocalStorage('soundStatus', core.musicStatus.soundStatus); core.setLocalStorage('soundStatus', core.musicStatus.soundStatus);

2
libs/loader.js
View File

@ -250,7 +250,7 @@ loader.prototype.loadMusic = function () {
loader.prototype.loadOneMusic = function (name) { loader.prototype.loadOneMusic = function (name) {
var music = new Audio(); var music = new Audio();
music.preload = 'none'; 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; else music.src = 'project/sounds/'+name;
music.loop = 'loop'; music.loop = 'loop';
core.material.bgms[name] = music; core.material.bgms[name] = music;