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

取消了editor模式的部分动画 & fix bug

Browse Source
This commit is contained in:
YouWei Zhao 2018-01-02 12:37:40 +08:00
parent a9835de64a
commit 5671d5501e
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
_server/vm.js
View File

@ -168,6 +168,7 @@ var clear = new Vue({
methods: {
clearMap: function(){
editor.mapInit();
editor.updateMap();
clearTimeout(editArea.formatTimer);
clearTimeout(tip.timer);
pout.value = '';

16
libs/core.js
View File

@ -3615,7 +3615,7 @@ core.prototype.isset = function (val) {
////// 播放背景音乐 //////
core.prototype.playBgm = function (bgm) {
if (main.mode!='play')return;
// 如果不允许播放
if (!core.musicStatus.bgmStatus) return;
// 音频不存在
@ -3666,7 +3666,7 @@ core.prototype.pauseBgm = function () {
////// 恢复背景音乐的播放 //////
core.prototype.resumeBgm = function () {
if (main.mode!='play')return;
// 如果不允许播放
if (!core.musicStatus.bgmStatus) return;
@ -3691,7 +3691,7 @@ core.prototype.resumeBgm = function () {
////// 播放音频 //////
core.prototype.playSound = function (sound) {
if (main.mode!='play')return;
// 如果不允许播放
if (!core.musicStatus.soundStatus) return;
// 音频不存在
@ -3730,6 +3730,11 @@ core.prototype.show = function (obj, speed, callback) {
return;
}
obj.style.display = 'block';
if (main.mode!='play'){
obj.style.opacity = 1;
if (core.isset(callback)) {callback();}
return;
}
obj.style.opacity = 0;
var opacityVal = 0;
var showAnimate = window.setInterval(function () {
@ -3750,6 +3755,11 @@ core.prototype.hide = function (obj, speed, callback) {
obj.style.display = 'none';
return;
}
if (main.mode!='play'){
obj.style.display = 'none';
if (core.isset(callback)) {callback();}
return;
}
var opacityVal = 1;
var hideAnimate = window.setInterval(function () {
opacityVal -= 0.03;