danoniplus 47.6.4 → 48.1.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/05/15
+ * Revised : 2026/05/20
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 47.6.4`;
-const g_revisedDate = `2026/05/15`;
+const g_version = `Ver 48.1.0`;
+const g_revisedDate = `2026/05/20`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -1809,6 +1809,7 @@ const g_handler = (() => {
 			if (key in events) {
 				const e = events[key];
 				e.target.removeEventListener(e.type, e.listener, e.capture);
+				delete events[key];
 			}
 		}
 	};
@@ -2008,6 +2009,7 @@ const makeBgCanvas = (_ctx, { w = g_sWidth, h = g_sHeight } = {}) => {
  * @param {string} [_customDisplayName=''] 画面名(メイン画面: 'Main', それ以外: 空)
  */
 const clearWindow = (_redrawFlg = false, _customDisplayName = ``) => {
+	closeDisplayPreview();
 	resetKeyControl();
 	resetTransform();
 	resetXY();
@@ -6924,7 +6926,7 @@ const commonSettingBtn = _labelName => {
 		// キーコンフィグ画面へ移動
 		createCss2Button(`btnKeyConfig`, g_lblNameObj.b_keyConfig, () => true, {
 			...g_lblPosObj.btnKeyConfig,
-			animationName: (g_initialFlg ? `` : `smallToNormalY`), resetFunc: () => keyConfigInit(`Main`),
+			animationName: (g_initialFlg ? `` : `smallToNormalY`), resetFunc: () => keyConfigInit(`Main`, true),
 		}, g_cssObj.button_Setting),
 
 		// プレイ開始
@@ -7006,7 +7008,7 @@ const updateSettingSummary = () => {
 	const estimatedHighscoreCondition = g_stateObj.dataSaveFlg && (g_stateObj.autoPlay !== C_FLG_ALL && g_headerObj.playbackRate === 1 && g_stateObj.fadein < 10 &&
 		(g_stateObj.shuffle === C_FLG_OFF || (g_stateObj.shuffle.endsWith(`Mirror`) && orgShuffleFlg)));
 
-	document.getElementById(`lblSummaryDifInfo`).innerHTML = settingData.difData + `${estimatedHighscoreCondition ? '' : ` | <span class="common_kita common_bold">No Records</span>`}`;
+	document.getElementById(`lblSummaryDifInfo`).innerHTML = settingData.difData + `${estimatedHighscoreCondition ? '' : ` | <span class="common_auto common_bold">No Records</span>`}`;
 	document.getElementById(`lblSummaryPlaystyleInfo`).textContent = settingData.playStyleData + `${g_stateObj.excessive === C_FLG_ON ? ' | Excessive' : ''}`;
 	document.getElementById(`lblSummaryDisplayInfo`).textContent = settingData.displayData;
 	document.getElementById(`lblSummaryDisplay2Info`).textContent = settingData.display2Data;
@@ -7086,8 +7088,8 @@ const setSpriteList = _settingList => {
 	const spriteList = [];
 	Object.keys(_settingList).forEach(setting =>
 		spriteList[setting] = createEmptySprite(optionsprite, `${setting}Sprite`, {
-			x: 25, y: _settingList[setting].heightPos * g_limitObj.setLblHeight + _settingList[setting].y + 20,
-			w: optionWidth + _settingList[setting].dw, h: g_limitObj.setLblHeight + _settingList[setting].dh,
+			x: 25, y: _settingList[setting].heightPos * g_limitObj.setLblHeight + (_settingList[setting].y || 0) + 20,
+			w: optionWidth + (_settingList[setting].dw || 0), h: g_limitObj.setLblHeight + (_settingList[setting].dh || 0),
 		}));
 	return spriteList;
 };
@@ -7784,9 +7786,9 @@ const makeHighScore = _scoreId => {
 			`${g_localStorage.highscores?.[scoreName]?.allPerfect ?? '' ? '<span class="result_AllPerfect">◆</span>' : ''}`, { xPos: 1, dx: 20, yPos: 12, w: 100, align: C_ALIGN_CENTER }),
 		createScoreLabel(`lblHClearLamps`, `Cleared: ` + (g_localStorage.highscores?.[scoreName]?.clearLamps?.join(', ') ?? C_FLG_HYPHEN), { yPos: 13, overflow: C_DIS_AUTO, w: g_sWidth / 2 + 40, h: 37 }),
 
-		createScoreLabel(`lblHShuffle`, g_stateObj.shuffle.indexOf(`Mirror`) < 0 ? `` : `Shuffle: <span class="common_iknai">${g_stateObj.shuffle}</span>`, { yPos: 11.5, dx: -130 }),
-		createScoreLabel(`lblHAssist`, g_autoPlaysBase.includes(g_stateObj.autoPlay) ? `` : `Assist: <span class="common_kita">${g_stateObj.autoPlay}</span>`, { yPos: 12.5, dx: -130 }),
-		createScoreLabel(`lblHAnother`, !hasVal(g_keyObj[`transKey${keyCtrlPtn}`]) ? `` : `A.Keymode: <span class="common_ii">${g_keyObj[`transKey${keyCtrlPtn}`]}</span>`, { yPos: 13.5, dx: -130 }),
+		createScoreLabel(`lblHShuffle`, g_stateObj.shuffle.indexOf(`Mirror`) < 0 ? `` : `Shuffle: <span class="common_shuffle">${g_stateObj.shuffle}</span>`, { yPos: 11.5, dx: -130 }),
+		createScoreLabel(`lblHAssist`, g_autoPlaysBase.includes(g_stateObj.autoPlay) ? `` : `Assist: <span class="common_assist">${g_stateObj.autoPlay}</span>`, { yPos: 12.5, dx: -130 }),
+		createScoreLabel(`lblHAnother`, !hasVal(g_keyObj[`transKey${keyCtrlPtn}`]) ? `` : `A.Keymode: <span class="common_another">${g_keyObj[`transKey${keyCtrlPtn}`]}</span>`, { yPos: 13.5, dx: -130 }),
 	);
 
 	// 結果をクリップボードへコピー (ハイスコア保存分)
@@ -9075,7 +9077,13 @@ const settingsDisplayInit = () => {
 	createSettingsDisplayWindow(divRoot);
 
 	// ショートカットキーメッセージ
-	divRoot.appendChild(createDescDiv(`scMsg`, g_lblNameObj.sdShortcutDesc));
+	multiAppend(divRoot,
+		createDescDiv(`scMsg`, g_lblNameObj.sdShortcutDesc),
+		createCss2Button(`btnDisplayPreview`, `↓ Preview`, _evt => {
+			toggleDisplayPreview();
+		}, g_lblPosObj.btnDisplayPreview, g_cssObj.button_Setting),
+	);
+	createScText(btnDisplayPreview, `DisplayPreview`, { displayName: `settingsDisplay`, targetLabel: `btnDisplayPreview`, x: -25 });
 
 	// ユーザカスタムイベント(初期)
 	safeExecuteCustomHooks(`g_customJsObj.settingsDisplay`, g_customJsObj.settingsDisplay);
@@ -9090,6 +9098,426 @@ const settingsDisplayInit = () => {
 	safeExecuteCustomHooks(`g_skinJsObj.settingsDisplay`, g_skinJsObj.settingsDisplay);
 };
 
+/** プレビューウィンドウのルートdiv */
+let g_previewRoot = null;
+
+/** プレビューで登録した一時リスナー群 */
+let g_previewLsnrKeys = new Set();
+
+/** プレビュー内の各UIオブジェクトの現在座標 */
+const g_previewPos = {
+	jdgJ: { x: null, y: null },   // 通常判定キャラクタ・コンボ
+	jdgFJ: { x: null, y: null },   // フリーズ判定キャラクタ・コンボ
+};
+
+/**
+ * プレビュー用リスナー登録（キーをレジストリへ格納）
+ */
+const addPreviewListener = (target, type, listener, capture = false) => {
+	const key = g_handler.addListener(target, type, listener, capture);
+	g_previewLsnrKeys.add(key);
+	return key;
+};
+
+/**
+ * プレビューのトグル（表示 / 非表示）
+ */
+const toggleDisplayPreview = () => {
+	if (g_previewRoot && document.getElementById(`displayPreviewOverlay`)) {
+		closeDisplayPreview();
+		g_currentPage = `settingsDisplay`;
+	} else {
+		openDisplayPreview();
+		g_currentPage = `displayPreview`;
+	}
+	setShortcutEvent(g_currentPage, () => true, { displayFlg: false });
+};
+
+/**
+ * プレビューオーバーレイを開く
+ */
+const openDisplayPreview = () => {
+	const divRoot = document.getElementById(`divRoot`);
+	if (!divRoot) return;
+
+	// 既存があれば削除
+	closeDisplayPreview();
+
+	// ============================================================
+	// オーバーレイ本体
+	// ============================================================
+	const overlay = createEmptySprite(divRoot, `displayPreviewOverlay`, {
+		w: g_sWidth, h: g_sHeight, background: g_headerObj.baseBrightFlg ? `#eeeeeedd` : `#111111dd`, pointerEvents: C_DIS_AUTO,
+	});
+	g_previewRoot = overlay;
+	multiAppend(overlay,
+		createDivCss2Label(`lblDisplayPreview`, `Display Preview`,
+			g_lblPosObj.lblDisplayPreview, g_cssObj.settings_Display),
+		createCss2Button(`btnDisplayPreview2`, `↑ Preview`, _evt => {
+			toggleDisplayPreview();
+		}, g_lblPosObj.btnDisplayPreview, g_cssObj.button_Setting),
+		createDescDiv(`lblDisplayPreviewMsg`, g_lblNameObj.displayPreviewDesc),
+	);
+
+	// ============================================================
+	// プレイ画面フレーム（白枠）
+	// ============================================================
+	const rate = 0.8;
+	const playW = g_headerObj.playingWidth || g_sWidth;
+	const playH = g_headerObj.playingHeight || g_sHeight;
+	const frameX = Math.round((g_sWidth - playW) / 2);
+	const frameY = Math.round((g_sHeight - playH) / 2);
+
+	const frame = createEmptySprite(overlay, `previewFrame`, {
+		x: frameX, y: frameY, w: playW, h: playH,
+		background: `#111111`,
+		border: `1px solid #444444`,
+		overflow: `hidden`,
+		boxSizing: `border-box`,
+		transform: `scale(${rate})`,
+	});
+
+	// ============================================================
+	// Display設定に応じたUIを描画
+	// ============================================================
+	buildPreviewUI(frame, playW, playH);
+};
+
+/**
+ * プレビューオーバーレイを閉じる
+ */
+const closeDisplayPreview = () => {
+	const overlay = document.getElementById(`displayPreviewOverlay`);
+	if (overlay) {
+		deleteChildspriteAll(`displayPreviewOverlay`);
+		overlay.remove();
+	}
+	// プレビュー専用に登録した残りのハンドラを明示解除
+	if (g_previewLsnrKeys?.size) {
+		g_previewLsnrKeys.forEach(k => g_handler.removeListener(k));
+		g_previewLsnrKeys.clear();
+	}
+	g_previewRoot = null;
+};
+
+/**
+ * プレビュー内のUI要素を構築する
+ * @param {HTMLElement} _frame     プレイ画面フレーム要素
+ * @param {number}      _playW     プレイ幅(px)
+ * @param {number}      _playH     プレイ高さ(px)
+ */
+const buildPreviewUI = (_frame, _playW, _playH) => {
+
+	// --- Display設定の現在値を取得 ---
+	const d = {
+		stepzone: g_stateObj.d_stepzone,
+		judgment: g_stateObj.d_judgment,
+		lifegauge: g_stateObj.d_lifegauge,
+		score: g_stateObj.d_score,
+		musicinfo: g_stateObj.d_musicinfo,
+	};
+
+	const disableBox = (_name, { x, y, w, h } = {}) =>
+		createDivCss2Label(`previewDisableBox_${_name}`, `${g_emojiObj.crossMark} ${_name}`, {
+			x, y, w, h, background: `rgba(0,0,0,0.5)`, border: `1px dashed #555555`,
+			size: 32, color: `#cccccc`, align: C_ALIGN_LEFT,
+		});
+
+	// ============================================================
+	// ステップゾーン（中央横帯）
+	// ============================================================
+	const stepY = g_posObj.stepY ?? C_STEP_Y;
+	const revStepY = g_posObj.reverseStepY;
+
+	if (d.stepzone === C_FLG_OFF) {
+		multiAppend(_frame,
+			disableBox(`StepZone`, { x: Math.round(_playW / 2 - 200), y: stepY, w: 400, h: 50 }),
+			disableBox(`StepZone_Rev`, { x: Math.round(_playW / 2 - 200), y: C_STEP_Y + revStepY, w: 400, h: 50 }),
+		);
+	} else {
+		// 簡易ステップゾーン（7レーン分）
+		const laneCount = 7;
+		const laneW = 50;
+		const totalW = laneCount * laneW;
+		const startX = Math.round((_playW - totalW) / 2);
+
+		for (let j = 0; j < laneCount; j++) {
+			createEmptySprite(_frame, `previewStep${j}`, {
+				x: startX + j * laneW + 2, y: stepY + 2, w: laneW - 4, h: laneW - 4,
+				background: `rgba(100,100,200,0.25)`,
+				border: `1px solid rgba(150,150,255,0.5)`,
+			});
+			createEmptySprite(_frame, `previewStepR${j}`, {
+				x: startX + j * laneW + 2, y: C_STEP_Y + revStepY + 2, w: laneW - 4, h: laneW - 4,
+				background: `rgba(200,100,100,0.20)`,
+				border: `1px solid rgba(255,150,150,0.4)`,
+			});
+		}
+	}
+
+	// ============================================================
+	// 判定エリア（ドラッグ可能）
+	// ============================================================
+	if (d.judgment === C_FLG_OFF) {
+		_frame.appendChild(disableBox(`Judgment`, {
+			x: Math.round(_playW / 2 - 220), y: Math.round((_playH + (g_posObj?.stepYR ?? 0)) / 2 - 60), w: 440, h: 120,
+		}));
+	} else {
+		const jX0 = Math.round(_playW / 2 - 220) + (g_diffObj.arrowJdgX ?? 0);
+		const jY0 = Math.round((_playH + (g_posObj?.stepYR ?? 0)) / 2 - 60) + (g_diffObj.arrowJdgY ?? 0);
+		const fX0 = Math.round(_playW / 2 - 120) + (g_diffObj.frzJdgX ?? 0);
+		const fY0 = Math.round((_playH + (g_posObj?.stepYR ?? 0)) / 2 + 10) + (g_diffObj.frzJdgY ?? 0);
+
+		const jdgInitX = g_previewPos.jdgJ.x ?? jX0;
+		const jdgInitY = g_previewPos.jdgJ.y ?? jY0;
+		const jdgFInitX = g_previewPos.jdgFJ.x ?? fX0;
+		const jdgFInitY = g_previewPos.jdgFJ.y ?? fY0;
+
+		// 通常判定グループ
+		buildDraggableJudgGroup(_frame, `jdgJ`, jdgInitX, jdgInitY, _playW, _playH, {
+			charaText: d.judgment === C_FLG_ON ? g_lblNameObj.j_ii : ``,
+			comboText: d.judgment === C_FLG_ON ? `5 Combo!!` : ``,
+			diffText: `Fast 3 Frames`,
+			charaColor: `#66ffff`,
+		});
+
+		// フリーズ判定グループ
+		buildDraggableJudgGroup(_frame, `jdgFJ`, jdgFInitX, jdgFInitY, _playW, _playH, {
+			charaText: d.judgment === C_FLG_ON ? g_lblNameObj.j_kita : ``,
+			comboText: d.judgment === C_FLG_ON ? `5 Combo!!` : ``,
+			diffText: `Fast 2 Frames`,
+			charaColor: `#ffff99`,
+		});
+	}
+
+	// ============================================================
+	// ライフゲージ（左縦帯）
+	// ============================================================
+	if (d.lifegauge === C_FLG_OFF) {
+		_frame.appendChild(disableBox(`LifeGauge`, { x: 5, y: 50, w: 15, h: _playH - 100 }));
+	} else {
+		multiAppend(_frame,
+			createDivCss2Label(`previewLifeBack`, ``, {
+				x: 5, y: 50, w: 15, h: _playH - 100,
+				background: `#333333`, border: `1px solid #555555`,
+			}),
+			createDivCss2Label(`previewLifeBar`, ``, {
+				x: 5, y: 50 + (_playH - 100) * 0.3,
+				w: 15, h: (_playH - 100) * 0.7, background: `#006666`,
+			}),
+			createDivCss2Label(`previewLifeNum`, `700`, {
+				x: 0, y: 30, w: 70, h: 20,
+				size: 14, color: `#ffffff`, background: `#006666`, align: `center`,
+			}),
+		);
+	}
+
+	// ============================================================
+	// スコア・判定カウンタ（右端縦列）
+	// ============================================================
+	if (d.score === C_FLG_OFF) {
+		_frame.appendChild(disableBox(`Score`, { x: _playW - 80, y: 20, w: 70, h: 200 }));
+	} else {
+		const scoreItems = [
+			{ color: `#66ffff`, cnt: `5` },
+			{ color: `#99ff99`, cnt: `0` },
+			{ color: `#ffcc66`, cnt: `0` },
+			{ color: `#cc99ff`, cnt: `0` },
+			{ color: `#ff9999`, cnt: `0` },
+			{ color: `#ffffff`, cnt: `5` },
+			{},
+			{ color: `#ffff99`, cnt: `5` },
+			{ color: `#99ff66`, cnt: `0` },
+			{ color: `#ffffff`, cnt: `5` },
+		];
+		const sx = _playW - 110;
+		scoreItems.forEach((item, i) => {
+			_frame.appendChild(
+				createDivCss2Label(`previewScore${i}`, item.cnt || ``, {
+					x: sx + 50, y: 20 * (i + 1), w: 50, h: 20,
+					siz: 16, color: item.color, align: `right`,
+				}),
+			);
+		});
+	}
+
+	// ============================================================
+	// 曲名・制作者（左下）
+	// ============================================================
+	if (d.musicinfo === C_FLG_OFF) {
+		_frame.appendChild(disableBox(`MusicInfo`, { x: 5, y: _playH - 50, w: _playW - 125, h: 40 }));
+	} else {
+		multiAppend(
+			_frame,
+			createDivCss2Label(`previewCredit`, `Sample Music / Artist Name`, {
+				...g_lblPosObj.previewCredit, x: 100, y: _playH - 30, w: _playW - 125, h: 20,
+			}),
+			createDivCss2Label(`previewDifName`, `[7key / Normal]`, {
+				...g_lblPosObj.previewCredit, x: 100, y: _playH - 16, w: _playW - 125, h: 16, siz: 12,
+			}),
+			createDivCss2Label(`previewTime1`, `0:04 /`, {
+				...g_lblPosObj.previewCredit, x: 18, y: _playH - 30, w: 40, h: 20, align: C_ALIGN_RIGHT,
+			}),
+			createDivCss2Label(`previewTime2`, `2:54`, {
+				...g_lblPosObj.previewCredit, x: 60, y: _playH - 30, w: 60, h: 20,
+			}),
+		)
+	}
+};
+
+/**
+ * ドラッグ可能な判定グループを生成する
+ * @param {HTMLElement} _parent    親要素
+ * @param {string}      _groupId   `jdgJ` または `jdgFJ`
+ * @param {number}      _initX     初期X座標（frame相対）
+ * @param {number}      _initY     初期Y座標（frame相対）
+ * @param {number}      _playW     プレイ幅
+ * @param {number}      _playH     プレイ高さ
+ * @param {object}      _opts      表示テキスト・色オプション
+ */
+const buildDraggableJudgGroup = (_parent, _groupId, _initX, _initY, _playW, _playH, _opts) => {
+
+	const group = createEmptySprite(_parent, `previewGrp_${_groupId}`, {
+		x: _initX, y: _initY, w: 370, h: 51, cursor: `grab`, pointerEvents: C_DIS_AUTO,
+	});
+
+	multiAppend(
+		group,
+		// キャラクタ
+		createDivCss2Label(`previewChara_${_groupId}`, _opts.charaText, {
+			x: 0, y: 0, w: g_limitObj.jdgCharaWidth, h: g_limitObj.jdgCharaHeight,
+			siz: g_limitObj.jdgCharaSiz, color: _opts.charaColor,
+		}),
+		// コンボ
+		createDivCss2Label(`previewCombo_${_groupId}`, _opts.comboText, {
+			x: 170, y: 0, w: g_limitObj.jdgCharaWidth, h: g_limitObj.jdgCharaHeight,
+			siz: g_limitObj.jdgCharaSiz, color: `#ffffff`,
+		}),
+		// Fast/Slow
+		createDivCss2Label(`previewDiff_${_groupId}`, _opts.diffText, {
+			x: 170, y: 25, w: g_limitObj.jdgCharaWidth, h: g_limitObj.jdgCharaHeight,
+			siz: g_limitObj.mainSiz, color: `#ff9966`,
+		}),
+	);
+
+	// ドラッグハンドル（薄い枠）
+	createEmptySprite(group, `lblHandle_${_groupId}`, {
+		x: 0, y: 0, w: 370, h: 51, border: `1px dashed rgba(255,255,255,0.3)`,
+		boxSizing: `border-box`, borderRadius: `2px`,
+		background: `rgba(255,255,255,0.04)`,
+	});
+
+	// ---- ドラッグ処理 ----
+	let dragging = false;
+	let dragStartX = 0, dragStartY = 0;
+	let elemStartX = 0, elemStartY = 0;
+
+	const keyDown = addPreviewListener(group, `pointerdown`, _evt => {
+		dragging = true;
+		dragStartX = _evt.clientX;
+		dragStartY = _evt.clientY;
+		elemStartX = parseInt(group.style.left, 10);
+		elemStartY = parseInt(group.style.top, 10);
+		group.style.cursor = `grabbing`;
+		group.setPointerCapture(_evt.pointerId);
+		_evt.stopPropagation();
+	});
+	const keyMove = addPreviewListener(group, `pointermove`, _evt => {
+		if (!dragging) return;
+		const dx = _evt.clientX - dragStartX;
+		const dy = _evt.clientY - dragStartY;
+		const newX = Math.max(0, Math.min(_playW - 370, elemStartX + dx));
+		const newY = Math.max(0, Math.min(_playH - 50, elemStartY + dy));
+		group.style.left = wUnit(newX);
+		group.style.top = wUnit(newY);
+		_evt.stopPropagation();
+	});
+	const keyUp = addPreviewListener(group, `pointerup`, _evt => {
+		if (!dragging) return;
+		dragging = false;
+		group.style.cursor = `grab`;
+
+		const finalX = parseInt(group.style.left, 10);
+		const finalY = parseInt(group.style.top, 10);
+
+		// ---- 座標をグローバル状態とゲーム本体に反映 ----
+		g_previewPos[_groupId].x = finalX;
+		g_previewPos[_groupId].y = finalY;
+		applyJudgPositionToGame(_groupId, finalX, finalY);
+
+		_evt.stopPropagation();
+	});
+	// pointerup が届かないケースを拾う
+	addPreviewListener(group, `pointercancel`, _evt => {
+		dragging = false;
+		group.style.cursor = `grab`;
+	});
+	group.setAttribute(`lsnrkey`, keyMove);
+	group.setAttribute(`lsnrkeyTS`, keyDown);
+	group.setAttribute(`lsnrkeyTE`, keyUp);
+};
+
+/**
+ * ドラッグ結果の座標をゲーム本体の判定位置設定に反映する
+ * @param {string} _groupId  `jdgJ` または `jdgFJ`
+ * @param {number} _x        frame相対X
+ * @param {number} _y        frame相対Y
+ */
+const applyJudgPositionToGame = (_groupId, _x, _y) => {
+	const playH = g_headerObj.playingHeight || g_sHeight;
+	const stepYR = g_posObj?.stepYR ?? 0;
+
+	// mainInit内のjdgX[0/1], jdgY[0/1]はローカル変数なため、
+	// g_diffObj経由でオフセットとして保持し、次回プレイ開始時に反映する。
+	// ここでは g_diffObj.arrowJdgY / frzJdgY をオフセット格納先として利用する。
+	//
+	// 「標準Y」= (playH + stepYR) / 2 - 60  (jdgJ の場合)
+	//           = (playH + stepYR) / 2 + 10  (jdgFJ の場合)
+	// オフセット = 実際のY - 標準Y
+
+	if (_groupId === `jdgJ`) {
+		const stdX = g_headerObj.playingWidth / 2 - 220;
+		const stdY = Math.round((playH + stepYR) / 2 - 60);
+		g_diffObj.arrowJdgX = _x - stdX;
+		g_diffObj.arrowJdgY = _y - stdY;
+		showToast(`${g_lblNameObj.arrowJdgUpdate}: dX=${g_diffObj.arrowJdgX}, dY=${g_diffObj.arrowJdgY}`);
+	} else if (_groupId === `jdgFJ`) {
+		const stdX = g_headerObj.playingWidth / 2 - 120;
+		const stdY = Math.round((playH + stepYR) / 2 + 10);
+		g_diffObj.frzJdgX = _x - stdX;
+		g_diffObj.frzJdgY = _y - stdY;
+		showToast(`${g_lblNameObj.frzJdgUpdate}: dX=${g_diffObj.frzJdgX}, dY=${g_diffObj.frzJdgY}`);
+	}
+};
+
+/**
+ * 画面上部に一時的なトーストメッセージを表示する
+ * @param {string} _msg
+ */
+function showToast(_msg) {
+	const existing = document.getElementById(`previewToast`);
+	if (existing) existing.remove();
+
+	const toast = createDivCss2Label(`previewToast`, _msg, {
+		x: g_btnX() + g_btnWidth() / 2, y: 50, w: g_btnWidth() / 2, h: 10,
+		transform: `translateX(-50%)`,
+		background: `rgba(0,40,80,0.92)`,
+		color: `#aaddff`,
+		border: `1px solid #3366aa`,
+		borderRadius: `6px`,
+		padding: `6px 16px`,
+		fontSize: `12px`,
+		fontFamily: `monospace`,
+		whiteSpace: `nowrap`,
+		pointerEvents: `none`,
+		transition: `opacity 0.4s`,
+		opacity: `1`,
+	});
+	divRoot.appendChild(toast);
+	setTimeout(() => { toast.style.opacity = `0`; }, 2200);
+	setTimeout(() => { if (toast.parentNode) toast.remove(); }, 2700);
+};
+
 /**
  * 設定・オプション画面のラベル・ボタン処理の描画
  * @param {Object} _sprite 基準とするスプライト(ここで指定する座標は、そのスプライトからの相対位置)
@@ -9148,7 +9576,7 @@ const createSettingsDisplayWindow = _sprite => {
 			g_settings.displayNum[_name] = list.findIndex(flg => flg === g_stateObj[`d_${_name.toLowerCase()}`]);
 			displaySprite.appendChild(
 				makeSettingLblCssButton(linkId, dispView(), _heightPos, () => switchDisplay(), {
-					x: 30 + 180 * _widthPos, w: 170,
+					x: 30 + 180 * _widthPos, y: 20 * _heightPos, w: 170, h: 18,
 					title: g_msgObj[`d_${_name.toLowerCase()}`], borderStyle: `solid`,
 					cxtFunc: () => switchDisplay(-1),
 				}, `button_${cssBgList[g_settings.displayNum[_name]]}`, `button_${cssBarList[g_settings.displayNum[_name]]}`)
@@ -9159,14 +9587,14 @@ const createSettingsDisplayWindow = _sprite => {
 			if (g_settings[`d_${_name}s`] !== undefined) {
 				displaySprite.appendChild(
 					makeSettingLblCssButton(`${linkId}R`, `>`, _heightPos, () => switchDisplay(1, false), {
-						x: 175 + 180 * _widthPos, w: 25, cxtFunc: () => switchDisplay(-1, false),
+						x: 175 + 180 * _widthPos, w: 25, y: 2 + 20 * _heightPos, h: 18, cxtFunc: () => switchDisplay(-1, false),
 					}, g_cssObj.button_Mini)
 				);
 			}
 		} else {
 			displaySprite.appendChild(
 				createDivCss2Label(linkId, g_lblNameObj[`d_${toCapitalize(_name)}`] + `:${g_headerObj[`${_name}Set`]}`, {
-					x: 30 + 180 * _widthPos, y: 3 + g_limitObj.setLblHeight * _heightPos,
+					x: 30 + 180 * _widthPos, y: 3 + 20 * _heightPos,
 					w: 170, siz: g_limitObj.difSelectorSiz,
 				}, g_cssObj[`button_Disabled${flg}`])
 			);
@@ -9181,7 +9609,7 @@ const createSettingsDisplayWindow = _sprite => {
 	const spriteList = setSpriteList(g_settingPos.settingsDisplay);
 
 	_sprite.appendChild(createDivCss2Label(`sdDesc`, g_lblNameObj.sdDesc, g_lblPosObj.sdDesc));
-	g_displays.forEach((name, j) => makeDisplayButton(name, j % 7, Math.floor(j / 7)));
+	g_displays.forEach((name, j) => makeDisplayButton(name, j % 6, Math.floor(j / 6)));
 
 	// ---------------------------------------------------
 	// 矢印の見え方 (Appearance)
@@ -9226,9 +9654,7 @@ const createSettingsDisplayWindow = _sprite => {
 	// ---------------------------------------------------
 	// 判定表示系の不透明度 (Opacity)
 	// 縦位置: 9
-	g_headerObj.opacityUse = false;
-	[`judgment`, `fastSlow`, `filterLine`].forEach(display =>
-		g_headerObj.opacityUse ||= g_headerObj[`${display}Use`] || g_headerObj[`${display}Set`] === C_FLG_ON);
+	g_headerObj.opacityUse = g_headerObj.judgmentUse || g_headerObj.judgmentSet === C_FLG_ON;
 
 	createGeneralSetting(spriteList.opacity, `opacity`, { unitName: g_lblNameObj.percent });
 
@@ -9444,8 +9870,9 @@ const createGeneralSettingEx = (_spriteList, _name, { defaultList = [C_FLG_OFF],
 /**
  * キーコンフィグ画面初期化
  * @param {string} _kcType
+ * @param {boolean} _initFlg 初期表示フラグ
  */
