danoniplus 51.3.0 → 51.4.1

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/10/10
+ * Revised : 2026/10/20
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 51.3.0`;
-const g_revisedDate = `2026/10/10`;
+const g_version = `Ver 51.4.1`;
+const g_revisedDate = `2026/10/20`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/10/10 (v51.3.0)
+ * Revised : 2026/10/20 (v51.4.1)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -207,7 +207,7 @@ const updateWindowSiz = () => {
         keyTitleSprite: { x: g_btnX(1 / 4), y: g_sHeight / 2 - 5, w: g_btnWidth(1 / 2), h: 16 },
         mSelectTitleSprite: { x: g_btnX(), y: 0, w: g_btnWidth(), h: g_sHeight, clipPath: `inset(12% 0 8% 0)` },
         settingSumSprite: { x: g_btnX() + 25, y: g_sHeight - 200, w: g_btnWidth() - 50, h: 100, pointerEvents: C_DIS_AUTO, overflow: C_DIS_AUTO },
-        optionSprite: { x: (g_sWidth - 450) / 2, y: 65, w: 450, h: 325 },
+        optionSprite: { x: (g_sWidth - 450) / 2, y: 65, w: g_sWidth / 2 + 225, h: 325 },
         dataSprite: { x: g_btnX() + (g_sWidth - Math.max(g_sWidth - 100, 450)) / 2, y: 65, w: Math.max(g_sWidth - 100, 450), h: 325 },
         keyListSprite: { x: 0, y: g_limitObj.setLblHeight * 7.5 + 40, w: 150, h: g_sHeight - 380, overflow: C_DIS_AUTO },
         difList: { x: 165, y: 60, w: 280, h: 270 + g_sHeight - 500, overflow: C_DIS_AUTO, pointerEvents: C_DIS_AUTO },
@@ -1406,7 +1406,7 @@ const g_settings = {
     },
     environments: [`adjustment`, `volume`, `colorType`, `appearance`, `opacity`, `hitPosition`,
         `arrowJdgX`, `arrowJdgY`, `frzJdgX`, `frzJdgY`, `shortcutX`, `shortcutY`],
-    keyStorages: [`reverse`, `keyCtrl`, `keyCtrlPtn`, `shuffle`, `color`, `stepRtn`],
+    keyStorages: [`reverse`, `keyCtrl`, `keyCtrlPtn`, `shuffle`, `color`, `stepRtn`, `shortcut`],
     colorStorages: [`setColor`, `setShadowColor`, `frzColor`, `frzShadowColor`],
 
     mSelectableTerms: 3,
@@ -1551,6 +1551,12 @@ g_settings.volumeNum = g_settings.volumes.length - 1;
 g_settings.bgmVolumeNum = roundZero(g_settings.volumes.findIndex(v => v === g_stateObj.bgmVolume));
 g_settings.opacityNum = g_settings.opacitys.length - 1;
 
+const g_settingWindowTitleKeys = new Map([
+    [optionInit, `Option`],
+    [settingsDisplayInit, `Display`],
+    [exSettingInit, `Settings`],
+]);
+
 /**
  * 設定画面間移動
  */
@@ -2916,7 +2922,7 @@ const g_shortcutObj = {
         NumpadEnter: { id: `btnPlay` },
         ShiftLeft_Tab: { id: `btnBack` },
         ShiftRight_Tab: { id: `btnBack` },
-        Tab: { id: `btnDisplay` },
+        Tab: { id: `btnNextSetting` },
         KeyU: { id: `btnSettingSummary` },
     },
     difSelector: {
@@ -2951,7 +2957,7 @@ const g_shortcutObj = {
         NumpadEnter: { id: `lnkDifficulty` },
         ShiftLeft_Tab: { id: `btnBack` },
         ShiftRight_Tab: { id: `btnBack` },
-        Tab: { id: `btnDisplay` },
+        Tab: { id: `btnNextSetting` },
         KeyU: { id: `btnSettingSummary` },
     },
     scoreDetail: {
@@ -3000,7 +3006,7 @@ const g_shortcutObj = {
         NumpadEnter: { id: `btnPlay` },
         ShiftLeft_Tab: { id: `btnBack` },
         ShiftRight_Tab: { id: `btnBack` },
-        Tab: { id: `btnDisplay` },
+        Tab: { id: `btnNextSetting` },
         KeyU: { id: `btnSettingSummary` },
     },
     settingsDisplay: {
@@ -3097,7 +3103,7 @@ const g_shortcutObj = {
         NumpadEnter: { id: `btnPlay` },
         ShiftLeft_Tab: { id: `btnBack` },
         ShiftRight_Tab: { id: `btnBack` },
-        Tab: { id: `btnSettings` },
+        Tab: { id: `btnNextSetting` },
         KeyU: { id: `btnSettingSummary` },
     },
     displayPreview: {
@@ -3116,7 +3122,7 @@ const g_shortcutObj = {
         NumpadEnter: { id: `btnPlay` },
         ShiftLeft_Tab: { id: `btnBack` },
         ShiftRight_Tab: { id: `btnBack` },
-        Tab: { id: `btnSettings` },
+        Tab: { id: `btnNextSetting` },
     },
     exSetting: {
         ShiftLeft_KeyP: { id: `lnkPlayWindowL` },
@@ -3157,7 +3163,7 @@ const g_shortcutObj = {
         Enter: { id: `btnPlay` },
         ShiftLeft_Tab: { id: `btnBack` },
         ShiftRight_Tab: { id: `btnBack` },
-        Tab: { id: `btnexSetting` },
+        Tab: { id: `btnNextSetting` },
         KeyU: { id: `btnSettingSummary` },
     },
     keyConfig: {
@@ -3220,11 +3226,11 @@ const g_btnPatterns = {
     title: { Start: 0, Comment: -10, MusicSelectRandom: -10 },
     dataMgt: { Back: 0, Environment: -35, Highscores: -35, CustomKey: -35, Others: -35 },
     precondition: { Back: 0 },
-    option: { Back: 0, KeyConfig: 0, Play: 0, Display: -5, Save: -10, Graph: -25, SettingSummary: -10 },
+    option: { Back: 0, KeyConfig: 0, Play: 0, NextSetting: -5, Save: -10, Graph: -25, SettingSummary: -10 },
     difSelector: {},
     scoreDetail: {},
-    settingsDisplay: { Back: 0, KeyConfig: 0, Play: 0, Save: -10, Settings: -5, SettingSummary: -10 },
-    exSetting: { Back: 0, KeyConfig: 0, Play: 0, exSetting: -5, Save: -10, SettingSummary: -10 },
+    settingsDisplay: { Back: 0, KeyConfig: 0, Play: 0, Save: -10, NextSetting: -5, SettingSummary: -10 },
+    exSetting: { Back: 0, KeyConfig: 0, Play: 0, NextSetting: -5, Save: -10, SettingSummary: -10 },
     loadingIos: { Play: 0 },
     keyConfig: { Back: -3, Play: 0 },
     result: { Back: -5, Copy: -5, Tweet: -5, Gitter: -5, Retry: 0, GaugeTransition: -15 },
@@ -4658,6 +4664,7 @@ const g_lblNameObj = {
     b_cReset: `Reset`,
     b_precond: `Precondition`,
     b_keyLock: `KeyLock`,
+    b_kbLane: `Group Color`,
 
     Difficulty: `Difficulty`,
     Speed: `Speed`,
@@ -5090,6 +5097,7 @@ const g_lang_msgObj = {
 
         graph: `譜面密度や速度変化状況、\n譜面の難易度などの情報を表示します。`,
         dataSave: `ハイスコア、リバース設定、\nキーコンフィグの保存の有無を設定します。`,
+        toOption: `譜面、速度、ゲージなどの基本設定を設定します。`,
         toDisplay: `プレイ画面上のオブジェクトの\n表示・非表示（一部透明度）を設定します。`,
         toSettings: `その他の拡張設定を設定します。`,
 
@@ -5200,6 +5208,7 @@ const g_lang_msgObj = {
 
         graph: `Displays detailed information about the chart, such as chart's density status, sequences' velocity changes, and chart's difficulty.`,
         dataSave: `Set whether to save the high score, reverse setting, and key config.`,
