danoniplus 42.1.0 → 42.1.1

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2025/06/07
+ * Revised : 2025/06/08
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 42.1.0`;
-const g_revisedDate = `2025/06/07`;
+const g_version = `Ver 42.1.1`;
+const g_revisedDate = `2025/06/08`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -3016,13 +3016,22 @@ const getMusicUrl = _scoreId =>
  * @returns {string}
  */
 const getFullMusicUrl = (_musicUrl = ``) => {
-	let url = `${g_rootPath}../${g_headerObj.musicFolder}/${_musicUrl}`;
-	if (_musicUrl.indexOf(C_MRK_CURRENT_DIRECTORY) !== -1) {
-		url = _musicUrl.split(C_MRK_CURRENT_DIRECTORY)[1];
-	} else if (g_headerObj.musicFolder.indexOf(C_MRK_CURRENT_DIRECTORY) !== -1) {
-		url = `${g_headerObj.musicFolder.split(C_MRK_CURRENT_DIRECTORY)[1]}/${_musicUrl}`;
+	let baseMusicUrl = _musicUrl;
+	let baseDir = `../${g_headerObj.musicFolder}/`;
+
+	if (_musicUrl.includes(C_MRK_CURRENT_DIRECTORY)) {
+		// musicUrl, musicFolder両方にカレントパス指定がある場合は、musicUrlの値を優先
+
+	} else if (g_headerObj.musicFolder.includes(C_MRK_CURRENT_DIRECTORY)) {
+		// musicFolderにカレントパス指定がある場合は、ファイル名にmusicFolderの値も含める
+		baseMusicUrl = `${g_headerObj.musicFolder}/${_musicUrl}`;
+	}
+	if (g_headerObj.musicFolder.includes(C_MRK_CURRENT_DIRECTORY)) {
+		// musicFolderにカレントパス指定がある場合は、ディレクトリは指定しない
+		baseDir = ``;
 	}
-	return url;
+	const [musicFile, musicPath] = getFilePath(baseMusicUrl, baseDir);
+	return `${musicPath}${musicFile}`;
 }
 
 /**

package/package.json

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