danoniplus 39.6.1 → 39.7.1

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2025/02/17
+ * Revised : 2025/02/20
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 39.6.1`;
-const g_revisedDate = `2025/02/17`;
+const g_version = `Ver 39.7.1`;
+const g_revisedDate = `2025/02/20`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -457,25 +457,66 @@ const viewKeyStorage = (_name, _key = ``) => {
  * オブジェクトのネスト表示処理
  * @param {Object} _obj 
  * @param {Number} _indent 
- * @param {WeakSet} _seen
+ * @param {WeakSet} [seen=new WeakSet()]
+ * @param {boolean} [colorFmt=true]
+ * @param {string} [key='']
  * @returns {string}
  */
-const formatObject = (_obj, _indent = 0, _seen = new WeakSet()) => {
+const formatObject = (_obj, _indent = 0, { seen = new WeakSet(), colorFmt = true, key } = {}) => {
 	if (_obj === null || typeof _obj !== 'object') {
 		return JSON.stringify(_obj);
 	}
-	if (_seen.has(_obj)) {
+	if (seen.has(_obj)) {
 		return '[Circular]';
 	}
-	_seen.add(_obj);
+	seen.add(_obj);
 	const baseIndent = getIndent(_indent);
 	const nestedIndent = getIndent(_indent + 1);
+
+	// カラーコード、対応キーの色付け処理
+	const colorCodePattern = /^#(?:[A-Fa-f0-9]{3}|[A-Fa-f0-9]{6}(?:[A-Fa-f0-9]{2})?|[A-Fa-f0-9]{4})$/;
+	const formatValue = _value => {
+		if (colorFmt) {
+			if (typeof _value === 'string' && colorCodePattern.test(_value)) {
+				return `"<span style="color:${_value}">◆</span>${_value}"`;
+			}
+			if (Array.isArray(_value)) {
+				let formattedArray = _value.map(item => formatValue(item));
+				if (key.startsWith(`keyCtrl`)) {
+					formattedArray = formattedArray.filter(item => item !== `0`)
+						.map(item => g_kCd[item] ? `${item}|<span style="color:#ffff66">${g_kCd[item]}</span>` : item);
+				}
+				return `[${formattedArray.join(`, `)}]`;
+			}
+		}
+		return JSON.stringify(_value);
+	};
+
+	// 二次元配列の整形処理
+	if (Array.isArray(_obj)) {
+		if (_obj.length === 0) {
+			return '[]';
+		}
+		const isArrayOfArrays = _obj.every(item => Array.isArray(item));
+		const formattedArray = _obj
+			.map(item => isArrayOfArrays
+				? `${nestedIndent}${formatValue(item)}`
+				: formatValue(item)
+			).join(isArrayOfArrays ? `,<br>` : `, `);
+
+		return `[${isArrayOfArrays ? `<br>` : ``}${formattedArray}${isArrayOfArrays ? `<br>${baseIndent}` : ''}]`;
+	}
+
+	// オブジェクトのネスト整形処理
 	const formattedEntries = Object.entries(_obj)
 		.map(([key, value]) => {
-			const isNestedObject = typeof value === 'object' && value !== null && !Array.isArray(value);
-			const formattedValue = isNestedObject ? formatObject(value, _indent + 1, _seen) : JSON.stringify(value);
+			const isNestedObject = typeof value === 'object' && value !== null;
+			const formattedValue = isNestedObject
+				? formatObject(value, _indent + 1, { seen, colorFmt, key })
+				: formatValue(value);
 			return `<br>${nestedIndent}"${key}": ${formattedValue}`;
 		}).join(`,`);
+
 	return `{${formattedEntries}<br>${baseIndent}}`;
 }
 
@@ -4790,7 +4831,7 @@ const dataMgtInit = () => {
 	);
 
 	// 各ボタン用のスプライトを作成
-	const optionsprite = createEmptySprite(divRoot, `optionsprite`, g_windowObj.optionSprite);
+	const optionsprite = createEmptySprite(divRoot, `optionsprite`, g_windowObj.dataSprite);
 
 	let reloadFlg = false;
 	const list = [C_FLG_OFF, C_FLG_ON];

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2025/02/16 (v39.6.0)
+ * Revised : 2025/02/20 (v39.7.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -193,6 +193,7 @@ const getScMsg = {
 const updateWindowSiz = () => {
     Object.assign(g_windowObj, {
         optionSprite: { x: (g_sWidth - 450) / 2, y: 65, w: 450, h: 325 },
+        dataSprite: { x: (g_sWidth - Math.max(g_sWidth - 100, 450)) / 2, y: 65, w: Math.max(g_sWidth - 100, 450), h: 325 },
         difList: { x: 165, y: 60, w: 280, h: 270 + g_sHeight - 500, overflow: C_DIS_AUTO, pointerEvents: C_DIS_AUTO },
         difCover: { x: 20, y: 60, w: 145, h: 270 + g_sHeight - 500, opacity: 0.95, pointerEvents: C_DIS_AUTO },
         difFilter: { x: 0, y: 66, w: 140, h: 204 + g_sHeight - 500, overflow: C_DIS_AUTO, pointerEvents: C_DIS_AUTO },
@@ -258,12 +259,12 @@ const updateWindowSiz = () => {
             x: g_btnX(2 / 3), y: g_sHeight - 100, w: g_btnWidth(1 / 3), h: g_limitObj.btnHeight,
         },
         lblWorkDataView: {
-            x: g_btnX(5 / 12), y: 100, w: g_btnWidth(1 / 2), h: g_sHeight / 4, siz: 12, align: C_ALIGN_LEFT,
+            x: g_btnX(1 / 3) + 10, y: 100, w: g_btnWidth(7 / 12), h: g_sHeight / 4, siz: 12, align: C_ALIGN_LEFT,
             overflow: C_DIS_AUTO, background: `#222222`, color: `#cccccc`,
             whiteSpace: `nowrap`,
         },
         lblKeyDataView: {
-            x: g_btnX(5 / 12), y: 100 + g_sHeight / 4 + 10, w: g_btnWidth(1 / 2), h: g_sHeight / 3 - 10, siz: 12, align: C_ALIGN_LEFT,
+            x: g_btnX(1 / 3) + 10, y: 100 + g_sHeight / 4 + 10, w: g_btnWidth(7 / 12), h: g_sHeight / 3 - 10, siz: 12, align: C_ALIGN_LEFT,
             overflow: C_DIS_AUTO, background: `#222222`, color: `#cccccc`,
             whiteSpace: `nowrap`,
         },

package/package.json

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