+        toOption: `Set basic settings such as chart, speed, and gauge.`,
         toDisplay: `Set the display or non-display (partial transparency) of objects on the play screen.`,
         toSettings: `Set other extended settings.`,
 

package/js/lib/dataLoader.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2026/09/13
- * Revised : 2026/10/10 (v51.3.0)
+ * Revised : 2026/10/20 (v51.4.1)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -2466,6 +2466,7 @@ const getArrowSettings = (_retryFlg = false) => {
 
 	// FrzReturnの初期化
 	g_workObj.frzReturnFlg = false;
+	g_workObj.frzReturnPausedFlg = false;
 	g_workObj.frzReturnSeq = g_frzReturnSeqFunc.get(g_stateObj.frzReturnType)();
 	if (g_workObj.frzReturnTimerId) {
 		g_timerHandler.clearTimeout(g_workObj.frzReturnTimerId);

package/js/lib/dosConverter.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2026/09/13
- * Revised : 2026/10/10 (v51.3.0)
+ * Revised : 2026/10/12 (v51.4.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1665,6 +1665,14 @@ const headerConvert = _dosObj => {
 	g_canDisabledSettings.forEach(option =>
 		obj[`${option}Use`] = setBoolVal(_dosObj[`${option}Use`] ?? g_presetObj.settingUse?.[option], true));
 
+	// 拡張機能の無効設定
+	if (!setBoolVal(_dosObj.displayWindowUse, true)) {
+		g_settings.settingWindows = g_settings.settingWindows.filter(option => option !== settingsDisplayInit);
+	}
+	if (!setBoolVal(_dosObj.exSettingWindowUse, true)) {
+		g_settings.settingWindows = g_settings.settingWindows.filter(option => option !== exSettingInit);
+	}
+
 	let interlockingErrorFlg = false;
 	g_displays.forEach((option, j) => {
 

package/js/lib/keyconfig.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2026/09/13
- * Revised : 2026/10/10 (v51.3.0)
+ * Revised : 2026/10/12 (v51.4.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -33,6 +33,7 @@ const keyConfigInit = (_kcType = g_kcType, _initFlg = false) => {
 	if (_initFlg) {
 		g_stateObj.keyLockFlg = false;
 		g_stateObj.kbPreviewFlg = false;
+		g_stateObj.kbLaneFlg = false;
 	}
 
 	multiAppend(divRoot,
@@ -400,6 +401,9 @@ const keyConfigInit = (_kcType = g_kcType, _initFlg = false) => {
 		viewGroup(_type);
 		if (_type === `stepRtn`) {
 			keyConfigInit(g_kcType);
+		} else if (_type === `color`) {
+			// カラーグループ変更時はレーン色分けプレビューへ反映
+			keyconfigKeyboardPreview.refresh();
 		}
 	};
 
@@ -580,6 +584,11 @@ const keyConfigInit = (_kcType = g_kcType, _initFlg = false) => {
 
 		// 次の位置が見えなくなったらkeyconSpriteの位置を調整する
 		adjustScrollPoint(nextLeft);
+
+		// レーン色分けプレビュー中はカーソルレーンの強調を更新
+		if (g_stateObj.kbLaneFlg) {
+			keyconfigKeyboardPreview.refresh();
+		}
 	};
 
 	/**
@@ -1311,11 +1320,22 @@ const keyconfigKeyboardPreview = (() => {
 		},
 		bgFill: `#0d0d1a`,        // Canvas 背景
 		legendText: `#cccccc`,    // 凡例テキスト
+
+		// レーン色分けモード用（凡例と文字色。レーン色自体は g_dfColorObj.setColorType2 を使用）
+		// 枠線は未割当キーと同色に統一し、メイン/代替は塗りのアルファのみで区別する
+		laneMain: { fill: `#cccccc`, stroke: `#555577` },
+		laneAlt: { fill: `rgba(204,204,204,0.35)`, stroke: `#555577` },
+		laneAltBright: { fill: `rgba(204,204,204,0.6)`, stroke: `#555577` },
+		laneStroke: `#555577`,
+		laneText: `#111111`,
 	};
 
 	// 凡例エリアの高さ
 	const LEGEND_H = 25;
 
+	// レーン色分けモードで、同一キーに割り当てられた色を分割描画する上限数
+	const C_LANE_SPLIT_MAX = 3;
+
 	// -------------------------------------------------------------------------
 	// キーレイアウト定義
 	//
@@ -1475,6 +1495,7 @@ const keyconfigKeyboardPreview = (() => {
 		mappedSet: new Set(),     // メインキー（code文字列）
 		altSet: new Set(),        // 代替キー（code文字列）
 		shortcutSet: new Set(),   // ショートカットキー（code文字列）
+		laneMap: new Map(),       // code文字列 → { entries: [{ colorPos, alt }], cursor: boolean }
 		canvasBase: null,
 		canvasMap: null,
 		keyDataList: [],          // { code, x, y, w, h, label } — drawMap で照合するキャッシュ
@@ -1620,13 +1641,16 @@ const keyconfigKeyboardPreview = (() => {
 	 * @param {Object} keyData - 位置・サイズ・キーコードを含むキー情報
 	 * @param {Object} style   - fill, stroke, text 等の色セット
 	 * @param {number} lw      - 枠線の太さ(lineWidth)
+	 * @param {boolean} shapeFlg - 枠線・背景を描画するかどうか（false の場合はテキストのみ描画）
 	 */
-	const drawOneKey = (ctx, { keyData, style, lw = 1 }) => {
+	const drawOneKey = (ctx, { keyData, style, lw = 1, shapeFlg = true }) => {
 		const { x, y, w: keyW, h: keyH, code, label } = keyData;
 
 		// 1. キーの枠線・背景を描画
-		roundRect(ctx, x + 0.5, y + 0.5, keyW - 1, keyH - 1, kr());
-		fillStrokeShape(ctx, { fill: style.fill, stroke: style.stroke, lineWidth: lw });
+		if (shapeFlg) {
+			roundRect(ctx, x + 0.5, y + 0.5, keyW - 1, keyH - 1, kr());
+			fillStrokeShape(ctx, { fill: style.fill, stroke: style.stroke, lineWidth: lw });
+		}
 
 		// 2. キー内部のテキスト（メイン・サブ）を描画
 		const [primary, sub] = getKeyLabels(code, label);
@@ -1744,9 +1768,13 @@ const keyconfigKeyboardPreview = (() => {
 
 		const legends = [
 			{ style: C_COLOR.normal, label: g_lblNameObj.unallocated },
-			{ style: C_COLOR.mapped, label: g_lblNameObj.allocated },
-			{ style: C_COLOR.alt, label: g_lblNameObj.altAllocated },
-			{ style: C_COLOR.shortcut, label: g_lblNameObj.shortcutKey }
+			{ style: g_stateObj.kbLaneFlg ? C_COLOR.laneMain : C_COLOR.mapped, label: g_lblNameObj.allocated },
+			{
+				style: g_stateObj.kbLaneFlg
+					? (g_headerObj.baseBrightFlg ? C_COLOR.laneAltBright : C_COLOR.laneAlt) : C_COLOR.alt,
+				label: g_lblNameObj.altAllocated,
+			},
+			{ style: C_COLOR.shortcut, label: g_lblNameObj.shortcutKey },
 		];
 
 		let lx = 8;
@@ -1761,6 +1789,111 @@ const keyconfigKeyboardPreview = (() => {
 		});
 	};
 
+	/**
+	 * 明度が低い色を、未割当キーと区別できる下限まで持ち上げる
+	 * @param {string} _hex #rrggbb 形式の色
+	 * @param {number} _minLum 下限値（RGBの最大成分で判定）
+	 * @returns {string}
+	 */
+	const liftDarkColor = (_hex, _minLum = 0x66) => {
+		const n = parseInt(_hex.slice(1, 7), 16);
+		const [r, g, b] = [(n >> 16) & 255, (n >> 8) & 255, n & 255];
+		const lum = Math.max(r, g, b);
+		if (lum >= _minLum) {
+			return _hex;
+		}
+		const d = _minLum - lum;
+		return `#${[r, g, b].map(v => (v + d).toString(16).padStart(2, `0`)).join(``)}`;
+	};
+
+	/**
+	 * #rrggbb 形式の色にアルファ値を付与する
+	 * @param {string} _hex
+	 * @param {number} _alpha
+	 * @returns {string}
+	 */
+	const hexToRgba = (_hex, _alpha) => {
+		const n = parseInt(_hex.slice(1, 7), 16);
+		return `rgba(${(n >> 16) & 255}, ${(n >> 8) & 255}, ${n & 255}, ${_alpha})`;
+	};
+
+	/**
+	 * レーン色分けモードのスタイル取得（色は譜面ミニマップと同じ setColorType2 固定）
+	 * @param {number} _colorPos カラーグループ番号
+	 * @param {boolean} _altFlg 代替キーか
+	 */
+	const getLaneStyle = (_colorPos, _altFlg) => {
+		const brightFlg = g_headerObj.baseBrightFlg;
+		const baseColor = g_dfColorObj.setColorType2[_colorPos] ?? `#ffffff`;
+
+		// 明背景のみ、黒に近い色を未割当キーと区別できる明るさまで持ち上げる
+		const color = brightFlg ? liftDarkColor(baseColor) : baseColor;
+		// 明背景では暗色セットが使われるため、文字は白にする
+		const mainText = brightFlg ? `#ffffff` : C_COLOR.laneText;
+		if (!_altFlg) {
+			return { fill: color, text: mainText };
+		}
+		return brightFlg
+			? { fill: hexToRgba(color, 0.6), text: `#ffffff` }
+			: { fill: hexToRgba(color, 0.35), text: color };
+	};
+
+	/**
+	 * レーン色分けモードでの単一キー描画
+	 * - 複数色の場合は縦方向に等分割して塗り分ける
+	 * @param {CanvasRenderingContext2D} ctx
+	 * @param {Object} keyData
+	 * @param {{colorPos: number, alt: boolean}[]} entries
+	 * @param {boolean} cursorFlg カーソル中のレーンか
+	 */
+	const drawLaneKey = (ctx, keyData, entries, cursorFlg) => {
+		const { x, y, w: keyW, h: keyH } = keyData;
+		const styles = entries.map(val => getLaneStyle(val.colorPos, val.alt));
+		const segW = keyW / styles.length;
+
+		styles.forEach((style, i) => {
+			ctx.save();
+			ctx.beginPath();
+			ctx.rect(x + segW * i, y, segW, keyH);
+			ctx.clip();
+			roundRect(ctx, x + 0.5, y + 0.5, keyW - 1, keyH - 1, kr());
+			fillStrokeShape(ctx, { fill: style.fill });
+			ctx.restore();
+		});
+
+		// 枠線はキー全体に対して1回だけ、全キー共通の色で描画
+		roundRect(ctx, x + 0.5, y + 0.5, keyW - 1, keyH - 1, kr());
+		fillStrokeShape(ctx, { stroke: C_COLOR.laneStroke, lineWidth: 1.5 });
+
+		// 文字は全体に1回だけ描画（メインが含まれる場合はメインの文字色）
+		const mainIdx = entries.findIndex(val => !val.alt);
+		const textColor = styles[mainIdx >= 0 ? mainIdx : 0].text;
+		drawOneKey(ctx, { keyData, style: { text: textColor }, shapeFlg: false });
+
+		// カーソル中のレーンは白枠で強調
+		if (cursorFlg) {
+			roundRect(ctx, x + 0.5, y + 0.5, keyW - 1, keyH - 1, kr());
+			fillStrokeShape(ctx, { stroke: `#ffffff`, lineWidth: 2.5 });
+		}
+	};
+
+	/**
+	 * レーン色分けモードのマッピング描画（ショートカットキーは専用色で最優先）
+	 * @param {CanvasRenderingContext2D} ctx
+	 */
+	const drawLaneMap = ctx => {
+		_state.keyDataList.forEach(keyData => {
+			if (_state.shortcutSet.has(keyData.code)) {
+				drawOneKey(ctx, { keyData, style: C_COLOR.shortcut, lw: 1.5 });
+				return;
+			}
+			const info = _state.laneMap.get(keyData.code);
+			if (info !== undefined) {
+				drawLaneKey(ctx, keyData, info.entries, info.cursor);
+			}
+		});
+	};
+
 	/**
 	 * マッピング強調レイヤーを再描画する。
 	 * メインキー（mappedSet）を青系、代替キー（altSet）を黄系で色分けする。
@@ -1771,6 +1904,11 @@ const keyconfigKeyboardPreview = (() => {
 
 		ctx.clearRect(0, 0, _state.cvsW, _state.cvsH);
 
+		if (g_stateObj.kbLaneFlg) {
+			drawLaneMap(ctx);
+			return;
+		}
+
 		// キー状態に応じた色取得ロジック（優先度: ショートカット > メイン > 代替）
 		const getKeyStyle = (code) => {
 			if (_state.shortcutSet.has(code)) return C_COLOR.shortcut;
@@ -1815,6 +1953,16 @@ const keyconfigKeyboardPreview = (() => {
 			pointerEvents: C_DIS_AUTO, background: `#00000080`, display: C_DIS_NONE, overflow: `hidden`,
 		});
 
+		// レーン色分け表示の切替ボタン（プレビューエリア内の上部余白に配置）
+		const getLaneBtnName = () => `${g_lblNameObj.b_kbLane ?? `Lane Color`}: ${boolToSwitch(!!g_stateObj.kbLaneFlg)}`;
+		const btnLane = createCss2Button(`btnKbLane`, getLaneBtnName(), () => {
+			g_stateObj.kbLaneFlg = !g_stateObj.kbLaneFlg;
+			btnLane.textContent = getLaneBtnName();
+			drawBase();   // 凡例の切替
+			refresh();
+		}, { x: _state.cvsW - 130, y: 10, w: 120, h: 22, siz: 12 }, g_cssObj.button_Mini);
+		areaDiv.appendChild(btnLane);
+
 		/**
 		 * プレビュー用canvasを生成しareaDivに追加、_stateに登録する
 		 * @param {string} _id
@@ -1873,6 +2021,33 @@ const keyconfigKeyboardPreview = (() => {
 			[g_headerObj.keyRetry, g_headerObj.keyTitleBack, g_headerObj.keyPause, 34, 33].map(toCodeStr).filter(v => v !== ``)
 		);
 
+		// レーン色分け用: キーコード → 割り当て先レーンのカラーグループ情報
+		const colorList = g_keyObj[`color${tkObj.keyCtrlPtn}`];
+		_state.laneMap = new Map();
+		g_keyObj[`keyCtrl${tkObj.keyCtrlPtn}`].forEach((arr, j) => {
+			if (!tkObj.keyGroupMaps[j].includes(configKeyGroupList[g_keycons.keySwitchNum])) {
+				return;
+			}
+			arr.forEach((num, k) => {
+				const code = toCodeStr(num);
+				if (code === ``) {
+					return;
+				}
+				const info = _state.laneMap.get(code) ?? { entries: [], cursor: false };
+				const [colorPos, alt] = [colorList[j], k > 0];
+				if (!info.entries.some(val => val.colorPos === colorPos && val.alt === alt)) {
+					info.entries.push({ colorPos, alt });
+				}
+				info.cursor ||= (j === g_currentj);
+				_state.laneMap.set(code, info);
+			});
+		});
+		// メイン優先で並べ、分割数は上限まで
+		_state.laneMap.forEach(info => {
+			info.entries.sort((a, b) => Number(a.alt) - Number(b.alt));
+			info.entries = info.entries.slice(0, C_LANE_SPLIT_MAX);
+		});
+
 		if (_state.visible) drawMap();
 	};
 
@@ -1885,6 +2060,7 @@ const keyconfigKeyboardPreview = (() => {
 		_state.mappedSet = new Set();
 		_state.altSet = new Set();
 		_state.shortcutSet = new Set();
+		_state.laneMap = new Map();
 		_state.keyDataList = [];
 		_state.canvasBase = null;
 		_state.canvasMap = null;

package/js/lib/mainWindow.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2026/09/13
- * Revised : 2026/10/07 (v51.2.2)
+ * Revised : 2026/10/20 (v51.4.1)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -405,10 +405,12 @@ const mainInit = () => {
 	};
 	Object.keys(jdgMainScoreObj).forEach(jdgScore =>
 		infoSprite.appendChild(
-			makeCounterSymbol(`lbl${jdgScore}`,
-				g_headerObj.playingWidth - 110 + (g_workObj.nonDefaultSc ? g_headerObj.scAreaWidth : 0),
-				g_cssObj[`common_${jdgMainScoreObj[jdgScore][0]}`], jdgMainScoreObj[jdgScore][1] + 1, 0, g_workObj.scoreDisp
-			)
+			createDivCss2Label(`lbl${jdgScore}`, 0, {
+				x: g_headerObj.playingWidth - 110 + (g_workObj.nonDefaultSc ? g_headerObj.scAreaWidth : 0),
+				y: g_limitObj.jdgCntsHeight * (jdgMainScoreObj[jdgScore][1] + 1),
+				w: g_limitObj.jdgCntsWidth, h: g_limitObj.jdgCntsHeight, siz: g_limitObj.jdgCntsSiz, align: C_ALIGN_RIGHT,
+				display: g_workObj.scoreDisp,
+			}, g_cssObj[`common_${jdgMainScoreObj[jdgScore][0]}`])
 		)
 	);
 
@@ -1116,8 +1118,9 @@ const mainInit = () => {
 
 		// 移動
 		updateArrowPos(arrowName, currentArrow);
+		currentArrow.cnt--;
 
-		funcs.judgeMotion(_j, arrowName, --currentArrow.cnt);
+		funcs.judgeMotion(_j, arrowName, currentArrow.cnt);
 		funcs.judgeNext(_j, _k, currentArrow.cnt);
 	};
 
@@ -1273,7 +1276,7 @@ const mainInit = () => {
 	 * @param {string} _frzName 
 	 * @param {object} _frz g_attrObj[_frzName]
 	 */
-	const movFrzMoving = (_j, _k, _name, _frzName, _frz) => {
+	const movFrz = (_j, _k, _name, _frzName, _frz) => {
 
 		// 全体色変化 (通常時)
 		changeColorOnFrame(_j, _k, _name, `Normal`);
@@ -1295,7 +1298,7 @@ const mainInit = () => {
 	 * @param {object} _frz g_attrObj[_frzName]
 	 * @param {number} _movY 1フレームあたりの移動量
 	 */
-	const movFrzHolding = (_j, _k, _name, _frzName, _frz, _movY) => {
+	const holdFrz = (_j, _k, _name, _frzName, _frz, _movY) => {
 		const funcs = objFuncs[_name];
 
 		// 全体色変化 (ヒット時)
@@ -1332,7 +1335,7 @@ const mainInit = () => {
 	 * @param {object} _frz g_attrObj[_frzName]
 	 * @param {number} _movY 1フレームあたりの移動量
 	 */
-	const movFrzEnded = (_j, _name, _frzName, _frz, _movY) => {
+	const endFrz = (_j, _name, _frzName, _frz, _movY) => {
 		_frz.frzBarLength -= _movY * _frz.dir;
 		if (_frz.frzBarLength > 0) {
 			_frz.y -= _movY;
@@ -1354,14 +1357,14 @@ const mainInit = () => {
 		const movY = g_workObj.currentSpeed * currentFrz.boostSpd * currentFrz.dir;
 
 		if (currentFrz.judgEndFlg) {
-			movFrzEnded(_j, _name, frzName, currentFrz, movY);
+			endFrz(_j, _name, frzName, currentFrz, movY);
 			return;
 		}
 
 		if (currentFrz.isMoving) {
-			movFrzMoving(_j, _k, _name, frzName, currentFrz);
+			movFrz(_j, _k, _name, frzName, currentFrz);
 		} else {
-			movFrzHolding(_j, _k, _name, frzName, currentFrz, movY);
+			holdFrz(_j, _k, _name, frzName, currentFrz, movY);
 		}
 
 		// フリーズアローが枠外に出たときの処理
@@ -1426,8 +1429,7 @@ const mainInit = () => {
 		} else if (/\[fontSize=\d+\]/.test(wordDat)) {
 
 			// フォントサイズ変更
-			const fontSize = setIntVal(wordDat.match(/\d+/)[0], g_limitObj.mainSiz);
-			styWord.fontSize = wUnit(fontSize);
+			styWord.fontSize = wUnit(setIntVal(wordDat.match(/\d+/)[0], g_limitObj.mainSiz));
 
 		} else {
 
@@ -1435,9 +1437,10 @@ const mainInit = () => {
 			const fadeFinished = _currentFrame - g_workObj.lastFadeFrame[wordDepth] >= g_workObj.wordFadeFrame[wordDepth];
 			if (fadeFinished) {
 				[`Out`, `In`].forEach(type => {
-					if (g_wordObj[`fade${type}Flg${wordDepth}`]) {
+					const key = `fade${type}Flg${wordDepth}`;
+					if (g_wordObj[key]) {
 						styWord.animationName = `none`;
-						g_wordObj[`fade${type}Flg${wordDepth}`] = false;
+						g_wordObj[key] = false;
 					}
 				});
 			}
@@ -1729,6 +1732,7 @@ const mainInit = () => {
 			// FrzReturn演出はflowTimelineと独立したタイマーで動いているため、
 			// 一時停止時点で早期終了させる(位置復元はせず、通常終了時と同じ後片付けを行う)
 			resetFrzReturn();
+			g_workObj.frzReturnPausedFlg = true;
 		}
 		g_timerHandler.clearTimeout(g_timeoutEvtId);
 		g_audio.pause();
@@ -1805,6 +1809,11 @@ const mainInit = () => {
 			pausedElapsedTime = null;
 			pausedStartAdjustment = null;
 			g_timeoutEvtId = g_timerHandler.setTimeout(flowTimeline, 1000 / g_fps);
+
+			if (g_workObj.frzReturnPausedFlg) {
+				startFrzReturn();
+				g_workObj.frzReturnPausedFlg = false;
+			}
 		};
 
 		const tick = _remaining => {
@@ -2059,24 +2068,6 @@ const changeAppearanceFilter = (_num = 10) => {
 	return doubleFilterFlg;
 };
 
-/**
- * 判定カウンタ表示作成
- * @param {string} _id 
- * @param {number} _x
- * @param {string} _class 
- * @param {number} _heightPos 
- * @param {string|number} _text
- * @param {string} [_display='inherit'] 表示有無 (inherit: 表示 / none: 非表示)
- * @returns {HTMLDivElement}
- */
-const makeCounterSymbol = (_id, _x, _class, _heightPos, _text, _display = C_DIS_INHERIT) => {
-	return createDivCss2Label(_id, _text, {
-		x: _x, y: g_limitObj.jdgCntsHeight * _heightPos,
-		w: g_limitObj.jdgCntsWidth, h: g_limitObj.jdgCntsHeight, siz: g_limitObj.jdgCntsSiz, align: C_ALIGN_RIGHT,
-		display: _display,
-	}, _class);
-};
-
 /**
  * ステップゾーンの表示・非表示切替
  * @param {number} _j
@@ -2156,6 +2147,7 @@ const executeFrzReturn = (_seq, _idx, _axis) => {
 		// 画面がプレイ画面から移動した場合
 		g_workObj.frzReturnFlg = false;
 		g_workObj.frzReturnTimerId = null;
+		g_workObj.frzReturnPausedFlg = false;
 		return;
 	}
 
@@ -2600,11 +2592,10 @@ const changeLifeColor = (_state = ``) => {
 
 	if (_state !== `` && _state !== g_workObj.currentLifeState) {
 		const lifeCss = g_cssObj[`life_${_state}`];
-		lblLife.classList.remove(g_cssObj.life_Max, g_cssObj.life_Cleared, g_cssObj.life_Failed);
-		lifeBar.classList.remove(g_cssObj.life_Max, g_cssObj.life_Cleared, g_cssObj.life_Failed);
-		lblLife.classList.add(lifeCss);
-		lifeBar.classList.add(lifeCss);
-
+		[lblLife, lifeBar].forEach(elm => {
+			elm.classList.remove(g_cssObj.life_Max, g_cssObj.life_Cleared, g_cssObj.life_Failed);
+			elm.classList.add(lifeCss);
+		});
 		g_workObj.currentLifeState = _state;
 	}
 

package/js/lib/settings.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2026/09/13
- * Revised : 2026/10/10 (v51.3.0)
+ * Revised : 2026/10/12 (v51.4.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -14,7 +14,7 @@
 /* Scene : SETTINGS [lime] */
 /*-----------------------------------------------------------*/
 
-const commonSettingBtn = _labelName => {
+const commonSettingBtn = () => {
 
 	const switchSave = evt => {
 		const from = boolToSwitch(g_stateObj.dataSaveFlg);
@@ -24,6 +24,8 @@ const commonSettingBtn = _labelName => {
 		const to = boolToSwitch(g_stateObj.dataSaveFlg);
 		evt.target.classList.replace(g_cssObj[`button_${from}`], g_cssObj[`button_${to}`]);
 	};
+	const nextPageNum = nextPos(g_settings.settingWindowNum, 1, g_settings.settingWindows.length);
+	const labelName = g_settingWindowTitleKeys.get(g_settings.settingWindows[nextPageNum]);
 
 	multiAppend(divRoot,
 
@@ -42,18 +44,19 @@ const commonSettingBtn = _labelName => {
 		// プレイ開始
 		makePlayButton(() => loadMusic()),
 
-		// Display設定へ移動
-		createCss2Button(`btn${_labelName}`, `>`, () => true, {
+		// 次の設定へ移動
+		createCss2Button(`btnNextSetting`, `>`, () => true, {
 			...g_lblPosObj.btnSwitchSetting,
-			title: g_msgObj[`to${_labelName}`], resetFunc: () => g_moveSettingWindow(),
+			title: g_msgObj[`to${labelName}`], resetFunc: () => g_moveSettingWindow(),
 			cxtFunc: () => g_moveSettingWindow(true, -1),
+			display: g_settings.settingWindows.length > 1 ? C_DIS_INHERIT : C_DIS_NONE,
 		}, g_cssObj.button_Mini),
 
 		// データセーブフラグの切替
 		createCss2Button(`btnSave`, g_lblNameObj.dataSave, evt => switchSave(evt), {
 			...g_lblPosObj.btnSave,
 			cxtFunc: evt => switchSave(evt),
-			visibility: g_langStorage.safeMode === C_FLG_OFF ? C_DIS_INHERIT : `hidden`,
+			display: g_langStorage.safeMode === C_FLG_OFF ? C_DIS_INHERIT : C_DIS_NONE,
 		}, g_cssObj.button_Default, (g_stateObj.dataSaveFlg ? g_cssObj.button_ON : g_cssObj.button_OFF)),
 
 		// データ管理画面へ移動
@@ -170,7 +173,7 @@ const optionInit = () => {
 	safeExecuteCustomHooks(`g_customJsObj.option`, g_customJsObj.option);
 
 	// ボタン描画
-	commonSettingBtn(`Display`);
+	commonSettingBtn();
 
 	// キー操作イベント（デフォルト）
 	setShortcutEvent(g_currentPage, () => true, { dfEvtFlg: true });
@@ -2403,7 +2406,7 @@ const settingsDisplayInit = () => {
 	safeExecuteCustomHooks(`g_customJsObj.settingsDisplay`, g_customJsObj.settingsDisplay);
 
 	// ボタン描画
-	commonSettingBtn(`Settings`);
+	commonSettingBtn();
 
 	// キー操作イベント（デフォルト）
 	setShortcutEvent(g_currentPage);
@@ -3242,7 +3245,7 @@ const exSettingInit = () => {
 	safeExecuteCustomHooks(`g_customJsObj.exSetting`, g_customJsObj.exSetting);
 
 	// 設定系のボタン群をまとめて作成（Data Save, Display切替, Back, KeyConfig, Playボタン）
-	commonSettingBtn(g_currentPage);
+	commonSettingBtn();
 
 	// キー操作イベント（デフォルト）
 	setShortcutEvent(g_currentPage, () => true, { dfEvtFlg: true });

package/package.json

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