danoniplus 44.5.26 → 44.5.28

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/09/25
+ * Revised : 2026/10/07
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 44.5.26`;
-const g_revisedDate = `2026/09/25`;
+const g_version = `Ver 44.5.28`;
+const g_revisedDate = `2026/10/07`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -619,7 +619,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) {
@@ -682,7 +682,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 !== `----`);
 
 		// 配列なら[]で囲む、オブジェクトなら{}で囲む
@@ -5237,6 +5238,9 @@ const titleInit = (_initFlg = false) => {
 	// 設定画面位置初期化
 	g_settings.settingWindowNum = 0;
 
+	// リトライフラグ初期化
+	g_stateObj.retryFlg = false;
+
 	// タイトルアニメーション用フレーム初期化、ループカウンター設定
 	g_animationData.forEach(sprite => {
 		g_scoreObj[`${sprite}TitleFrameNum`] = 0;
@@ -6021,7 +6025,7 @@ const changeMSelect = (_num, _initFlg = false) => {
 		if (j === 0) {
 		} else {
 			document.getElementById(`btnMusicSelect${j}`).style.fontSize =
-				getFontSize2(g_headerObj.musicTitles[idx].slice(0, limitedMLength), g_btnWidth(1 / 2));
+				wUnit(getFontSize2(g_headerObj.musicTitles[idx].slice(0, limitedMLength), g_btnWidth(1 / 2)));
 			document.getElementById(`btnMusicSelect${j}`).innerHTML =
 				`${g_headerObj.musicTitles[idx].slice(0, limitedMLength)}${g_headerObj.musicTitles[idx].length > limitedMLength ? '...' : ''}<br>` +
 				`<span style="font-size:0.7em;line-height:9px"> / ${g_headerObj.artistNames[idx]}</span>`;
@@ -10120,7 +10124,7 @@ const loadingScoreInit = async () => {
 	pushArrows(g_scoreObj, speedOnFrame, arrivalFrame);
 
 	// メインに入る前の最終初期化処理
-	getArrowSettings();
+	getArrowSettings(g_stateObj.retryFlg);
 
 	// ユーザカスタムイベント
 	g_customJsObj.loading.forEach(func => func());
@@ -11762,16 +11766,28 @@ const invertSpecificTransforms = (cssString, exceptList = []) => {
 	});
 }
 
+// リトライ時にプレイ用キー割り当てを復元するための退避 (初回保存でメモリが既定値へ戻るため)
+let g_keyCtrlBackup = {};
+
 /**
  * メイン画面前の初期化処理
  */
-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];
 
@@ -12122,7 +12138,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`;
@@ -12144,6 +12166,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`]);
 		}
 
@@ -12675,6 +12698,7 @@ const mainInit = () => {
 			} else {
 				// その他の環境では単にRetryに対応するキーのみで適用
 				clearWindow();
+				g_stateObj.retryFlg = true;
 				musicAfterLoaded();
 			}
 
@@ -15184,7 +15208,10 @@ const resultInit = () => {
 	makeLinkButton();
 	multiAppend(divRoot,
 		// リトライ
-		resetCommonBtn(`btnRetry`, g_lblNameObj.b_retry, g_lblPosObj.btnRsRetry, loadMusic, g_cssObj.button_Reset),
+		resetCommonBtn(`btnRetry`, g_lblNameObj.b_retry, g_lblPosObj.btnRsRetry, () => {
+			g_stateObj.retryFlg = true;
+			loadMusic();
+		}, g_cssObj.button_Reset),
 
 		createCss2Button(`btnCopyImage`, g_emojiObj.camera, () => true,
 			Object.assign(g_lblPosObj.btnRsCopyImage, {

package/package.json

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