danoniplus 51.4.0 → 51.4.2

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/10/12
+ * Revised : 2026/10/24
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 51.4.0`;
-const g_revisedDate = `2026/10/12`;
+const g_version = `Ver 51.4.2`;
+const g_revisedDate = `2026/10/24`;
 
 // カスタム用バージョン (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/12 (v51.4.0)
+ * Revised : 2026/10/24 (v51.4.2)
  *
  * 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 },
@@ -1595,17 +1595,18 @@ const g_transPriority = {
  */
 const joinTransforms = _transformMap => {
     if (_transformMap.size === 1) {
-        return _transformMap.values().next().value.transform;
+        return _transformMap.values().next().value.transform ?? ``;
     }
     if (_transformMap.size === 2) {
         const it = _transformMap.values();
         const a = it.next().value;
         const b = it.next().value;
-        return b.priority > a.priority ? `${b.transform} ${a.transform}` : `${a.transform} ${b.transform}`;
+        const [ta, tb] = [a.transform ?? ``, b.transform ?? ``];
+        return b.priority > a.priority ? `${tb} ${ta}` : `${ta} ${tb}`;
     }
     return Array.from(_transformMap.values())
         .sort((a, b) => b.priority - a.priority)
-        .map(v => v.transform)
+        .map(v => v.transform ?? ``)
         .join(` `);
 };
 

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/mainWindow.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2026/09/13
- * Revised : 2026/10/07 (v51.2.2)
+ * Revised : 2026/10/24 (v51.4.2)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -106,8 +106,10 @@ const mainInit = () => {
 		// レイヤーごとのTransition設定
 		// StepAreaオプションにより、レイヤーが倍化される場合があるため基準レイヤー数ごとに設定
 		const transj = j % g_stateObj.layerNumDf;
-		addTransform(`mainSprite${j}`, `mainSprite${j}`,
-			g_workObj.layerTrans[Math.floor(transj / 2) * 2 + (transj + Number(g_stateObj.reverse === C_FLG_ON)) % 2], g_transPriority.layer);
+		const layerTrans = g_workObj.layerTrans[Math.floor(transj / 2) * 2 + (transj + Number(g_stateObj.reverse === C_FLG_ON)) % 2];
+		if (layerTrans !== undefined) {
+			addTransform(`mainSprite${j}`, `mainSprite${j}`, layerTrans, g_transPriority.layer);
+		}
 
 		stepSprite.push(createEmptySprite(mainSpriteJ, `stepSprite${j}`, mainCommonPos));
 		arrowSprite.push(createEmptySprite(mainSpriteJ, `arrowSprite${j}`, { ...mainCommonPos, y: g_workObj.hitPosition * (j % 2 === 0 ? 1 : -1) }));
@@ -405,10 +407,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 +1120,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 +1278,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 +1300,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 +1337,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 +1359,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 +1431,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 +1439,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 +1734,7 @@ const mainInit = () => {
 			// FrzReturn演出はflowTimelineと独立したタイマーで動いているため、
 			// 一時停止時点で早期終了させる(位置復元はせず、通常終了時と同じ後片付けを行う)
 			resetFrzReturn();
+			g_workObj.frzReturnPausedFlg = true;
 		}
 		g_timerHandler.clearTimeout(g_timeoutEvtId);
 		g_audio.pause();
@@ -1805,6 +1811,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 +2070,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 +2149,7 @@ const executeFrzReturn = (_seq, _idx, _axis) => {
 		// 画面がプレイ画面から移動した場合
 		g_workObj.frzReturnFlg = false;
 		g_workObj.frzReturnTimerId = null;
+		g_workObj.frzReturnPausedFlg = false;
 		return;
 	}
 
@@ -2600,11 +2594,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/package.json

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