danoniplus 41.2.1 → 41.3.1

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2025/05/09
+ * Revised : 2025/05/15
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 41.2.1`;
-const g_revisedDate = `2025/05/09`;
+const g_version = `Ver 41.3.1`;
+const g_revisedDate = `2025/05/15`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -2824,6 +2824,11 @@ const loadLocalStorage = (_musicId = ``) => {
 	if (g_langStorage.safeMode === undefined) {
 		g_langStorage.safeMode = C_FLG_OFF;
 	}
+	if (g_langStorage.bgmVolume === undefined) {
+		g_langStorage.bgmVolume = 50;
+	}
+	g_stateObj.bgmVolume = g_langStorage.bgmVolume;
+	g_settings.bgmVolumeNum = g_settings.volumes.findIndex(val => val === g_stateObj.bgmVolume);
 	Object.assign(g_msgInfoObj, g_lang_msgInfoObj[g_localeObj.val]);
 	Object.assign(g_kCd, g_lang_kCd[g_localeObj.val]);
 
@@ -3443,55 +3448,60 @@ const headerConvert = _dosObj => {
 	}
 
 	// 曲名
-	obj.musicTitles = [];
-	obj.musicTitlesForView = [];
-	obj.artistNames = [];
-	obj.artistUrls = [];
-	obj.musicNos = [];
-	obj.bpms = [];
+	obj.musicTitles = [`musicName`];
+	obj.musicTitlesForView = [[`musicName`]];
+	obj.artistNames = [``];
+	obj.artistUrls = [``];
+	obj.bpms = [`----`];
+	obj.musicNos = hasVal(_dosObj.musicNo)
+		? splitLF2(_dosObj.musicNo).map(Number).map(val => isNaN(val) ? 0 : val)
+		: fillArray(_dosObj.difData?.split(`$`).length ?? 1);
 
 	const dosMusicTitle = getHeader(_dosObj, `musicTitle`);
+	let alternativeTitle;
 	if (hasVal(dosMusicTitle)) {
 		const musicData = splitLF2(dosMusicTitle);
 
-		if (hasVal(_dosObj.musicNo)) {
-			obj.musicNos = splitLF2(_dosObj.musicNo).map(val => Number(val));
-		}
-
-		for (let j = 0; j < musicData.length; j++) {
+		const lastIdx = Math.max(...obj.musicNos, musicData.length - 1);
+		for (let j = 0; j <= lastIdx; j++) {
 			const musics = splitComma(musicData[j]);
 
-			if (obj.musicNos.length >= j) {
-				obj.musicTitles[j] = escapeHtml(getMusicNameSimple(musics[0]));
-				obj.musicTitlesForView[j] = escapeHtmlForArray(getMusicNameMultiLine(musics[0]));
-				obj.artistNames[j] = escapeHtml(musics[1] || obj.artistNames[0] || ``);
-				obj.artistUrls[j] = musics[2] || obj.artistUrls[0] || ``;
-				obj.bpms[j] = musics[4] || obj.bpms[0] || `----`;
-			}
-
-			// 選曲ではなく、単一作品用の項目としての管理変数を定義
+			obj.musicTitles[j] = hasVal(musics[0])
+				? escapeHtml(getMusicNameSimple(musics[0]))
+				: obj.musicTitles[0];
+			obj.musicTitlesForView[j] = hasVal(musics[0])
+				? escapeHtmlForArray(getMusicNameMultiLine(musics[0]))
+				: obj.musicTitlesForView[0];
+			obj.artistNames[j] = hasVal(musics[1])
+				? escapeHtml(musics[1])
+				: obj.artistNames[0];
+			obj.artistUrls[j] = musics[2] || obj.artistUrls[0];
+			obj.bpms[j] = musics[4] || obj.bpms[0];
+
+			// 代替タイトル名
 			if (j === 0) {
-				obj.musicTitle = obj.musicTitles[0];
-				obj.musicTitleForView = obj.musicTitlesForView[0];
-				obj.artistName = obj.artistNames[0];
-				if (obj.artistName === ``) {
-					makeWarningWindow(g_msgInfoObj.E_0011);
-					obj.artistName = `artistName`;
-				}
-				obj.artistUrl = obj.artistUrls[0];
-				if (hasVal(musics[3])) {
-					obj.musicTitles[0] = escapeHtml(getMusicNameSimple(musics[3]));
-					obj.musicTitlesForView[0] = escapeHtmlForArray(getMusicNameMultiLine(musics[3]));
-				}
+				alternativeTitle = musics[3];
 			}
 		}
 
 	} else {
 		makeWarningWindow(g_msgInfoObj.E_0012);
-		obj.musicTitle = `musicName`;
-		obj.musicTitleForView = [`musicName`];
+	}
+
+	// 単一作品用の項目としての管理変数
+	obj.musicTitle = obj.musicTitles[0];
+	obj.musicTitleForView = obj.musicTitlesForView[0];
+	obj.artistName = obj.artistNames[0];
+	if (obj.artistName === ``) {
+		makeWarningWindow(g_msgInfoObj.E_0011);
 		obj.artistName = `artistName`;
-		obj.artistUrl = ``;
+	}
+	obj.artistUrl = obj.artistUrls[0];
+
+	// 代替タイトル名は曲名定義の後に設定する（複数曲を束ねる名前であり、曲名ではないため）
+	if (hasVal(alternativeTitle)) {
+		obj.musicTitles[0] = escapeHtml(getMusicNameSimple(alternativeTitle));
+		obj.musicTitlesForView[0] = escapeHtmlForArray(getMusicNameMultiLine(alternativeTitle));
 	}
 
 	// 選曲機能の利用有無
@@ -3614,9 +3624,6 @@ const headerConvert = _dosObj => {
 	obj.viewLists = [...Array(obj.keyLabels.length).keys()];
 	obj.keyLists = keyLists.sort((a, b) => parseInt(a) - parseInt(b));
 	obj.undefinedKeyLists = obj.keyLists.filter(key => g_keyObj[`${g_keyObj.defaultProp}${key}_0`] === undefined);
-	if (obj.musicNos.length === 0) {
-		obj.musicNos = fillArray(obj.keyLabels.length);
-	}
 
 	// 楽曲別のグループ化設定（選曲モードのみ）
 	if (hasVal(_dosObj.musicGroup)) {
@@ -4997,6 +5004,8 @@ const titleInit = (_initFlg = false) => {
 					pauseBGM();
 					g_handler.removeListener(wheelHandler);
 					g_keyObj.prevKey = `Dummy${g_settings.musicIdxNum}`;
+					g_langStorage.bgmVolume = g_stateObj.bgmVolume;
+					localStorage.setItem(`danoni-locale`, JSON.stringify(g_langStorage));
 				}, Object.assign({
 					resetFunc: () => optionInit(),
 				}, g_lblPosObj.btnStart_music), g_cssObj.button_Tweet),
@@ -5478,19 +5487,20 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 		}
 	};
 
+	const musicPlayCheck = () => _currentLoopNum !== g_settings.musicLoopNum || g_currentPage !== `title`;
 	if (encodeFlg) {
 		try {
 			// base64エンコードは読込に時間が掛かるため、曲変更時のみ読込
 			if (!hasVal(g_musicdata) || Math.abs(_num) % g_headerObj.musicIdxList.length !== 0) {
 				await loadScript2(url);
 				musicInit();
-				if (_currentLoopNum !== g_settings.musicLoopNum) {
+				if (musicPlayCheck()) {
 					return;
 				}
 				const tmpAudio = new AudioPlayer();
 				const array = Uint8Array.from(atob(g_musicdata), v => v.charCodeAt(0));
 				await tmpAudio.init(array.buffer);
-				if (_currentLoopNum !== g_settings.musicLoopNum) {
+				if (musicPlayCheck()) {
 					tmpAudio.close();
 					return;
 				}
@@ -5513,7 +5523,7 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 		g_audio.volume = g_stateObj.bgmVolume / 100;
 		const loadedMeta = g_handler.addListener(g_audio, `loadedmetadata`, () => {
 			g_handler.removeListener(loadedMeta);
-			if (_currentLoopNum !== g_settings.musicLoopNum) {
+			if (musicPlayCheck()) {
 				return;
 			}
 			g_audio.currentTime = musicStart;

package/package.json

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