danoniplus 41.4.1 → 41.4.3

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2025/05/17
+ * Revised : 2025/06/18
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 41.4.1`;
-const g_revisedDate = `2025/05/17`;
+const g_version = `Ver 41.4.3`;
+const g_revisedDate = `2025/06/18`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -5405,11 +5405,13 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 	const FADE_INTERVAL_MS = 100;
 	const FADE_DELAY_MS = 500;
 
+	const currentIdx = g_headerObj.musicIdxList[g_settings.musicIdxNum];
 	const musicUrl = getMusicUrl(g_headerObj.viewLists[0]);
 	const url = getFullMusicUrl(musicUrl);
 	const encodeFlg = listMatching(musicUrl, [`.js`, `.txt`], { suffix: `$` });
-	const musicStart = g_headerObj.musicStarts?.[g_headerObj.musicIdxList[g_settings.musicIdxNum]] ?? 0;
-	const musicEnd = g_headerObj.musicEnds?.[g_headerObj.musicIdxList[g_settings.musicIdxNum]] ?? 0;
+	const musicStart = g_headerObj.musicStarts?.[currentIdx] ?? 0;
+	const musicEnd = g_headerObj.musicEnds?.[currentIdx] ?? 0;
+	const isTitle = () => g_currentPage === `title`;
 
 	/**
 	 * BGMのフェードアウトとシーク
@@ -5417,7 +5419,7 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 	const fadeOutAndSeek = () => {
 		let volume = g_audio.volume;
 		const fadeInterval = setInterval(() => {
-			if (volume > FADE_STEP && g_currentPage === `title`) {
+			if (volume > FADE_STEP && isTitle()) {
 				volume -= FADE_STEP;
 				g_audio.volume = Math.max(volume, 0);
 			} else {
@@ -5427,7 +5429,7 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 				g_audio.currentTime = musicStart;
 
 				// フェードイン開始
-				if (g_currentPage === `title`) {
+				if (isTitle()) {
 					setTimeout(() => {
 						fadeIn();
 						if (encodeFlg) {
@@ -5454,13 +5456,20 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 		let volume = 0;
 		g_audio.play();
 		const fadeInterval = setInterval(() => {
-			if (volume < g_stateObj.bgmVolume / 100 && g_currentPage === `title`) {
+			if (volume < g_stateObj.bgmVolume / 100 && isTitle()) {
 				volume += FADE_STEP;
 				g_audio.volume = Math.min(volume, 1);
 			} else {
 				clearInterval(fadeInterval);
 				g_stateObj.bgmFadeIn = null;
 			}
+
+			// フェードイン中に楽曲が変更された場合は停止
+			if (currentIdx !== g_headerObj.musicIdxList[g_settings.musicIdxNum]) {
+				pauseBGM();
+				clearInterval(fadeInterval);
+				g_stateObj.bgmFadeIn = null;
+			}
 		}, FADE_INTERVAL_MS);
 		g_stateObj.bgmFadeIn = fadeInterval;
 	};
@@ -6169,7 +6178,7 @@ const optionInit = () => {
  * @returns {string}
  */
 const getMusicInfoView = () => {
-	const idx = g_headerObj.musicNos[g_stateObj.scoreId];
+	const idx = g_headerObj.musicNos[g_stateObj.scoreId] || 0;
 	let text = `♪` + (g_headerObj.musicSelectUse ? `${unEscapeHtml(g_headerObj.musicTitles[idx])} / ` : ``) +
 		`BPM: ${g_headerObj.bpms[idx]}`;
 	if (!g_headerObj.musicSelectUse && g_headerObj.bpms[idx] === `----`) {
@@ -11115,7 +11124,7 @@ const getArrowSettings = () => {
 	g_stateObj.layerNum = Math.max(g_stateObj.layerNum, Math.ceil((Math.max(...g_workObj.dividePos) + 1) / 2) * 2);
 
 	// g_workObjの不要なプロパティを削除
-	if (g_stateObj.dummyId === ``) {
+	if (g_stateObj.dummyId === `` && g_autoPlaysBase.includes(g_stateObj.autoPlay)) {
 		Object.keys(g_workObj).filter(key => key.startsWith(`dummy`) || key.startsWith(`mkDummy`))
 			.forEach(key => delete g_workObj[key]);
 	}
@@ -11411,7 +11420,8 @@ const mainInit = () => {
 	createMultipleSprite(`maskSprite`, g_scoreObj.maskMaxDepth, { x: g_workObj.backX });
 
 	// カラー・モーションを適用するオブジェクトの種類
-	const objList = (g_stateObj.dummyId === `` ? [``] : [`dummy`, ``]);
+	const objList = (g_stateObj.dummyId === `` && g_autoPlaysBase.includes(g_stateObj.autoPlay)
+		? [``] : [`dummy`, ``]);
 
 	// 背景・マスクモーション、スキン変更(0フレーム指定)
 	if (g_scoreObj.frameNum === 0) {

package/package.json

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