danoniplus 43.6.2 → 43.6.4

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/01/25
+ * Revised : 2026/01/31
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 43.6.2`;
-const g_revisedDate = `2026/01/25`;
+const g_version = `Ver 43.6.4`;
+const g_revisedDate = `2026/01/31`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -223,7 +223,7 @@ const g_wordObj = {
 
 // オーディオ設定・タイマー管理
 let g_audio = new Audio();
-let g_audioForMS = new Audio();
+let g_audioForMS = null;
 let g_timeoutEvtId = 0;
 let g_timeoutEvtTitleId = 0;
 let g_timeoutEvtResultId = 0;
@@ -5177,7 +5177,9 @@ const titleInit = (_initFlg = false) => {
 		const setBGMVolume = (_num = 1) => {
 			g_settings.bgmVolumeNum = nextPos(g_settings.bgmVolumeNum, _num, g_settings.volumes.length);
 			g_stateObj.bgmVolume = g_settings.volumes[g_settings.bgmVolumeNum];
-			g_audioForMS.volume = g_stateObj.bgmVolume / 100;
+			if (g_audioForMS) {
+				g_audioForMS.volume = g_stateObj.bgmVolume / 100;
+			}
 			btnBgmVolume.textContent = `${g_stateObj.bgmVolume}${g_lblNameObj.percent}`;
 		};
 
@@ -5193,7 +5195,6 @@ const titleInit = (_initFlg = false) => {
 			createCss2Button(`btnStart`,
 				`>`, () => {
 					clearTimeout(g_timeoutEvtTitleId);
-					pauseBGM();
 					g_handler.removeListener(wheelHandler);
 					g_keyObj.prevKey = `Dummy${g_settings.musicIdxNum}`;
 					g_langStorage.bgmVolume = g_stateObj.bgmVolume;
@@ -5257,7 +5258,9 @@ const titleInit = (_initFlg = false) => {
 
 		// 初期表示用 (2秒後に選曲画面を表示)
 		if (_initFlg && !g_headerObj.customTitleUse) {
-			g_audioForMS.muted = true;
+			if (g_audioForMS) {
+				g_audioForMS.muted = true;
+			}
 			const mSelectTitleSprite = createEmptySprite(divRoot, `mSelectTitleSprite`,
 				g_windowObj.mSelectTitleSprite, g_cssObj.settings_DifSelector);
 			multiAppend(mSelectTitleSprite,
@@ -5276,7 +5279,7 @@ const titleInit = (_initFlg = false) => {
 				if (_opacity <= 0) {
 					clearTimeout(fadeOpacity);
 					mSelectTitleSprite.style.display = C_DIS_NONE;
-					if (!g_stateObj.bgmMuteFlg) {
+					if (!g_stateObj.bgmMuteFlg && g_audioForMS) {
 						g_audioForMS.muted = false;
 						g_audioForMS.currentTime = g_headerObj.musicStarts[g_headerObj.musicIdxList[g_settings.musicIdxNum]] ?? 0;
 						if (g_audioForMS instanceof AudioPlayer) {
@@ -5757,7 +5760,7 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 
 	/**
 	 * BGMのループ処理 (base64エンコード時用)
-	 * - base64エンコード時はtimeupdateイベントが発火しないため、setIntervalで時間を取得する
+	 * - base64エンコード時はtimeupdateイベントが発火しないため、監視しながらループ処理を行う
 	 */
 	const repeatBGM = () => {
 		const numAtStart = g_settings.musicIdxNum;
@@ -5786,22 +5789,36 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 		);
 	};
 
+	/**
+	 * 既存のAudio/AudioPlayerをクローズ
+	 */
+	const closeExistingAudio = () => {
+		if (g_stateObj.bgmTimeupdateEvtId !== null && g_stateObj.bgmTimeupdateEvtId !== undefined) {
+			g_handler.removeListener(g_stateObj.bgmTimeupdateEvtId);
+			g_stateObj.bgmTimeupdateEvtId = null;
+		}
+		if (g_audioForMS instanceof AudioPlayer) {
+			g_musicdata = ``;
+			g_audioForMS.close();
+		}
+	};
+
 	if (encodeFlg) {
 		try {
 			// base64エンコードは読込に時間が掛かるため、曲変更時のみ読込
 			if (!hasVal(g_musicdata) || Math.abs(_num) % g_headerObj.musicIdxList.length !== 0) {
-				if (g_audioForMS instanceof AudioPlayer) {
-					g_audioForMS.close();
-				}
+				closeExistingAudio();
 				await loadScript2(url);
 				musicInit();
 				if (!isTitle()) {
+					g_musicdata = ``;
 					return;
 				}
 				const tmpAudio = new AudioPlayer();
 				const array = Uint8Array.from(atob(g_musicdata), v => v.charCodeAt(0));
 				await tmpAudio.init(array.buffer);
 				if (!isTitle()) {
+					g_musicdata = ``;
 					tmpAudio.close();
 					return;
 				}
@@ -5820,13 +5837,7 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 
 	} else {
 		// 既存の監視を解除し、AudioPlayer を確実にクローズ
-		if (g_stateObj.bgmTimeupdateEvtId) {
-			g_handler.removeListener(g_stateObj.bgmTimeupdateEvtId);
-			g_stateObj.bgmTimeupdateEvtId = null;
-		}
-		if (g_audioForMS instanceof AudioPlayer) {
-			g_audioForMS.close();
-		}
+		closeExistingAudio();
 		g_audioForMS = new Audio();
 		g_audioForMS.src = url;
 		g_audioForMS.autoplay = false;
@@ -6047,6 +6058,7 @@ const setWindowStyle = (_text, _bkColor, _textColor, _align = C_ALIGN_LEFT, { _x
 
 const dataMgtInit = () => {
 	clearWindow(true);
+	pauseBGM();
 	const prevPage = g_currentPage;
 	g_currentPage = `dataMgt`;
 	let selectedKey = g_keyObj.currentKey;
@@ -6278,6 +6290,7 @@ const dataMgtInit = () => {
 
 const preconditionInit = () => {
 	clearWindow(true);
+	pauseBGM();
 	const prevPage = g_currentPage;
 	g_currentPage = `precondition`;
 
@@ -6445,6 +6458,7 @@ const makePlayButton = _func => createCss2Button(`btnPlay`, g_lblNameObj.b_play,
 const optionInit = () => {
 
 	clearWindow(true);
+	pauseBGM();
 	const divRoot = document.getElementById(`divRoot`);
 	g_currentPage = `option`;
 	g_stateObj.filterKeys = ``;
@@ -9594,7 +9608,7 @@ const changeShuffleConfigColor = (_keyCtrlPtn, _vals, _j = -1) => {
 const loadMusic = () => {
 
 	clearWindow(true);
-	g_audioForMS.pause();
+	pauseBGM();
 	g_currentPage = `loading`;
 
 	const musicUrl = getMusicUrl(g_stateObj.scoreId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "danoniplus",
-  "version": "43.6.2",
+  "version": "43.6.4",
   "description": "Dancing☆Onigiri (CW Edition) - Web-based Rhythm Game",
   "main": "./js/danoni_main.js",
   "scripts": {