-const keyConfigInit = (_kcType = g_kcType) => {
+const keyConfigInit = (_kcType = g_kcType, _initFlg = false) => {
 
 	clearWindow(true);
 	const divRoot = document.getElementById(`divRoot`);
@@ -9491,6 +9918,36 @@ const keyConfigInit = (_kcType = g_kcType) => {
 		g_keyObj[`keyGroupOrder${keyCtrlPtn}`] ?? tkObj.keyGroupList;
 	g_keycons.colorCursorNum = 0;
 
+	// 色変化中の初期色を取得（矢印枠のみ）
+	const arrowColorTmp = g_detailObj.miniMapParams[g_stateObj.scoreId]._scoreObj.ncolorData.Arrow;
+	const arrowColors = Array.from({ length: Math.ceil(arrowColorTmp.length / 5) }, (_, i) =>
+		arrowColorTmp.slice(i * 5, i * 5 + 5)
+	).filter(val => val[0] === 0);
+	const initColors = [];
+	arrowColors.forEach(val => {
+		const laneToken = val[1];
+		const laneStr = String(laneToken ?? ``);
+		if (laneStr.startsWith('g')) {
+			// g付きの場合は矢印グループから対象の矢印番号を検索
+			const groupVal = setIntVal(laneStr.slice(1));
+			for (let j = 0; j < tkObj.keyNum; j++) {
+				if (g_keyObj[`color${tkObj.keyCtrlPtn}`][j] === groupVal) {
+					initColors[j] = makeColorGradation(val[2]);
+				}
+			}
+		} else {
+			const laneIdx = setIntVal(laneToken, -1);
+			if (laneIdx >= 0 && laneIdx < tkObj.keyNum) {
+				initColors[laneIdx] = makeColorGradation(val[2]);
+			}
+		}
+	});
+	if (_initFlg) {
+		g_baseColorGrs = {};
+		const colorKey = Object.keys(g_keyObj).filter(val => val.startsWith(`color${g_keyObj.currentKey}`));
+		colorKey.forEach(val => g_baseColorGrs[val] = g_keyObj[val]);
+	}
+
 	/**
 	 * keyconSpriteのスクロール位置調整
 	 * @param {number} _targetX 
@@ -9509,6 +9966,20 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	 */
 	const getKeyConfigColor = (_j, _colorPos) => {
 		let arrowColor = g_headerObj.setColor[_colorPos];
+
+		// 色変化データの利用条件設定（Default/Type0限定）
+		const storageObj = g_stateObj.extraKeyFlg ? g_localStorage : g_localKeyStorage;
+		const baseGroupNum = g_keycons.colorGroupNum === -1
+			? (storageObj?.[`keyCtrlPtn${g_keyObj.currentKey}`] ?? storageObj?.keyCtrlPtn ?? 0)
+			: g_keycons.colorGroupNum;
+		const currentColorGr = g_keyObj[`color${keyCtrlPtn}_${g_keycons.colorGroupNum}`];
+		const baseColorGr = g_baseColorGrs?.[`color${keyCtrlPtn}_${baseGroupNum}`];
+		if (hasVal(initColors[_j]) && g_keycons.colorDefTypes.includes(g_colorType)
+			&& currentColorGr?.[_j] === baseColorGr?.[_j]) {
+			arrowColor = initColors[_j];
+		}
+
+		// アシスト設定時はアシストの色を優先して適用
 		if (typeof g_keyObj[`assistPos${keyCtrlPtn}`] === C_TYP_OBJECT &&
 			g_keyObj[`assistPos${keyCtrlPtn}`][g_stateObj.autoPlay] !== undefined &&
 			!g_autoPlaysBase.includes(g_stateObj.autoPlay)) {
@@ -9809,6 +10280,12 @@ const keyConfigInit = (_kcType = g_kcType) => {
 			hasVal(g_keyObj[`transKey${keyCtrlPtn}`]) ? g_lblNameObj.transKeyDesc : ``,
 			g_lblPosObj.kcMsg, g_cssObj.keyconfig_warning
 		),
+		// ColorType警告メッセージ
+		createDivCss2Label(
+			`kcMsg2`,
+			g_keycons.colorDefTypes.includes(g_colorType) ? `` : g_lblNameObj.colorTypeDesc,
+			g_lblPosObj.kcMsg2, g_cssObj.keyconfig_Defaultkey
+		),
 
 		// キーカラータイプ切替ボタン
 		makeKCButtonHeader(`lblcolorType`, `ColorType`, { x: 10 + g_btnX() }, g_cssObj.keyconfig_ColorType),
@@ -9988,14 +10465,18 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	const setColorType = (_scrollNum = 1, _reloadFlg = true) => {
 		const nextNum = getNextNum(_scrollNum, `colorTypes`, g_colorType);
 		g_colorType = g_keycons.colorTypes[nextNum];
+		const isDefault = g_keycons.colorDefTypes.includes(g_colorType);
 		if (g_headerObj.colorUse) {
 			g_stateObj.d_color = boolToSwitch(g_keycons.colorDefTypes.findIndex(val => val === g_colorType) !== -1);
 		}
 		changeSetColor();
 		viewGroupObj.color(`_${g_keycons.colorGroupNum}`);
 		lnkColorType.textContent = `${getStgDetailName(g_colorType)}${g_localStorage.colorType === g_colorType ? ' *' : ''}`;
+		kcMsg2.textContent = (isDefault || !g_headerObj.colorUse) ? `` : g_lblNameObj.colorTypeDesc;
+		kcMsg2.style.top = wUnit(hasVal(g_keyObj[`transKey${keyCtrlPtn}`]) ? g_lblPosObj.kcMsg2.y : g_lblPosObj.kcMsg.y);
+		kcMsg2.style.fontSize = wUnit(getFontSize2(kcMsg2.textContent, g_btnWidth()));
 		if (_reloadFlg) {
-			colorPickSprite.style.display = ([`Default`, `Type0`].includes(g_colorType) ? C_DIS_NONE : C_DIS_INHERIT);
+			colorPickSprite.style.display = isDefault ? C_DIS_NONE : C_DIS_INHERIT;
 			g_keycons.colorCursorNum = g_keycons.colorCursorNum % Math.ceil(g_headerObj.setColor.length / g_limitObj.kcColorPickerNum);
 			changeColorPickers();
 		}
@@ -10017,7 +10498,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	};
 
 	const colorPickSprite = createEmptySprite(divRoot, `colorPickSprite`, { ...g_windowObj.colorPickSprite, title: g_msgObj.pickArrow });
-	if ([`Default`, `Type0`].includes(g_colorType)) {
+	if (g_keycons.colorDefTypes.includes(g_colorType)) {
 		colorPickSprite.style.display = C_DIS_NONE;
 	}
 	multiAppend(colorPickSprite,
@@ -10376,7 +10857,6 @@ const keyconfigKeyboardPreview = (() => {
 	// 定数
 	// -------------------------------------------------------------------------
 	const C_PREVIEW_ID = `kbPreviewArea`;
-	const C_BTN_ID = `btnKbPreview`;
 	const C_CANVAS_BASE_ID = `kbCanvasBase`;
 	const C_CANVAS_MAP_ID = `kbCanvasMap`;
 
@@ -10885,18 +11365,11 @@ const keyconfigKeyboardPreview = (() => {
 	const init = divRoot => {
 		calcScale();
 
-		// ボタン: キャンバス横幅中央に配置、小さいサイズ
-		const btnW = 80;
-		const btnX = g_btnX() + Math.floor((g_btnWidth() - btnW) / 2);
-
 		// "↓ Preview" → 展開、"↑ Preview" → 閉じる のトグルボタン
-		const btn = createCss2Button(C_BTN_ID, `↓ Preview`, () => {
+		const btn = createCss2Button(`btnKbPreview`, `↓ Preview`, () => {
 			togglePreview();
 			btn.textContent = _state.visible ? `↑ Preview` : `↓ Preview`;
-		}, {
-			x: btnX, y: BTN_Y, w: btnW, h: BTN_H, siz: BTN_FS,
-			title: g_msgObj.kcPreview,
-		}, g_cssObj.button_Setting);
+		}, g_lblPosObj.btnKbPreview, g_cssObj.button_Setting);
 		divRoot.appendChild(btn);
 
 		// プレビューエリア: 水平・垂直センタリング
@@ -11052,7 +11525,7 @@ const updateKeyInfo = (_header, _keyCtrlPtn) => {
  * - ここでのID管理は1譜面目も区別して設定する (setScoreIdHeaderの第三引数を使用)
  */
 const changeSetColor = () => {
-	const isDefault = [`Default`, `Type0`].includes(g_colorType);
+	const isDefault = g_keycons.colorDefTypes.includes(g_colorType);
 	const idHeader = setScoreIdHeader(g_stateObj.scoreId, false, true);
 	const defaultType = idHeader + g_colorType;
 	const currentTypes = {
@@ -12144,7 +12617,7 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 	// 歌詞データの分解 (3つで1セット, セット毎の改行区切り可)
 	obj.wordData = [];
 	obj.wordMaxDepth = -1;
-	if (g_stateObj.d_lyrics === C_FLG_OFF) {
+	if (g_stateObj.d_background === C_FLG_OFF) {
 	} else {
 		[obj.wordData, obj.wordMaxDepth] = makeWordData(scoreIdHeader);
 	}
@@ -13344,6 +13817,8 @@ const getArrowSettings = () => {
 		const lowerDisp = _disp.toLowerCase();
 		g_workObj[`${lowerDisp}Disp`] = (g_stateObj[`d_${lowerDisp}`] === C_FLG_OFF ? C_DIS_NONE : C_DIS_INHERIT);
 	});
+	g_workObj.judgmentDisp = g_stateObj.d_judgment !== C_FLG_ON ? C_DIS_NONE : C_DIS_INHERIT;
+	g_workObj.fastslowDisp = g_stateObj.d_judgment === C_FLG_OFF ? C_DIS_NONE : C_DIS_INHERIT;
 
 	g_workObj.lifeVal = Math.floor(g_workObj.lifeInit * 100) / 100;
 	g_workObj.arrowReturnVal = 0;
@@ -13641,11 +14116,11 @@ const mainInit = () => {
 	if (g_appearanceRanges.includes(g_stateObj.appearance)) {
 		mainSprite.appendChild(createDivCss2Label(`filterView`, ``, g_lblPosObj.filterView));
 		if (g_stateObj.d_filterline === C_FLG_ON) {
-			$id(`filterView`).opacity = objOpacity;
+			$id(`filterView`).opacity = 1;
 			for (let j = 0; j < g_stateObj.layerNum; j++) {
-				$id(`filterBar${j}`).opacity = objOpacity;
+				$id(`filterBar${j}`).opacity = 1;
 				if (doubleFilterFlg) {
-					$id(`filterBar${j}_HS`).opacity = objOpacity;
+					$id(`filterBar${j}_HS`).opacity = 1;
 				}
 			}
 		}
@@ -13819,7 +14294,7 @@ const mainInit = () => {
 		multiAppend(infoSprite,
 			// FrzReturnゲージ
 			createColorObject2(`lifeBackFrzObj`, { ...g_lblPosObj.lifeBackFrzObj, display: g_workObj.scoreDisp }, g_cssObj.life_Background),
-			createColorObject2(`lifeBarFrz`, { ...g_lblPosObj.lifeBarFrz, display: g_workObj.scoreDisp }, g_cssObj.main_stepShobon),
+			createColorObject2(`lifeBarFrz`, { ...g_lblPosObj.lifeBarFrz, display: g_workObj.scoreDisp }, g_cssObj.life_frzNormal),
 		)
 	}
 
@@ -13850,8 +14325,12 @@ const mainInit = () => {
 	const jdgGroups = [`J`, `FJ`];
 	const jdgX = [g_headerObj.playingWidth / 2 - 220, g_headerObj.playingWidth / 2 - 120];
 	const jdgY = [(g_headerObj.playingHeight + g_posObj.stepYR) / 2 - 60, (g_headerObj.playingHeight + g_posObj.stepYR) / 2 + 10];
-	if (g_stateObj.d_background === C_FLG_OFF && g_headerObj.jdgPosReset) {
+	if (g_stateObj.d_background === C_FLG_OFF && g_headerObj.jdgPosReset && g_diffObj.arrowJdgX === 0) {
+		// jdgPosResetオプションにより判定位置変更が阻害されることを防ぐため、
+		// X座標が変わった場合は判定位置変更が行われたと判断
 	} else {
+		jdgX[0] += g_diffObj.arrowJdgX;
+		jdgX[1] += g_diffObj.frzJdgX;
 		jdgY[0] += g_diffObj.arrowJdgY;
 		jdgY[1] += g_diffObj.frzJdgY;
 	}
@@ -14176,7 +14655,7 @@ const mainInit = () => {
 		// 矢印(枠外判定、AutoPlay: OFF)
 		arrowOFF: (_j, _arrowName, _cnt) => {
 			if (_cnt < (-1) * g_judgObj.arrowJ[g_judgPosObj.shobon]) {
-				judgeUwan(_cnt);
+				judgeUwan(_cnt, _j);
 				judgeObjDelete.arrow(_j, _arrowName);
 			}
 		},
@@ -14186,7 +14665,7 @@ const mainInit = () => {
 			if (_cnt === 0) {
 				const stepDivHit = document.getElementById(`stepHit${_j}`);
 
-				judgeIi(_cnt);
+				judgeIi(_cnt, _j);
 				stepDivHit.style.opacity = 1;
 				stepDivHit.setAttribute(`cnt`, C_FRM_HITMOTION);
 				judgeObjDelete.arrow(_j, _arrowName);
@@ -14198,7 +14677,7 @@ const mainInit = () => {
 			if (_cnt === 0) {
 				const stepDivHit = document.getElementById(`stepHit${_j}`);
 
-				safeExecuteCustomHooks(`g_customJsObj.dummyArrow`, g_customJsObj.dummyArrow);
+				safeExecuteCustomHooks(`g_customJsObj.dummyArrow`, g_customJsObj.dummyArrow, _j);
 				stepDivHit.style.top = wUnit(-15);
 				stepDivHit.style.opacity = 1;
 				stepDivHit.classList.value = ``;
@@ -14214,7 +14693,7 @@ const mainInit = () => {
 
 		// フリーズアロー(成功時)
 		frzOK: (_j, _k, _frzName, _cnt) => {
-			judgeKita(_cnt);
+			judgeKita(_cnt, _j);
 			$id(`frzHit${_j}`).opacity = 0;
 			g_attrObj[_frzName].judgEndFlg = true;
 			judgeObjDelete.frz(_j, _frzName);
@@ -14222,7 +14701,7 @@ const mainInit = () => {
 
 		// ダミーフリーズアロー(成功時)
 		dummyFrzOK: (_j, _k, _frzName, _cnt) => {
-			safeExecuteCustomHooks(`g_customJsObj.dummyFrz`, g_customJsObj.dummyFrz);
+			safeExecuteCustomHooks(`g_customJsObj.dummyFrz`, g_customJsObj.dummyFrz, _j);
 			$id(`frzHit${_j}`).opacity = 0;
 			g_attrObj[_frzName].judgEndFlg = true;
 			judgeObjDelete.dummyFrz(_j, _frzName);
@@ -14231,12 +14710,12 @@ const mainInit = () => {
 		// フリーズアロー(枠外判定)
 		frzNG: (_j, _k, _frzName, _cnt) => {
 			if (_cnt < (-1) * g_judgObj.frzJ[g_judgPosObj.iknai]) {
-				judgeIknai(_cnt);
+				judgeIknai(_cnt, _j);
 				g_attrObj[_frzName].judgEndFlg = true;
 
 				changeFailedFrz(_j, _k);
 				if (g_headerObj.frzStartjdgUse) {
-					judgeUwan(_cnt);
+					judgeUwan(_cnt, _j);
 				}
 			}
 		},
@@ -14247,7 +14726,7 @@ const mainInit = () => {
 		// フリーズアロー(キーを離したときの処理)
 		frzKeyUp: (_j, _k, _frzName, _cnt) => {
 			if (g_attrObj[_frzName].keyUpFrame > g_headerObj.frzAttempt) {
-				judgeIknai(_cnt);
+				judgeIknai(_cnt, _j);
 				g_attrObj[_frzName].judgEndFlg = true;
 				changeFailedFrz(_j, _k);
 			}
@@ -14289,7 +14768,7 @@ const mainInit = () => {
 
 					// 自身より前の矢印が未判定の場合、強制的に枠外判定を行い矢印を削除
 					if (prevArrow.cnt >= (-1) * g_judgObj.arrowJ[g_judgPosObj.uwan]) {
-						judgeUwan(prevArrow.cnt);
+						judgeUwan(prevArrow.cnt, _j);
 						judgeObjDelete.arrow(_j, prevArrowName);
 					}
 				}
@@ -14316,9 +14795,9 @@ const mainInit = () => {
 
 					// 自身より前のフリーズアローが未判定の場合、強制的に枠外判定を行う
 					if (prevFrz.cnt >= (-1) * g_judgObj.frzJ[g_judgPosObj.iknai] && !prevFrz.judgEndFlg) {
-						judgeIknai(prevFrz.cnt);
+						judgeIknai(prevFrz.cnt, _j);
 						if (g_headerObj.frzStartjdgUse) {
-							judgeUwan(prevFrz.cnt);
+							judgeUwan(prevFrz.cnt, _j);
 						}
 					}
 					// 自身より前のフリーズアローを削除して判定対象を自身に変更 (g_workObj.judgFrzCnt[_j]をカウントアップ)
@@ -14332,7 +14811,7 @@ const mainInit = () => {
 			if (_cnt === 0) {
 				changeHitFrz(_j, _k, `frz`);
 				if (g_headerObj.frzStartjdgUse) {
-					judgeIi(_cnt);
+					judgeIi(_cnt, _j);
 				}
 			}
 		},
@@ -15204,8 +15683,8 @@ const startFrzReturn = () => {
 			clearTimeout(g_workObj.frzReturnTimerId);
 			g_workObj.frzReturnTimerId = null;
 		}
-		lifeBarFrz.classList.remove(g_cssObj.main_stepShobon, g_cssObj.main_stepMatari);
-		lifeBarFrz.classList.add(g_cssObj.main_stepMatari);
+		lifeBarFrz.classList.remove(g_cssObj.life_frzNormal, g_cssObj.life_frzActive);
+		lifeBarFrz.classList.add(g_cssObj.life_frzActive);
 		const seqLen = g_workObj.frzReturnSeq.length;
 		executeFrzReturn(
 			g_workObj.frzReturnSeq[seqLen > 1 ? Math.floor(Math.random() * seqLen) : 0], 0,
@@ -15236,8 +15715,8 @@ const executeFrzReturn = (_seq, _idx, _axis) => {
 		g_workObj.frzReturnFlg = false;
 		g_workObj.frzReturnTimerId = null;
 		const frzReturnGauge = document.getElementById(`lifeBarFrz`);
-		frzReturnGauge.classList.remove(g_cssObj.main_stepShobon, g_cssObj.main_stepMatari);
-		frzReturnGauge.classList.add(g_cssObj.main_stepShobon);
+		frzReturnGauge.classList.remove(g_cssObj.life_frzNormal, g_cssObj.life_frzActive);
+		frzReturnGauge.classList.add(g_cssObj.life_frzNormal);
 		return;
 	}
 
@@ -15470,7 +15949,7 @@ const changeHitFrz = (_j, _k, _name, _difFrame = 0) => {
 	if (g_stateObj.frzReturn !== C_FLG_OFF) {
 		startFrzReturn();
 	}
-	safeExecuteCustomHooks(`g_customJsObj.judg_${_name}Hit`, g_customJsObj[`judg_${_name}Hit`], _difFrame);
+	safeExecuteCustomHooks(`g_customJsObj.judg_${_name}Hit`, g_customJsObj[`judg_${_name}Hit`], _difFrame, _j);
 };
 
 /**
@@ -15544,7 +16023,7 @@ const judgeArrow = _j => {
 		} else if (_difCnt <= g_judgObj.arrowJ[g_judgPosObj.shobon]) {
 			// 通常判定
 			const [resultFunc, resultJdg] = checkJudgment(_difCnt);
-			resultFunc(_difFrame);
+			resultFunc(_difFrame, _j);
 			displayDiff(_difFrame);
 			stepHitTargetArrow(resultJdg);
 			document.getElementById(arrowName).remove();
@@ -15561,7 +16040,7 @@ const judgeArrow = _j => {
 
 			if (g_headerObj.frzStartjdgUse) {
 				const [resultFunc] = checkJudgment(_difCnt);
-				resultFunc(_difFrame);
+				resultFunc(_difFrame, _j);
 				displayDiff(_difFrame);
 			} else {
 				displayDiff(_difFrame, `F`);
@@ -15572,7 +16051,7 @@ const judgeArrow = _j => {
 			} else {
 				changeFailedFrz(_j, fcurrentNo);
 				if (g_headerObj.frzStartjdgUse) {
-					judgeIknai(_difFrame);
+					judgeIknai(_difFrame, _j);
 					currentFrz.judgEndFlg = true;
 				}
 			}
@@ -15708,8 +16187,9 @@ const updateCombo = () => {
  * 回復判定の共通処理
  * @param {string} _name 
  * @param {number} _difFrame 
+ * @param {number} _j
  */
-const judgeRecovery = (_name, _difFrame) => {
+const judgeRecovery = (_name, _difFrame, _j) => {
 	changeJudgeCharacter(_name, g_lblNameObj[`j_${_name}`]);
 	updateCombo();
 	lifeRecovery();
@@ -15727,65 +16207,72 @@ const judgeRecovery = (_name, _difFrame) => {
 	if (_name === `shakin`) {
 		quickRetry(`Shakin(Great)`);
 	}
-	safeExecuteCustomHooks(`g_customJsObj.judg_${_name}`, g_customJsObj[`judg_${_name}`], _difFrame);
+	safeExecuteCustomHooks(`g_customJsObj.judg_${_name}`, g_customJsObj[`judg_${_name}`], _difFrame, _j);
 };
 
 /**
  * ダメージ系共通処理
  * @param {string} _name 
  * @param {number} _difFrame 
+ * @param {number} _j
  */
-const judgeDamage = (_name, _difFrame) => {
+const judgeDamage = (_name, _difFrame, _j) => {
 	changeJudgeCharacter(_name, g_lblNameObj[`j_${_name}`]);
 	g_resultObj.combo = 0;
 	comboJ.textContent = ``;
 	diffJ.textContent = ``;
 	lifeDamage();
-	safeExecuteCustomHooks(`g_customJsObj.judg_${_name}`, g_customJsObj[`judg_${_name}`], _difFrame);
+	safeExecuteCustomHooks(`g_customJsObj.judg_${_name}`, g_customJsObj[`judg_${_name}`], _difFrame, _j);
 };
 
 /**
  * 判定処理：イイ
  * @param {number} _difFrame 
+ * @param {number} _j
  */
-const judgeIi = _difFrame => judgeRecovery(`ii`, _difFrame);
+const judgeIi = (_difFrame, _j) => judgeRecovery(`ii`, _difFrame, _j);
 
 /**
  * 判定処理：シャキン
  * @param {number} _difFrame 
+ * @param {number} _j
  */
-const judgeShakin = _difFrame => judgeRecovery(`shakin`, _difFrame);
+const judgeShakin = (_difFrame, _j) => judgeRecovery(`shakin`, _difFrame, _j);
 
 /**
  * 判定処理：マターリ
  * @param {number} _difFrame 
+ * @param {number} _j
  */
-const judgeMatari = _difFrame => {
+const judgeMatari = (_difFrame, _j) => {
 	changeJudgeCharacter(`matari`, g_lblNameObj.j_matari);
 	comboJ.textContent = ``;
 	finishViewing();
 	quickRetry(`Matari(Good)`);
 
-	safeExecuteCustomHooks(`g_customJsObj.judg_matari`, g_customJsObj.judg_matari, _difFrame);
+	safeExecuteCustomHooks(`g_customJsObj.judg_matari`, g_customJsObj.judg_matari, _difFrame, _j);
 };
 
 /**
  * 判定処理：ショボーン
  * @param {number} _difFrame 
+ * @param {number} _j
  */
-const judgeShobon = _difFrame => judgeDamage(`shobon`, _difFrame);
+const judgeShobon = (_difFrame, _j) => judgeDamage(`shobon`, _difFrame, _j);
 
 /**
  * 判定処理：ウワァン
  * @param {number} _difFrame 
+ * @param {number} _j
  */
-const judgeUwan = _difFrame => judgeDamage(`uwan`, _difFrame);
+const judgeUwan = (_difFrame, _j) => judgeDamage(`uwan`, _difFrame, _j);
 
 /**
  * 判定処理：キター
  * @param {number} _difFrame 
+ * @param {number} _j
  */
-const judgeKita = _difFrame => {
+const judgeKita = (_difFrame, _j) => {
 	changeJudgeCharacter(`kita`, g_lblNameObj.j_kita, `F`);
 
 	if (++g_resultObj.fCombo > g_resultObj.fmaxCombo) {
@@ -15797,21 +16284,22 @@ const judgeKita = _difFrame => {
 	lifeRecovery();
 	finishViewing();
 
-	safeExecuteCustomHooks(`g_customJsObj.judg_kita`, g_customJsObj.judg_kita, _difFrame);
+	safeExecuteCustomHooks(`g_customJsObj.judg_kita`, g_customJsObj.judg_kita, _difFrame, _j);
 };
 
 /**
  * 判定処理：イクナイ
  * @param {number} _difFrame 
+ * @param {number} _j
  */
-const judgeIknai = _difFrame => {
+const judgeIknai = (_difFrame, _j) => {
 	changeJudgeCharacter(`iknai`, g_lblNameObj.j_iknai, `F`);
 	comboFJ.textContent = ``;
 	g_resultObj.fCombo = 0;
 
 	lifeDamage();
 
-	safeExecuteCustomHooks(`g_customJsObj.judg_iknai`, g_customJsObj.judg_iknai, _difFrame);
+	safeExecuteCustomHooks(`g_customJsObj.judg_iknai`, g_customJsObj.judg_iknai, _difFrame, _j);
 };
 
 const jdgList = [`ii`, `shakin`, `matari`, `shobon`].map(jdg => toCapitalize(jdg));
@@ -16728,7 +17216,6 @@ const getSelectedSettingList = (_orgShuffleFlg) => {
 	let displayData = [
 		withDisplays(g_stateObj.d_stepzone, C_FLG_ON, g_lblNameObj.rd_StepZone),
 		withDisplays(g_stateObj.d_judgment, C_FLG_ON, g_lblNameObj.rd_Judgment),
-		withDisplays(g_stateObj.d_fastslow, C_FLG_ON, g_lblNameObj.rd_FastSlow),
 		withDisplays(g_stateObj.d_lifegauge, C_FLG_ON, g_lblNameObj.rd_LifeGauge),
 		withDisplays(g_stateObj.d_score, C_FLG_ON, g_lblNameObj.rd_Score),
 		withDisplays(g_stateObj.d_musicinfo, C_FLG_ON, g_lblNameObj.rd_MusicInfo),
@@ -16748,7 +17235,6 @@ const getSelectedSettingList = (_orgShuffleFlg) => {
 	let display2Data = [
 		withDisplays(g_stateObj.d_velocity, C_FLG_ON, g_lblNameObj.rd_Velocity),
 		withDisplays(g_stateObj.d_color, C_FLG_ON, g_lblNameObj.rd_Color),
-		withDisplays(g_stateObj.d_lyrics, C_FLG_ON, g_lblNameObj.rd_Lyrics),
 		withDisplays(g_stateObj.d_background, C_FLG_ON, g_lblNameObj.rd_Background),
 		withDisplays(g_stateObj.d_arroweffect, C_FLG_ON, g_lblNameObj.rd_ArrowEffect),
 		withDisplays(g_stateObj.d_special, C_FLG_ON, g_lblNameObj.rd_Special),