danoniplus 42.1.0 → 42.1.2

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.2`;
+const g_revisedDate = `2025/06/08`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -1206,6 +1206,7 @@ const reviseCssText = _str => {
 /*-----------------------------------------------------------*/
 /* 色・グラデーション設定                                      */
 /*-----------------------------------------------------------*/
+const g_ctx = document.createElement(`canvas`).getContext(`2d`);
 
 /**
  * 対象のカラーコードが明暗どちらかを判定 (true: 明色, false: 暗色)
@@ -1225,9 +1226,8 @@ const checkLightOrDark = _colorStr => {
  * @returns {string}
  */
 const colorNameToCode = _color => {
-	const cxt = document.createElement(`canvas`).getContext(`2d`);
-	cxt.fillStyle = _color;
-	return cxt.fillStyle;
+	g_ctx.fillStyle = _color;
+	return g_ctx.fillStyle;
 };
 
 /**
@@ -1365,11 +1365,24 @@ const getBasicFont = (_priorityFont = ``) =>
  * @returns {number}
  */
 const getStrWidth = (_str, _fontsize, _font) => {
-	const ctx = document.createElement(`canvas`).getContext(`2d`);
-	ctx.font = `${wUnit(_fontsize)} ${_font}`;
-	return ctx.measureText(unEscapeHtml(_str)).width;
+	g_ctx.font = `${wUnit(_fontsize)} ${_font}`;
+	return g_ctx.measureText(unEscapeHtml(_str)).width;
 };
 
+/**
+ * Canvas上で使用する絵文字を取得
+ * - HTMLのdiv要素に絵文字を設定することで、Canvas上で使用できるようにする
+ * @param {string} _str 
+ * @returns {string}
+ */
+const getEmojiForCanvas = _str => {
+	const div = document.createElement(`div`);
+	div.innerHTML = _str;
+	const result = div.innerHTML;
+	div.remove();
+	return result;
+}
+
 /**
  * 指定した横幅に合ったフォントサイズを取得
  * @param {string} _str 
@@ -3016,13 +3029,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}`;
 }
 
 /**
@@ -13985,7 +14007,7 @@ const resultInit = () => {
 			{ x: 280, dy: -15, hy: 0, siz: 20, color: `#999999`, align: C_ALIGN_CENTER });
 		drawText(unEscapeHtml(mTitleForView[0]), { hy: 1 });
 		drawText(unEscapeHtml(mTitleForView[1]), { hy: 2 });
-		drawText(`📝 ${unEscapeHtml(g_headerObj.tuning)} / 🎵 ${unEscapeHtml(artistName)}`, { hy: mTitleForView[1] !== `` ? 3 : 2, siz: 12 });
+		drawText(`${getEmojiForCanvas(`📝`)} ${unEscapeHtml(g_headerObj.tuning)} / ${getEmojiForCanvas(`🎵`)} ${unEscapeHtml(artistName)}`, { hy: mTitleForView[1] !== `` ? 3 : 2, siz: 12 });
 		drawText(unEscapeHtml(difDataForImage), { hy: 4 });
 
 		if (playStyleData.length > 60) {
@@ -14126,7 +14148,7 @@ const resultInit = () => {
 		// リトライ
 		resetCommonBtn(`btnRetry`, g_lblNameObj.b_retry, g_lblPosObj.btnRsRetry, loadMusic, g_cssObj.button_Reset),
 
-		createCss2Button(`btnCopyImage`, `📷`, () => true,
+		createCss2Button(`btnCopyImage`, `📷`, () => true,
 			Object.assign(g_lblPosObj.btnRsCopyImage, {
 				resetFunc: () => copyResultImageData(g_msgInfoObj.I_0001),
 			}), g_cssObj.button_Default_NoColor),

package/package.json

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