danoniplus 47.2.0 → 47.4.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/04/22
+ * Revised : 2026/04/26
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 47.2.0`;
-const g_revisedDate = `2026/04/22`;
+const g_version = `Ver 47.4.0`;
+const g_revisedDate = `2026/04/26`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -3451,7 +3451,11 @@ const createSplitCanvases = (_width, _totalHeight, _dpr) => {
 
 /**
  * 描画対象のCanvasを判定して描画を実行する
- * @param {HTMLCanvasElement[]} _canvases
+ * @param {object[]} _canvases
+ * @param {HTMLCanvasElement} _canvases[].canvas 分割されたCanvas要素
+ * @param {CanvasRenderingContext2D} _canvases[].ctx Canvasの描画コンテキスト
+ * @param {number} _canvases[].offsetTop Canvasの論理上のオフセット位置
+ * @param {number} _canvases[].logicalHeight Canvasの論理上の高さ
  * @param {number} _y
  * @param {number} _h
  * @param {number} _dpr
@@ -7286,6 +7290,7 @@ 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 => {
@@ -7890,7 +7895,7 @@ const drawMinimap = (_scoreId, { _initFlg = false, _fadeinFlg = false } = {}) =>
 
 	// --- ヘッダー部分 ---
 	const detailMiniMapHeader = createEmptySprite(detailMiniMap, `detailMiniMapHeader`, g_windowObj.detailMiniMapHeader);
-	$id(`detailMiniMapHeader`).top = (g_stateObj.miniMapRevFlg ? 230 : 0) + `px`;
+	$id(`detailMiniMapHeader`).top = (g_stateObj.miniMapRevFlg ? 230 + g_sHeight - 500 : 0) + `px`;
 	detailMiniMapHeader.appendChild(g_detailObj.scoreMinimapHeader[_scoreId]);
 
 	// --- メイン（譜面）部分 ---
@@ -8229,13 +8234,18 @@ const createOptionWindow = _sprite => {
 				const bkColor = window.getComputedStyle(textBaseObj, ``).backgroundColor;
 
 				graphObj.id = `graph${_name}${j > 0 ? j + 1 : ``}`;
-				graphObj.width = g_limitObj.graphWidth;
-				graphObj.height = g_limitObj.graphHeight;
+				const dpr = window.devicePixelRatio || 1;
+				graphObj.width = g_limitObj.graphWidth * dpr;
+				graphObj.height = g_limitObj.graphHeight * dpr;
+				graphObj.style.width = wUnit(g_limitObj.graphWidth);
+				graphObj.style.height = wUnit(g_limitObj.graphHeight);
 				graphObj.style.left = wUnit(125);
 				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);
 
 				detailObj.appendChild(graphObj);
 			}
@@ -11774,6 +11784,24 @@ const pushArrows = (_dataObj, _speedOnFrame, _firstArrivalFrame) => {
 	/** Motionの適用フレーム数 */
 	g_workObj.motionFrame = [];
 
+	const boostData = [];
+	if (hasArrayList(_dataObj.boostData, 2)) {
+		const _data = _dataObj.boostData.concat();
+		for (let k = 0; k < _data.length; k += 2) {
+			boostData.push({ frame: _data[k], spd: getSpeedFactor(_data[k + 1]) });
+		}
+		if (boostData.length > 0 && boostData[0].frame > 0) {
+			boostData.unshift({ frame: 0, spd: 1 });
+		}
+	}
+	const getSpdByFrame = _targetFrame => {
+		// targetFrame 以下の frame を持つ要素の中で、最後（最新）のものを見つける
+		const result = boostData.findLast((item) => _targetFrame >= item.frame);
+
+		// 該当するものがない場合（frame: 0 未満など）のフォールバック
+		return result ? result.spd : 1;
+	};
+
 	/**
 	 * 矢印・フリーズアローのデータ格納処理
 	 * @param {number} _j 
@@ -11787,9 +11815,14 @@ const pushArrows = (_dataObj, _speedOnFrame, _firstArrivalFrame) => {
 	 * @param {number} object.arrivalFrame
 	 * @param {number} object.motionFrame 
 	 */
-	const setNotes = (_j, _k, _data, _startPoint, _header, _frzFlg = false, { initY, initBoostY, arrivalFrame, motionFrame } = {}) => {
+	const setNotes = (_j, _k, _data, _startPoint, _header, _frzFlg = false, { initY, initBoostY, arrivalFrame, motionFrame, boostSpd } = {}) => {
 		if (_startPoint >= 0) {
-			const arrowAttrs = { pos: _j, initY, initBoostY, arrivalFrame, motionFrame };
+			const arrowAttrs = {
+				pos: _j, initY, initBoostY, arrivalFrame, motionFrame, boostSpd,
+				get boostDir() {
+					return Math.sign(this.boostSpd);
+				}
+			};
 			if (g_workObj[`mk${_header}Arrow`][_startPoint] === undefined) {
 				g_workObj[`mk${_header}Arrow`][_startPoint] = [arrowAttrs];
 			} else {
@@ -11848,12 +11881,15 @@ const pushArrows = (_dataObj, _speedOnFrame, _firstArrivalFrame) => {
 		g_workObj.arrivalFrame[frmPrev] = tmpObj.arrivalFrm;
 		g_workObj.motionFrame[frmPrev] = tmpObj.motionFrm;
 		g_workObj.initBoostY[frmPrev] = calcInitBoostY(frmPrev);
+		let minNotesFrame = startPoint[lastk];
 
 		if (_frzFlg) {
 			g_workObj[`mk${camelHeader}Length`][_j] = [];
 		}
-		setNotes(_j, lastk, _data, startPoint[lastk], camelHeader, _frzFlg,
-			{ initY: tmpObj.startY, initBoostY: g_workObj.initBoostY[frmPrev], arrivalFrame: tmpObj.arrivalFrm, motionFrame: tmpObj.motionFrm });
+		setNotes(_j, lastk, _data, startPoint[lastk], camelHeader, _frzFlg, {
+			initY: tmpObj.startY, initBoostY: g_workObj.initBoostY[frmPrev],
+			arrivalFrame: tmpObj.arrivalFrm, motionFrame: tmpObj.motionFrm, boostSpd: getSpdByFrame(arrowArrivalFrm)
+		});
 
 		// 矢印は1つずつ、フリーズアローは2つで1セット
 		for (let k = lastk - setcnt; k >= 0; k -= setcnt) {
@@ -11896,10 +11932,46 @@ const pushArrows = (_dataObj, _speedOnFrame, _firstArrivalFrame) => {
 				g_workObj.initBoostY[frmPrev] = calcInitBoostY(frmPrev);
 			}
 
+			// --- 逆転検知ロジック ---
+			// 後ろからループしているため、minNotesFrameには「自分より譜面上後ろにあるノーツ」の
+			// 最小生成フレーム（最も早く出現するもの）が入っている。
+
+			// 「自分より後ろのノーツ」の方が、「自分」よりも早く出現する場合、
+			// 配列の順序と出現時間の順序が入れ替わっている（逆転）とみなす。
+			// 逆転している場合は、最小生成フレームまでさらに遡って、出現フレームを再計算する。
+			if (minNotesFrame < startPoint[k]) {
+
+				const getAdjArrowStartFrame = (_obj, _speedOnFrame, _targetFrame) => {
+					while (_obj.frm > _targetFrame) {
+						_obj.startY += _speedOnFrame[_obj.frm - 1];
+
+						if (_speedOnFrame[_obj.frm - 1] !== 0) {
+							_obj.motionFrm++;
+						}
+						_obj.frm--;
+						_obj.arrivalFrm++;
+					}
+					return _obj;
+				};
+				tmpObj = getAdjArrowStartFrame(tmpObj, _speedOnFrame, minNotesFrame);
+				startPoint[k] = tmpObj.frm;
+				frmPrev = tmpObj.frm;
+				g_workObj.initY[frmPrev] = tmpObj.startY;
+				g_workObj.arrivalFrame[frmPrev] = tmpObj.arrivalFrm;
+				g_workObj.motionFrame[frmPrev] = tmpObj.motionFrm;
+				g_workObj.initBoostY[frmPrev] = calcInitBoostY(frmPrev);
+			}
+
+			// 最小値を更新
+			if (startPoint[k] < minNotesFrame) {
+				minNotesFrame = startPoint[k];
+			}
+
 			// 出現タイミングを保存
-			setNotes(_j, k, _data, startPoint[k], camelHeader, _frzFlg,
-				{ initY: tmpObj.startY, initBoostY: g_workObj.initBoostY[frmPrev], arrivalFrame: tmpObj.arrivalFrm, motionFrame: tmpObj.motionFrm }
-			);
+			setNotes(_j, k, _data, startPoint[k], camelHeader, _frzFlg, {
+				initY: tmpObj.startY, initBoostY: g_workObj.initBoostY[frmPrev],
+				arrivalFrame: tmpObj.arrivalFrm, motionFrame: tmpObj.motionFrm, boostSpd: getSpdByFrame(arrowArrivalFrm)
+			});
 		}
 	};
 
@@ -11914,30 +11986,6 @@ const pushArrows = (_dataObj, _speedOnFrame, _firstArrivalFrame) => {
 		calcNotes(j, _dataObj.dummyFrzData[j], `dummyFrz`, true);
 	}
 
-	// 個別加速のタイミング更新
-	const calcBoostData = _data => {
-		if (hasArrayList(_data, 2)) {
-			let delIdx = 0;
-			for (let k = _data.length - 2; k >= 0; k -= 2) {
-				const tmpObj = getArrowStartFrame(_data[k], _speedOnFrame);
-				if (tmpObj.frm < g_scoreObj.frameNum) {
-					_data[k] = g_scoreObj.frameNum;
-					delIdx = k;
-					break;
-				} else {
-					_data[k] = tmpObj.frm;
-				}
-				_data[k + 1] = getSpeedFactor(_data[k + 1]);
-			}
-			for (let k = 0; k < delIdx; k++) {
-				_data.shift();
-			}
-			return _data;
-		}
-		return [];
-	};
-	g_workObj.boostData = calcBoostData(_dataObj.boostData);
-
 	/**
 	 * 色変化・モーションデータ・スクロール反転データのタイミング更新
 	 * - この関数を使用する場合、配列グループの先頭2つが「フレーム数、矢印番号」となっていないと動作しない
@@ -12998,10 +13046,8 @@ const mainInit = () => {
 	// EffectのArrowEffect追加処理
 	g_effectFunc.get(g_stateObj.effect)();
 
-	// 現在の矢印・フリーズアローの速度、個別加算速度の初期化 (速度変化時に直す)
+	// 現在の矢印・フリーズアローの速度の初期化 (速度変化時に直す)
 	g_workObj.currentSpeed = 2;
-	g_workObj.boostSpd = 1;
-	g_workObj.boostDir = 1;
 
 	// 開始位置、楽曲再生位置の設定
 	const firstFrame = g_scoreObj.frameNum;
@@ -13672,8 +13718,8 @@ const mainInit = () => {
 
 		const arrowName = `${_name}${_j}_${_arrowCnt}`;
 		const stepY = C_STEP_Y + g_posObj.reverseStepY * dividePos;
-		const firstPosY = stepY + (_attrs.initY * g_workObj.boostSpd +
-			_attrs.initBoostY * g_workObj.boostDir) * g_workObj.scrollDir[_j];
+		const firstPosY = stepY + (_attrs.initY * _attrs.boostSpd +
+			_attrs.initBoostY * _attrs.boostDir) * g_workObj.scrollDir[_j];
 
 		const arrowRoot = createEmptySprite(arrowSprite[g_workObj.dividePos[_j]], arrowName, {
 			x: 0, y: 0, w: C_ARW_WIDTH, h: C_ARW_WIDTH,
@@ -13687,13 +13733,13 @@ const mainInit = () => {
 			// 生存フレーム数 (ストップ分除去、個別加速/Motionオプション用)
 			boostCnt: _attrs.motionFrame,
 			// 個別加速量
-			boostSpd: g_workObj.boostSpd,
+			boostSpd: _attrs.boostSpd,
 			// ステップゾーン位置 (0: デフォルト, 1: リバース)
 			dividePos: dividePos,
 			// スクロール方向 (1: デフォルト, -1: リバース)
 			dir: g_workObj.scrollDir[_j],
 			// 個別加速方向 (1: 順方向加速, -1: 逆方向加速)
-			boostDir: g_workObj.boostDir,
+			boostDir: _attrs.boostDir,
 			// 前フレーム時の位置 (判定で使用)
 			prevY: firstPosY,
 			// 現フレーム時の位置
@@ -13788,9 +13834,9 @@ const mainInit = () => {
 		const frzNo = `${_j}_${_arrowCnt}`;
 		const frzName = `${_name}${frzNo}`;
 		const stepY = C_STEP_Y + g_posObj.reverseStepY * dividePos;
-		const firstPosY = stepY + (_attrs.initY * g_workObj.boostSpd +
-			_attrs.initBoostY * g_workObj.boostDir) * g_workObj.scrollDir[_j];
-		const firstBarLength = g_workObj[`mk${toCapitalize(_name)}Length`][_j][(_arrowCnt - 1) * 2] * g_workObj.boostSpd;
+		const firstPosY = stepY + (_attrs.initY * _attrs.boostSpd +
+			_attrs.initBoostY * _attrs.boostDir) * g_workObj.scrollDir[_j];
+		const firstBarLength = g_workObj[`mk${toCapitalize(_name)}Length`][_j][(_arrowCnt - 1) * 2] * _attrs.boostSpd;
 
 		const frzRoot = createEmptySprite(arrowSprite[g_workObj.dividePos[_j]], frzName, {
 			x: 0, y: 0, w: C_ARW_WIDTH, h: C_ARW_WIDTH + firstBarLength,
@@ -13818,13 +13864,13 @@ const mainInit = () => {
 			// キーを離していたフレーム数 (基準値超えでNG判定)
 			keyUpFrame: 0,
 			// 個別加速量
-			boostSpd: g_workObj.boostSpd,
+			boostSpd: _attrs.boostSpd,
 			// ステップゾーン位置 (0: デフォルト, 1: リバース)
 			dividePos: dividePos,
 			// スクロール方向 (1: デフォルト, -1: リバース)
 			dir: g_workObj.scrollDir[_j],
 			// 個別加速方向 (1: 順方向加速, -1: 逆方向加速)
-			boostDir: g_workObj.boostDir,
+			boostDir: _attrs.boostDir,
 			// 現フレーム時のフリーズアロー本体の位置
 			y: firstPosY,
 			// フリーズアロー(帯)の相対位置
@@ -14036,11 +14082,6 @@ const mainInit = () => {
 			g_workObj.currentSpeed = g_workObj.speedData[speedCnts + 1];
 			speedCnts += 2;
 		}
-		while (currentFrame >= g_workObj.boostData?.[boostCnts]) {
-			g_workObj.boostSpd = g_workObj.boostData[boostCnts + 1];
-			g_workObj.boostDir = (g_workObj.boostSpd > 0 ? 1 : -1);
-			boostCnts += 2;
-		}
 
 		objList.forEach(header => {
 			const headerU = toCapitalize(header);
@@ -15422,8 +15463,12 @@ const resultInit = () => {
 	for (let j = 0; j < 2; j++) {
 		const canvas = document.createElement(`canvas`);
 		canvas.id = `graphGaugeTransition${j > 0 ? j + 1 : ``}`;
-		canvas.width = g_limitObj.gaugeTransitionWidth;
-		canvas.height = g_limitObj.gaugeTransitionHeight;
+		const dpr = window.devicePixelRatio || 1;
+		canvas.width = g_limitObj.gaugeTransitionWidth * dpr;
+		canvas.height = g_limitObj.gaugeTransitionHeight * dpr;
+		canvas.style.width = wUnit(g_limitObj.gaugeTransitionWidth);
+		canvas.style.height = wUnit(g_limitObj.gaugeTransitionHeight);
+		canvas.getContext(`2d`).scale(dpr, dpr);
 		canvas.style.left = wUnit(0);
 		canvas.style.top = wUnit(0);
 		canvas.style.position = `absolute`;
@@ -15550,13 +15595,14 @@ const resultInit = () => {
 
 		const canvas = document.getElementById(`graphGaugeTransition2`);
 		const ctx = canvas.getContext(`2d`);
-		const x = cursorFrame / playingFrame * canvas.width;
-		ctx.clearRect(0, 0, canvas.width, canvas.height);
+		const [w, h] = [parseInt(canvas.style.width), parseInt(canvas.style.height)];
+		const x = cursorFrame / playingFrame * w;
+		ctx.clearRect(0, 0, w, h);
 
 		// 縦線
 		ctx.beginPath();
 		ctx.moveTo(x, 0);
-		ctx.lineTo(x, canvas.height);
+		ctx.lineTo(x, h);
 		ctx.strokeStyle = "#009999";
 		ctx.lineWidth = 1.5;
 		ctx.stroke();
@@ -15565,10 +15611,10 @@ const resultInit = () => {
 		const timer = transFrameToTimer(cursorFrame + startFrame);
 		ctx.font = `14px ${getBasicFont()}`;
 		ctx.fillStyle = "#009999";
-		ctx.textAlign = x > canvas.width * 0.8 ? C_ALIGN_RIGHT : C_ALIGN_LEFT;
+		ctx.textAlign = x > w * 0.8 ? C_ALIGN_RIGHT : C_ALIGN_LEFT;
 		ctx.fillText(
 			`${timer}`,
-			x > canvas.width * 0.8 ? x - 5 : x + 5,
+			x > w * 0.8 ? x - 5 : x + 5,
 			g_limitObj.gaugeTransitionHeight - 35
 		);
 	};
@@ -15733,22 +15779,28 @@ const resultInit = () => {
 		tmpDiv.style.background = `#000000cc`;
 		const canvas = document.createElement(`canvas`);
 		const artistName = g_headerObj.artistNames[g_headerObj.musicNos[g_stateObj.scoreId]] || g_headerObj.artistName;
