danoniplus 47.4.0 → 47.5.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/04/26
+ * Revised : 2026/05/02
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 47.4.0`;
-const g_revisedDate = `2026/04/26`;
+const g_version = `Ver 47.5.0`;
+const g_revisedDate = `2026/05/02`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -3385,17 +3385,15 @@ const storeBaseData = (_scoreId, _scoreObj, _keyCtrlPtn) => {
 			mmWidthBase: (g_sWidth - 500) / 2 + 290,
 			mmMarginY: 2,
 			get laneWidth() {
-				return Math.min(Math.floor((this.mmWidthBase - this.timeMargin) / keyNum), 40);
+				return Math.min((this.mmWidthBase - this.timeMargin) / keyNum, 40);
 			},
 			get logicalWidth() {
-				return this.timeMargin + (this.laneWidth * keyNum);
+				const logicalWidth = this.timeMargin + (this.laneWidth * keyNum);
+				return Math.ceil(logicalWidth * this.dpr) / this.dpr;
 			}
 		},
 	};
 
-	// ヘッダー生成
-	g_detailObj.scoreMinimapHeader[_scoreId] = createMinimapHeader(g_detailObj.miniMapParams[_scoreId].config, _keyCtrlPtn, keyNum);
-
 	// Canvas保存用配列を空で初期化
 	g_detailObj.scoreMinimap[_scoreId] = null;
 	g_detailObj.scoreMinimapReverse[_scoreId] = null;
@@ -3510,7 +3508,7 @@ const createMinimapHeader = (_config, _keyCtrlPtn, _keyNum) => {
 	for (let j = 0; j < _keyNum; j++) {
 		// config.laneWidth を使って中央座標を計算
 		const x = timeMargin + j * laneWidth + laneWidth / 2;
-		const keyText = g_kCd[g_keyObj[`keyCtrl${_keyCtrlPtn}`][j][0]];
+		const keyText = g_kCd[g_keyObj[`keyCtrl${_keyCtrlPtn}`][j][0]].split(` `).join(``);
 
 		ctx.fillText(keyText, x, headerHeight / 2 + 2); // 視覚的な中央調整で +2px
 	}
@@ -4612,8 +4610,11 @@ const headerConvert = _dosObj => {
 
 	g_stateObj.scoreDetail = g_settings.scoreDetails[0] || ``;
 	g_settings.scoreDetailCursors = g_settings.scoreDetails.map(val => `lnk${val}G`);
+	g_settings.scoreDetailCursorsOrg = g_settings.scoreDetailCursors.concat();
 	g_settings.scoreDetailCursors.push(`btnGraphB`);
-	[`option`, `difSelector`].forEach(page => g_shortcutObj[page].KeyQ.id = g_settings.scoreDetailCursors[0]);
+	[`option`, `difSelector`, `scoreDetail`].forEach(page => g_shortcutObj[page].KeyQ.id = g_settings.scoreDetailCursors[0]);
+	g_shortcutObj.scoreDetail.ArrowDown.id = g_settings.scoreDetailCursorsOrg[0];
+	g_shortcutObj.scoreDetail.ArrowUp.id = g_settings.scoreDetailCursorsOrg[nextPos(0, -1, g_settings.scoreDetailCursorsOrg.length)];
 
 	// 判定位置をBackgroundのON/OFFと連動してリセットする設定
 	obj.jdgPosReset = setBoolVal(_dosObj.jdgPosReset, true);
@@ -7290,7 +7291,6 @@ const drawSpeedGraph = _scoreId => {
 		speed: { frame: [0], speed: [1], cnt: 0, strokeColor: g_graphColorObj.speed },
 		boost: { frame: [0], speed: [1], cnt: 0, strokeColor: g_graphColorObj.boost }
 	};
-	const dpr = window.devicePixelRatio || 1;
 
 	const tmpSpeedPoint = [0];
 	Object.keys(speedObj).forEach(speedType => {
@@ -7509,7 +7509,7 @@ const updateScoreDetailLabel = (_name, _label, _value, _pos = 0, _labelname = _l
 	const baseLabel = (_bLabel, _bLabelname, _bAlign) =>
 		document.getElementById(`detail${_name}`).appendChild(
 			createDivCss2Label(_bLabel, _bLabelname, {
-				x: 10, y: 110 + _pos * 20, w: 100, h: 20, siz: g_limitObj.difSelectorSiz, align: _bAlign,
+				x: 10, y: 130 + _pos * 16, w: 100, h: 16, siz: g_limitObj.difSelectorSiz, align: _bAlign,
 			})
 		);
 	if (document.getElementById(`data${_label}`) === null) {
@@ -7880,9 +7880,14 @@ const drawMinimap = (_scoreId, { _initFlg = false, _fadeinFlg = false } = {}) =>
 		? g_detailObj.scoreMinimapReverse[_scoreId]
 		: g_detailObj.scoreMinimap[_scoreId];
 
+	const params = g_detailObj.miniMapParams[_scoreId];
+	const kPtn = params._keyCtrlPtn;
+	if (!g_detailObj.scoreMinimapHeader[kPtn]) {
+		// ヘッダーはキー種ごとに共通なので、未作成の場合のみ生成してキャッシュ
+		g_detailObj.scoreMinimapHeader[kPtn] = createMinimapHeader(params.config, kPtn, params._keyNum);
+	}
 	if (!savedCanvases) {
 		// 未作成の場合のみミニマップを生成（Lazy Generation）
-		const params = g_detailObj.miniMapParams[_scoreId];
 		savedCanvases = generateMinimapData(params, isRev);
 
 		// 生成したものをキャッシュに保存
@@ -7896,7 +7901,7 @@ const drawMinimap = (_scoreId, { _initFlg = false, _fadeinFlg = false } = {}) =>
 	// --- ヘッダー部分 ---
 	const detailMiniMapHeader = createEmptySprite(detailMiniMap, `detailMiniMapHeader`, g_windowObj.detailMiniMapHeader);
 	$id(`detailMiniMapHeader`).top = (g_stateObj.miniMapRevFlg ? 230 + g_sHeight - 500 : 0) + `px`;
-	detailMiniMapHeader.appendChild(g_detailObj.scoreMinimapHeader[_scoreId]);
+	detailMiniMapHeader.appendChild(g_detailObj.scoreMinimapHeader[kPtn]);
 
 	// --- メイン（譜面）部分 ---
 	const detailMiniMapSub = createEmptySprite(detailMiniMap, `detailMiniMapSub`, g_windowObj.detailMiniMapSub);
@@ -8243,7 +8248,6 @@ const createOptionWindow = _sprite => {
 				graphObj.style.top = wUnit(0);
 				graphObj.style.position = `absolute`;
 				graphObj.style.background = j === 0 ? bkColor : `#ffffff00`;
