From 7babb707291e079fd438cd641b5b8d0cdd423a47 Mon Sep 17 00:00:00 2001 From: oc Date: Wed, 23 May 2018 20:24:00 +0800 Subject: [PATCH] autoplay bug --- main.js | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/main.js b/main.js index 1bb53fce..6a89dd6d 100644 --- a/main.js +++ b/main.js @@ -459,8 +459,13 @@ main.dom.playGame.onclick = function () { main.dom.startButtons.style.display='none'; if (main.core.isset(main.core.musicStatus) && main.core.musicStatus.startDirectly - && main.core.musicStatus.bgmStatus && main.core.musicStatus.playingBgm==null) - main.core.playBgm(main.core.bgms[0]); + && main.core.musicStatus.bgmStatus) { + if (main.core.musicStatus.playingBgm==null + || core.material.bgms[main.core.musicStatus.playingBgm].paused) { + main.core.musicStatus.playingBgm=null; + main.core.playBgm(main.core.bgms[0]); + } + } if (main.core.isset(main.core.flags.startDirectly) && main.core.flags.startDirectly) { core.events.startGame(""); @@ -474,8 +479,13 @@ main.dom.playGame.onclick = function () { main.dom.loadGame.onclick = function() { if (main.core.isset(main.core.musicStatus) && main.core.musicStatus.startDirectly - && main.core.musicStatus.bgmStatus && main.core.musicStatus.playingBgm==null) - main.core.playBgm(main.core.bgms[0]); + && main.core.musicStatus.bgmStatus) { + if (main.core.musicStatus.playingBgm==null + || core.material.bgms[main.core.musicStatus.playingBgm].paused) { + main.core.musicStatus.playingBgm=null; + main.core.playBgm(main.core.bgms[0]); + } + } main.core.load(); } @@ -484,8 +494,13 @@ main.dom.loadGame.onclick = function() { main.dom.replayGame.onclick = function () { if (main.core.isset(main.core.musicStatus) && main.core.musicStatus.startDirectly - && main.core.musicStatus.bgmStatus && main.core.musicStatus.playingBgm==null) - main.core.playBgm(main.core.bgms[0]); + && main.core.musicStatus.bgmStatus) { + if (main.core.musicStatus.playingBgm==null + || core.material.bgms[main.core.musicStatus.playingBgm].paused) { + main.core.musicStatus.playingBgm=null; + main.core.playBgm(main.core.bgms[0]); + } + } core.readFile(function (obj) { if (obj.name!=core.firstData.name) {