+		const dpr = window.devicePixelRatio || 1;
+		const logicalWidth = 400;
+		const logicalHeight = g_sHeight - 90;
 
 		canvas.id = `resultImage`;
-		canvas.width = 400;
-		canvas.height = g_sHeight - 90;
-		canvas.style.left = wUnit((g_sWidth - canvas.width) / 2);
+		canvas.width = logicalWidth * dpr;
+		canvas.height = logicalHeight * dpr;
+		canvas.style.width = wUnit(logicalWidth);
+		canvas.style.height = wUnit(logicalHeight);
+		canvas.style.left = wUnit((g_sWidth - parseFloat(canvas.style.width)) / 2);
 		canvas.style.top = wUnit(20);
 		canvas.style.position = `absolute`;
 
 		const context = canvas.getContext(`2d`);
+		context.scale(dpr, dpr);
 		const drawText = (_text, { x = 30, dy = 0, hy, siz = 15, color = `#cccccc`, align = C_ALIGN_LEFT, font } = {}) => {
 			context.font = `${wUnit(siz)} ${getBasicFont(font)}`;
 			context.fillStyle = color;
 			context.textAlign = align;
 			context.fillText(_text, x, 35 + hy * 18 + dy);
 		};
-		makeBgCanvas(context, { h: canvas.height });
+		makeBgCanvas(context, { w: logicalWidth, h: logicalHeight });
 
 		drawText(`R`, { dy: -5, hy: 0, siz: 40, color: `#9999ff` });
 		drawText(`ESULT`, { x: 57, dy: -5, hy: 0, siz: 25 });

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/04/21 (v47.1.0)
+ * Revised : 2026/04/25 (v47.3.2)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -212,9 +212,9 @@ const updateWindowSiz = () => {
         difCover: { x: 20, y: 60, w: 145, h: 270 + g_sHeight - 500, opacity: 0.95, pointerEvents: C_DIS_AUTO },
         difFilter: { x: 0, y: 66, w: 140, h: 204 + g_sHeight - 500, overflow: C_DIS_AUTO, pointerEvents: C_DIS_AUTO },
         displaySprite: { x: 25, y: 30, w: (g_sWidth - 450) / 2, h: g_limitObj.setLblHeight * 5 },
-        scoreDetail: { x: 20, y: 85, w: (g_sWidth - 500) / 2 + 420, h: 245, visibility: `hidden`, pointerEvents: C_DIS_AUTO },
+        scoreDetail: { x: 20, y: 85, w: (g_sWidth - 500) / 2 + 420, h: 245 + g_sHeight - 500, visibility: `hidden`, pointerEvents: C_DIS_AUTO },
         detailMiniMapHeader: { x: 110, y: 0, w: (g_sWidth - 500) / 2 + 310, h: 15 },
-        detailMiniMapSub: { x: 110, y: 15, w: (g_sWidth - 500) / 2 + 310, h: 230, overflow: C_DIS_AUTO, pointerEvents: C_DIS_AUTO },
+        detailMiniMapSub: { x: 110, y: 15, w: (g_sWidth - 500) / 2 + 310, h: 230 + g_sHeight - 500, overflow: C_DIS_AUTO, pointerEvents: C_DIS_AUTO },
         detailObj: { w: (g_sWidth - 500) / 2 + 420, h: 230, visibility: `hidden` },
         keyconSprite: { y: 105, h: g_sHeight - 105, overflow: C_DIS_AUTO },
         loader: { y: g_sHeight - 10, h: 10, backgroundColor: `#333333` },

package/package.json

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