-				graphObj.style.border = `dotted ${wUnit(2)}`;
 				const ctx = graphObj.getContext(`2d`);
 				ctx.scale(dpr, dpr);
 
@@ -8275,6 +8279,8 @@ const createOptionWindow = _sprite => {
 			if (g_currentPage === `difSelector`) {
 				resetDifWindow();
 			}
+			g_currentPage = `scoreDetail`;
+			setShortcutEvent(g_currentPage, () => true, { displayFlg: false });
 			g_stateObj.scoreDetailViewFlg = true;
 			scoreDetail.style.visibility = `visible`;
 			visibleSettingSummary(false);
@@ -8286,7 +8292,9 @@ const createOptionWindow = _sprite => {
 			// 選択先を表示、ボタン色を選択中に変更
 			// Qキーを押したときのリンク先を次の明細へ変更
 			g_stateObj.scoreDetail = g_settings.scoreDetails[_val];
-			[`option`, `difSelector`].forEach(page => g_shortcutObj[page].KeyQ.id = g_settings.scoreDetailCursors[(_val + 1) % g_settings.scoreDetailCursors.length]);
+			[`option`, `difSelector`, `scoreDetail`].forEach(page => g_shortcutObj[page].KeyQ.id = g_settings.scoreDetailCursors[nextPos(_val, 1, g_settings.scoreDetailCursors.length)]);
+			g_shortcutObj.scoreDetail.ArrowDown.id = g_settings.scoreDetailCursorsOrg[nextPos(_val, 1, g_settings.scoreDetailCursorsOrg.length)];
+			g_shortcutObj.scoreDetail.ArrowUp.id = g_settings.scoreDetailCursorsOrg[nextPos(_val, -1, g_settings.scoreDetailCursorsOrg.length)];
 
 			$id(`detail${g_stateObj.scoreDetail}`).visibility = `visible`;
 			document.getElementById(`lnk${g_stateObj.scoreDetail}G`).classList.replace(g_cssObj.button_Default, g_cssObj.button_Setting);
@@ -8332,9 +8340,12 @@ const createOptionWindow = _sprite => {
 		detailObj.style.visibility = visibles[Number(g_stateObj.scoreDetailViewFlg)];
 		visibleSettingSummary(g_stateObj.scoreDetailViewFlg ? false : g_stateObj.settingSummaryVisible);
 
-		// Qキーを押したときのカーソル位置を先頭に初期化
-		if (_resetFlg) {
-			g_shortcutObj.option.KeyQ.id = g_settings.scoreDetailCursors[0];
+		g_currentPage = g_stateObj.scoreDetailViewFlg ? `scoreDetail` : `option`;
+		setShortcutEvent(g_currentPage, () => true, { displayFlg: false });
+
+		// Qキーのカーソル位置は、ハードリセットまたはスコア明細を閉じるときに先頭へ戻す
+		if (_resetFlg || !g_stateObj.scoreDetailViewFlg) {
+			[`option`, `difSelector`, `scoreDetail`].forEach(page => g_shortcutObj[page].KeyQ.id = g_settings.scoreDetailCursors[0]);
 		}
 		document.getElementById(`lnkMiniMapRev`).style.display =
 			g_stateObj.scoreDetail === `MiniMap` && g_stateObj.scoreDetailViewFlg ? C_DIS_INHERIT : C_DIS_NONE;
@@ -12956,7 +12967,6 @@ const mainInit = () => {
 	const dummyArrowCnts = fillArray(keyNum);
 	const dummyFrzCnts = fillArray(keyNum);
 	let speedCnts = 0;
-	let boostCnts = 0;
 	let keychCnts = 0;
 
 	g_workObj.flatMode = g_stateObj.d_stepzone === `FlatBar` ||
@@ -13123,7 +13133,8 @@ const mainInit = () => {
 
 	const makerView = g_headerObj.makerView ? ` (${g_headerObj.creatorNames[g_stateObj.scoreId]})` : ``;
 	const transKeyName = getTransKeyName();
-	let difName = `[${getKeyName(g_headerObj.keyLabels[g_stateObj.scoreId])}${transKeyName} / ${g_headerObj.difLabels[g_stateObj.scoreId]}${assistFlg}${shuffleName}${makerView}]`;
+	const autoAll = g_stateObj.autoAll === C_FLG_ON ? ` &gt; AutoPlay` : ``;
+	let difName = `[${getKeyName(g_headerObj.keyLabels[g_stateObj.scoreId])}${transKeyName} / ${g_headerObj.difLabels[g_stateObj.scoreId]}${assistFlg}${shuffleName}${makerView}${autoAll}]`;
 	let creditName = `${musicTitle} / ${artistName}`;
 	if (checkMusicSiz(creditName, g_limitObj.musicTitleSiz) < 12) {
 		creditName = `${musicTitle}`;
@@ -13557,6 +13568,10 @@ const mainInit = () => {
 			}
 		},
 
+		get dummyArrowON() {
+			return this.dummyArrowOFF;
+		},
+
 		// フリーズアロー(成功時)
 		frzOK: (_j, _k, _frzName, _cnt) => {
 			judgeKita(_cnt);
@@ -13600,10 +13615,11 @@ const mainInit = () => {
 
 		// ダミーフリーズアロー(キーを離したときの処理)
 		// ※処理上通ることはないが、統一のために定義
-		dummyFrzKeyUp: (_j, _k, _frzName, _cnt) => { },
+		get dummyFrzKeyUp() {
+			return this.dummyFrzNG;
+		}
 
 	};
-	judgeMotionFunc.dummyArrowON = (_j, _arrowName, _cnt) => judgeMotionFunc.dummyArrowOFF(_j, _arrowName, _cnt);
 
 	/**
 	 * 次矢印・フリーズアローへ判定を移すかチェック
@@ -13641,8 +13657,12 @@ const mainInit = () => {
 		},
 
 		arrowON: (_j, _k, _cnt) => true,
-		dummyArrowOFF: (_j, _k, _cnt) => true,
-		dummyArrowON: (_j, _k, _cnt) => true,
+		get dummyArrowOFF() {
+			return this.arrowON;
+		},
+		get dummyArrowON() {
+			return this.arrowON;
+		},
 
 		frzOFF: (_j, _k, _cnt) => {
 
@@ -13682,10 +13702,8 @@ const mainInit = () => {
 				changeHitFrz(_j, _k, `dummyFrz`);
 			}
 		},
-		dummyFrzON: (_j, _k, _cnt) => {
-			if (_cnt === 0) {
-				changeHitFrz(_j, _k, `dummyFrz`);
-			}
+		get dummyFrzON() {
+			return this.dummyFrzOFF;
 		},
 	};
 

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/04/25 (v47.3.2)
+ * Revised : 2026/05/02 (v47.5.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -489,31 +489,31 @@ const updateWindowSiz = () => {
             x: 290, y: 145, w: 120, h: 20, siz: 50, align: C_ALIGN_CENTER,
         },
         lblSpdHeader: {
-            x: 5, y: 180, w: 100, h: 20, siz: g_limitObj.difSelectorSiz, align: C_ALIGN_LEFT,
+            x: 5, y: 190, w: 100, h: 20, siz: g_limitObj.difSelectorSiz, align: C_ALIGN_LEFT,
         },
         lblSpdBase: {
-            x: 0, y: 200, w: 40, h: 20, siz: 11.5, fontWeight: `bold`,
+            x: 0, y: 210, w: 40, h: 20, siz: 11.5, fontWeight: `bold`,
         },
         lblSpdOverall: {
-            x: 40, y: 200, w: 40, h: 20, siz: 11.5,
+            x: 40, y: 210, w: 40, h: 20, siz: 11.5,
             color: g_graphColorObj.speedChara, fontWeight: `bold`,
         },
         lblSpdBoost: {
-            x: 80, y: 200, w: 40, h: 20, siz: 11.5,
+            x: 80, y: 210, w: 40, h: 20, siz: 11.5,
             color: g_graphColorObj.boostChara, fontWeight: `bold`,
         },
         lblSpdTotal: {
-            x: 5, y: 215, w: 100, h: 20, siz: g_limitObj.difSelectorSiz,
+            x: 5, y: 225, w: 100, h: 20, siz: g_limitObj.difSelectorSiz,
             align: C_ALIGN_LEFT, fontWeight: `bold`,
         },
         lblSpdFrame: {
-            x: 70, y: 218, w: 50, h: 20, siz: 12, fontWeight: `bold`,
+            x: 70, y: 228, w: 50, h: 20, siz: 12, fontWeight: `bold`,
         },
         btnSpdCursorL: {
-            x: 85, y: 180, w: 15, h: 20, siz: 12,
+            x: 85, y: 190, w: 15, h: 20, siz: 12,
         },
         btnSpdCursorR: {
-            x: 100, y: 180, w: 15, h: 20, siz: 12,
+            x: 100, y: 190, w: 15, h: 20, siz: 12,
         },
         lnkMiniMapRev: {
             w: g_limitObj.difCoverWidth, h: 20, borderStyle: `solid`,
@@ -2762,7 +2762,6 @@ const g_shortcutObj = {
         Numpad5: { id: `lnkMiniMapG` },
         KeyQ: { id: `lnkDensityG` },
         KeyP: { id: `lnkDifInfo` },
-        KeyX: { id: `lnkMiniMapRev` },
         ControlLeft_KeyC: { id: `` },
         ControlRight_KeyC: { id: `` },
         KeyC: { id: `lnkHighScore`, reset: true },
@@ -2776,6 +2775,53 @@ const g_shortcutObj = {
         Tab: { id: `btnDisplay` },
         KeyU: { id: `btnSettingSummary` },
     },
+    scoreDetail: {
+        ShiftLeft_KeyD: { id: `lnkDifficultyL` },
+        ShiftRight_KeyD: { id: `lnkDifficultyL` },
+        KeyD: { id: `lnkDifficultyR` },
+        KeyL: { id: `lnkDifficulty` },
+
+        ShiftLeft_ArrowRight: { id: `lnkSpeedR` },
+        ShiftRight_ArrowRight: { id: `lnkSpeedR` },
+        AltLeft_ArrowRight: { id: `lnkSpeedHR` },
+        AltRight_ArrowRight: { id: `lnkSpeedHR` },
+        ArrowRight: { id: `lnkSpeedRR` },
+        ShiftLeft_ArrowLeft: { id: `lnkSpeedL` },
+        ShiftRight_ArrowLeft: { id: `lnkSpeedL` },
+        AltLeft_ArrowLeft: { id: `lnkSpeedHL` },
+        AltRight_ArrowLeft: { id: `lnkSpeedHL` },
+        ArrowLeft: { id: `lnkSpeedLL` },
+
+        ArrowDown: { id: `lnkDensityG` },
+        ArrowUp: { id: `lnkDensityG` },
+
+        KeyI: { id: `btnGraph` },
+        Digit1: { id: `lnkDensityG` },
+        Digit2: { id: `lnkSpeedG` },
+        Digit3: { id: `lnkToolDifG` },
+        Digit4: { id: `lnkHighScoreG` },
+        Digit5: { id: `lnkMiniMapG` },
+        Numpad1: { id: `lnkDensityG` },
+        Numpad2: { id: `lnkSpeedG` },
+        Numpad3: { id: `lnkToolDifG` },
+        Numpad4: { id: `lnkHighScoreG` },
+        Numpad5: { id: `lnkMiniMapG` },
+        KeyQ: { id: `lnkDensityG` },
+        KeyP: { id: `lnkDifInfo` },
+        KeyX: { id: `lnkMiniMapRev` },
+        ControlLeft_KeyC: { id: `` },
+        ControlRight_KeyC: { id: `` },
+        KeyC: { id: `lnkHighScore`, reset: true },
+
+        Escape: { id: `btnBack` },
+        Space: { id: `btnKeyConfig` },
+        Enter: { id: `btnPlay` },
+        NumpadEnter: { id: `btnPlay` },
+        ShiftLeft_Tab: { id: `btnBack` },
+        ShiftRight_Tab: { id: `btnBack` },
+        Tab: { id: `btnDisplay` },
+        KeyU: { id: `btnSettingSummary` },
+    },
     settingsDisplay: {
         ShiftLeft_KeyA: { id: `lnkAppearanceL` },
         ShiftRight_KeyA: { id: `lnkAppearanceL` },
@@ -2987,7 +3033,8 @@ const g_btnPatterns = {
     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 },
-    difSelector: { 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 },
     loadingIos: { Play: 0 },
@@ -4844,6 +4891,7 @@ const g_lang_msgObj = {
         lnkDensityG: `譜面の密度状況を表示`,
         lnkToolDifG: `譜面の難易度、矢印・フリーズアローの分布状況を表示`,
         lnkHighScoreG: `譜面のハイスコアを表示`,
+        lnkMiniMapG: `譜面内容をミニマップで表示`,
         lnkDifInfo: `譜面の難易度、矢印・フリーズアローの分布状況をクリップボードへコピー`,
         lnkResetHighScore: `譜面のハイスコア情報を消去`,
         lnkHighScore: `譜面のハイスコアをクリップボードへコピー`,
@@ -4944,6 +4992,7 @@ const g_lang_msgObj = {
         lnkDensityG: `Displays the density status of the chart.`,
         lnkToolDifG: `Displays the difficulty level of the chart and the distribution of arrows and freeze arrows.`,
         lnkHighScoreG: `Displays the high score of the chart.`,
+        lnkMiniMapG: `Display chart on the minimap.`,
         lnkDifInfo: `Copy the difficulty of the chart and the distribution of arrows and freeze arrows to the clipboard.`,
         lnkResetHighScore: `Erase the high score information in the chart.`,
         lnkHighScore: `Copies the high score of the chart to the clipboard.`,

package/package.json

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