danoniplus 49.6.5 → 49.6.6

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/09/29
+ * Revised : 2026/10/07
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 49.6.5`;
-const g_revisedDate = `2026/09/29`;
+const g_version = `Ver 49.6.6`;
+const g_revisedDate = `2026/10/07`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -629,7 +629,7 @@ const formatObject = (_obj, _indent = 0, { colorFmt = true, rootKey = `` } = {})
 			if (_list.findIndex(val => val === rootKey) >= 0) {
 				let result = `[`;
 				for (let j = 0; j < _obj.length; j += _numOfSet) {
-					result += `<br>${nestedIndent}${_obj[j]}: ${_obj[j + 1]}`;
+					result += `<br>${nestedIndent}${escapeHtml(_obj[j])}: ${escapeHtml(_obj[j + 1])}`;
 					for (let k = 0; k < _numOfSet - 2; k++) {
 						const idx = j + k + 2;
 						if (idx < _obj.length) {
@@ -692,7 +692,8 @@ const formatObject = (_obj, _indent = 0, { colorFmt = true, rootKey = `` } = {})
 			})
 			: Object.entries(_obj).map(([key, value]) => {
 				const formattedValue = getNextObject(value, rootKey === `` ? key : rootKey);
-				return `<br>${nestedIndent}"${key}": ${formattedValue}`;
+				const formattedKey = colorFmt ? escapeHtml(key) : key;
+				return `<br>${nestedIndent}"${formattedKey}": ${formattedValue}`;
 			})).filter(val => !hasVal(val) || val !== `----`);
 
 		// 配列なら[]で囲む、オブジェクトなら{}で囲む
@@ -12544,12 +12545,15 @@ const musicAfterLoaded = () => new Promise((resolve, reject) => {
 	}
 });
 
+// リトライ時にプレイ用キー割り当てを復元するための退避 (初回保存でメモリが既定値へ戻るため)
+let g_keyCtrlBackup = {};
+
 /**
  * 譜面データの変換処理
  * - 音源データの状態に依存しない部分のみを担う(g_audio非参照)
  * - loadMusic経由(並行フロー)、executeRetry経由(曲中リトライ)の両方から呼ばれる
  */
-const prepareScoreData = () => {
+const prepareScoreData = (_retryFlg = false) => {
 
 	const tkObj = getKeyInfo();
 	const [keyCtrlPtn, keyNum] = [tkObj.keyCtrlPtn, tkObj.keyNum];
@@ -12694,7 +12698,7 @@ const prepareScoreData = () => {
 	pushArrows(g_scoreObj, speedOnFrame, arrivalFrame);
 
 	// メインに入る前の最終初期化処理
-	getArrowSettings();
+	getArrowSettings(_retryFlg);
 
 	// ユーザカスタムイベント
 	safeExecuteCustomHooks(`g_customJsObj.loading`, g_customJsObj.loading);
@@ -14391,13 +14395,22 @@ const invertSpecificTransforms = (cssString, exceptList = []) => {
 /**
  * メイン画面前の初期化処理
  */
-const getArrowSettings = () => {
+const getArrowSettings = (_retryFlg = false) => {
 
 	g_attrObj = {};
 	const tkObj = getKeyInfo();
 	const [keyCtrlPtn, keyNum, posMax, divideCnt] =
 		[tkObj.keyCtrlPtn, tkObj.keyNum, tkObj.posMax, tkObj.divideCnt];
 
+	// 新しいプレイ開始時は前回プレイの退避を破棄 (リトライ時は保持して復元に使う)
+	if (!_retryFlg) {
+		g_keyCtrlBackup = {};
+	}
+	// リトライ時: 退避済みのキー割り当てをメモリへ戻してから以降の処理を行う
+	const restoredFlg = _retryFlg && g_keyCtrlBackup[keyCtrlPtn] !== undefined;
+	if (restoredFlg) {
+		g_keyObj[`keyCtrl${keyCtrlPtn}`] = structuredClone(g_keyCtrlBackup[keyCtrlPtn]);
+	}
 	g_keyCopyLists.simpleDef.forEach(header => updateKeyInfo(header, keyCtrlPtn));
 	g_headerObj.tuning = g_headerObj.creatorNames[g_stateObj.scoreId];
 
@@ -14787,7 +14800,13 @@ const getArrowSettings = () => {
 	}
 
 	// リバース、キーコンフィグなどをローカルストレージへ保存（Data Save: ON かつ別キーモードで無い場合) 
-	if (g_stateObj.dataSaveFlg && !hasVal(g_keyObj[`transKey${keyCtrlPtn}`])) {
+	if (_retryFlg) {
+		// リトライ時は初回に保存済みのため再保存しない (prevKey等も触らない)
+		// 復元したキー割り当ては、初回保存時と同様にメモリ上を既定値へ戻す
+		if (restoredFlg) {
+			g_keyObj[`keyCtrl${keyCtrlPtn}`] = structuredClone(g_keyObj[`keyCtrl${keyCtrlPtn}d`]);
+		}
+	} else if (g_stateObj.dataSaveFlg && !hasVal(g_keyObj[`transKey${keyCtrlPtn}`])) {
 
 		// 次回キーコンフィグ画面へ戻ったとき、保存済みキーコンフィグ設定が表示されるようにする
 		g_keyObj.prevKey = `Dummy`;
@@ -14809,6 +14828,7 @@ const getArrowSettings = () => {
 		storageObj[`keyCtrl${addKey}`] = setKeyCtrl(g_localKeyStorage, keyNum, keyCtrlPtn);
 		if (g_keyObj.currentPtn !== -1) {
 			storageObj[`keyCtrlPtn${addKey}`] = g_keyObj.currentPtn;
+			g_keyCtrlBackup[keyCtrlPtn] = structuredClone(g_keyObj[`keyCtrl${keyCtrlPtn}`]);
 			g_keyObj[`keyCtrl${keyCtrlPtn}`] = structuredClone(g_keyObj[`keyCtrl${keyCtrlPtn}d`]);
 		}
 
@@ -16680,7 +16700,7 @@ const executeRetry = async (_logLabel = `Retry`) => {
 		clearWindow(`Main`);
 		await musicAfterLoaded();
 		await loadChartFile();
-		prepareScoreData();
+		prepareScoreData(true);
 		mainInit();
 	} catch (e) {
 		console.warn(`${_logLabel} audio load error: ${e}`);

package/package.json

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