danoniplus 44.5.4 → 45.1.0

package/js/danoni_main.js

@@ -8,7 +8,7 @@
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 44.5.4`;
+const g_version = `Ver 45.1.0`;
 const g_revisedDate = `2026/02/26`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -1687,12 +1687,12 @@ const createEmptySprite = (_parentObj, _newObjId, { x = 0, y = 0, w = g_sWidth,
  * @param {number} [object.x=0]
  * @returns {HTMLDivElement}
  */
-const createMultipleSprite = (_baseName, _num, { x = 0 } = {}) => {
+const createMultipleSprite = (_baseName, _num, { x = 0, priority = g_transPriority.layer } = {}) => {
 	const sprite = createEmptySprite(divRoot, _baseName);
 	for (let j = 0; j <= _num; j++) {
 		createEmptySprite(sprite, `${_baseName}${j}`);
 	}
-	addX(_baseName, `root`, x);
+	addX(_baseName, `root`, x, { priority });
 	return sprite;
 };
 
@@ -7908,9 +7908,7 @@ const createGeneralSetting = (_obj, _settingName, { unitName = ``,
 	const initName = `${getStgDetailName(g_stateObj[_settingName])}${unitName}`;
 	_obj.appendChild(createLblSetting(settingUpper, adjY, toCapitalize(settingLabel)));
 
-	if (_settingName === `speed` || (
-		g_headerObj[`${_settingName}Use`] === undefined || g_headerObj[`${_settingName}Use`]
-	)) {
+	if (g_headerObj[`${_settingName}Use`] === undefined || g_headerObj[`${_settingName}Use`]) {
 
 		multiAppend(_obj,
 			makeSettingLblCssButton(linkId, `${initName}${g_localStorage[_settingName] === g_stateObj[_settingName] ? ' *' : ''}`, 0,
@@ -8775,7 +8773,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 		[tkObj.keyCtrlPtn, tkObj.keyNum, tkObj.posMax, tkObj.divideCnt];
 
 	g_keyCopyLists.simpleDef.forEach(header => updateKeyInfo(header, keyCtrlPtn));
-	addTransform(`keyconSprite`, `root`, `scale(${g_keyObj.scale})`)
+	addTransform(`keyconSprite`, `root`, `scale(${g_keyObj.scale})`, g_transPriority.scale);
 	keyconSprite.style.height = `${parseFloat(keyconSprite.style.height) / ((1 + g_keyObj.scale) / 2)}px`;
 	const kWidth = parseInt(keyconSprite.style.width);
 	changeSetColor();
@@ -10337,7 +10335,7 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 		const dosSpeedData = getRefData(_header, `${_scoreNo}${_footer}`);
 		const speedData = [];
 
-		if (hasVal(dosSpeedData) && g_stateObj.d_speed !== C_FLG_OFF) {
+		if (hasVal(dosSpeedData) && g_stateObj.d_velocity !== C_FLG_OFF) {
 			const tmpArrayData = splitLF(dosSpeedData);
 
 			tmpArrayData.filter(data => hasVal(data)).forEach(tmpData => {
@@ -10919,11 +10917,11 @@ const getSpeedFactor = _speed => {
 		// ±1 はそのまま返して符号を保持
 		return _speed;
 	}
-	if (g_stateObj.d_speed === `Extreme`) {
+	if (g_stateObj.d_velocity === `Extreme`) {
 		// |speed|>1 を強めに、<1 を弱めに
 		return _speed * (Math.abs(_speed) > 1 ? 1.5 : 0.75);
 	}
-	if (g_stateObj.d_speed === `Soft`) {
+	if (g_stateObj.d_velocity === `Soft`) {
 		// 変化幅を緩和（符号は維持）
 		return (1 + Math.abs(_speed)) / 2 * Math.sign(_speed);
 	}
@@ -12086,17 +12084,16 @@ const mainInit = () => {
 		mainSprite.style.transformOrigin = `center 55%`;
 	}
 
-	addTransform(`mainSprite`, `root`, `scale(${g_workObj.scale})`);
-	addXY(`mainSprite`, `root`, g_workObj.playingX, g_posObj.stepY - C_STEP_Y + g_headerObj.playingY);
+	addTransform(`mainSprite`, `root`, `scale(${g_workObj.scale})`, g_transPriority.scale);
+	addXY(`mainSprite`, `root`, g_workObj.playingX, g_posObj.stepY - C_STEP_Y + g_headerObj.playingY, { priority: g_transPriority.base });
 
 	// 曲情報・判定カウント用スプライトを作成（メインスプライトより上位）
 	const infoSprite = createEmptySprite(divRoot, `infoSprite`, mainCommonPos);
-	addXY(`infoSprite`, `root`, g_workObj.playingX, g_headerObj.playingY);
+	addXY(`infoSprite`, `root`, g_workObj.playingX, g_headerObj.playingY, { priority: g_transPriority.base });
 
 	// 判定系スプライトを作成（メインスプライトより上位）
 	const judgeSprite = createEmptySprite(divRoot, `judgeSprite`, mainCommonPos);
-	addXY(`judgeSprite`, `root`, g_workObj.playingX, g_headerObj.playingY);
-
+	addXY(`judgeSprite`, `root`, g_workObj.playingX, g_headerObj.playingY, { priority: g_transPriority.base });
 	const tkObj = getKeyInfo();
 	const [keyCtrlPtn, keyNum] = [tkObj.keyCtrlPtn, tkObj.keyNum];
 
@@ -12150,7 +12147,7 @@ const mainInit = () => {
 		// StepAreaオプションにより、レイヤーが倍化される場合があるため基準レイヤー数ごとに設定
 		const transj = j % g_stateObj.layerNumDf;
 		addTransform(`mainSprite${j}`, `mainSprite${j}`,
-			g_keyObj[`layerTrans${keyCtrlPtn}`]?.[0]?.[Math.floor(transj / 2) * 2 + (transj + Number(g_stateObj.reverse === C_FLG_ON)) % 2]);
+			g_keyObj[`layerTrans${keyCtrlPtn}`]?.[0]?.[Math.floor(transj / 2) * 2 + (transj + Number(g_stateObj.reverse === C_FLG_ON)) % 2], g_transPriority.layer);
 
 		stepSprite.push(createEmptySprite(mainSpriteJ, `stepSprite${j}`, mainCommonPos));
 		arrowSprite.push(createEmptySprite(mainSpriteJ, `arrowSprite${j}`, Object.assign({ y: g_workObj.hitPosition * (j % 2 === 0 ? 1 : -1) }, mainCommonPos)));
@@ -12202,7 +12199,7 @@ const mainInit = () => {
 	g_stepAreaFunc.get(g_stateObj.stepArea)();
 
 	// mainSpriteのtransform追加処理
-	addTransform(`mainSprite`, `playWindow`, g_playWindowFunc.get(g_stateObj.playWindow)());
+	addTransform(`mainSprite`, `playWindow`, g_playWindowFunc.get(g_stateObj.playWindow)(), g_transPriority.playWindow);
 
 	// EffectのArrowEffect追加処理
 	g_effectFunc.get(g_stateObj.effect)();
@@ -12213,7 +12210,7 @@ const mainInit = () => {
 
 	// Shaking初期化
 	if (g_stateObj.shaking !== C_FLG_OFF) {
-		addXY(`mainSprite`, `shaking`, 0, 0);
+		addXY(`mainSprite`, `shaking`, 0, 0, { priority: g_transPriority.shaking });
 	}
 
 	// 現在の矢印・フリーズアローの速度、個別加算速度の初期化 (速度変化時に直す)
@@ -12674,6 +12671,7 @@ const mainInit = () => {
 	const judgeObjDelete = {};
 	g_typeLists.arrow.forEach(type =>
 		judgeObjDelete[type] = (_j, _deleteName) => {
+			delTransform(_deleteName, `root`);
 			g_workObj[`judg${toCapitalize(type)}Cnt`][_j]++;
 			document.getElementById(_deleteName).remove();
 			delete g_attrObj[_deleteName];
@@ -12892,8 +12890,8 @@ const mainInit = () => {
 			(_attrs.initY * g_workObj.boostSpd +
 				_attrs.initBoostY * g_workObj.boostDir) * g_workObj.scrollDir[_j];
 
-		const stepRoot = createEmptySprite(arrowSprite[g_workObj.dividePos[_j]], arrowName, {
-			x: g_workObj.stepX[_j], y: firstPosY, w: C_ARW_WIDTH, h: C_ARW_WIDTH,
+		const arrowRoot = createEmptySprite(arrowSprite[g_workObj.dividePos[_j]], arrowName, {
+			x: g_workObj.stepX[_j], y: 0, w: C_ARW_WIDTH, h: C_ARW_WIDTH,
 		});
 		/**
 		 * 矢印毎の属性情報
@@ -12916,14 +12914,17 @@ const mainInit = () => {
 			// 現フレーム時の位置
 			y: firstPosY,
 		};
+		addTransform(arrowName, `root`, `translateY(${wUnit(firstPosY)})`);
+
 		// 矢印色の設定
 		// - 枠/塗りつぶし色: g_attrObj[arrowName].Arrow / ArrowShadow
 		g_typeLists.arrowColor.forEach(val => g_attrObj[arrowName][`Arrow${val}`] = g_workObj[`${_name}${val}Colors`][_j]);
-		arrowSprite[g_workObj.dividePos[_j]].appendChild(stepRoot);
+		arrowSprite[g_workObj.dividePos[_j]].appendChild(arrowRoot);
+		const arrowSubRoot = createEmptySprite(arrowRoot, `sub${arrowName}`, { x: 0, y: 0, w: C_ARW_WIDTH, h: C_ARW_WIDTH });
 
 		if (g_workObj[`${_name}CssMotions`][_j] !== ``) {
-			stepRoot.classList.add(g_workObj[`${_name}CssMotions`][_j]);
-			stepRoot.style.animationDuration = `${_attrs.arrivalFrame / g_fps}s`;
+			arrowSubRoot.classList.add(g_workObj[`${_name}CssMotions`][_j]);
+			arrowSubRoot.style.animationDuration = `${_attrs.arrivalFrame / g_fps}s`;
 		}
 
 		/**
@@ -12940,11 +12941,11 @@ const mainInit = () => {
 			if (_shadowColor === `Default`) {
 				arrShadow.style.opacity = 0.5;
 			}
-			stepRoot.appendChild(arrShadow);
+			arrowSubRoot.appendChild(arrShadow);
 		}
 
 		// 矢印 (枠)
-		stepRoot.appendChild(createColorObject2(`${_name}Top${_j}_${_arrowCnt}`, {
+		arrowSubRoot.appendChild(createColorObject2(`${_name}Top${_j}_${_arrowCnt}`, {
 			background: _color, rotate: g_workObj.arrowRtn[_j],
 		}));
 		g_customJsObj.makeArrow.forEach(func => func(_attrs, arrowName, _name, _arrowCnt));
@@ -12969,7 +12970,7 @@ const mainInit = () => {
 			currentArrow.prevY = currentArrow.y;
 			currentArrow.y -= (g_workObj.currentSpeed * currentArrow.boostSpd +
 				(g_workObj.motionOnFrames[boostCnt] || 0) * currentArrow.boostDir) * currentArrow.dir;
-			$id(arrowName).top = wUnit(currentArrow.y);
+			addTransform(arrowName, `root`, `translateY(${wUnit(currentArrow.y)})`);
 			g_motionAlphaFunc.get(g_stateObj.motion)(arrowName, currentArrow);
 			currentArrow.boostCnt--;
 		}
@@ -12999,7 +13000,7 @@ const mainInit = () => {
 		const firstBarLength = g_workObj[`mk${toCapitalize(_name)}Length`][_j][(_arrowCnt - 1) * 2] * g_workObj.boostSpd;
 
 		const frzRoot = createEmptySprite(arrowSprite[g_workObj.dividePos[_j]], frzName, {
-			x: g_workObj.stepX[_j], y: firstPosY, w: C_ARW_WIDTH, h: C_ARW_WIDTH + firstBarLength,
+			x: g_workObj.stepX[_j], y: 0, w: C_ARW_WIDTH, h: C_ARW_WIDTH + firstBarLength,
 		});
 		/**
 		 * フリーズアロー毎の属性情報
@@ -13032,6 +13033,8 @@ const mainInit = () => {
 			// フリーズアロー(対矢印)の相対位置
 			btmY: firstBarLength * g_workObj.scrollDir[_j],
 		};
+		addTransform(frzName, `root`, `translateY(${wUnit(firstPosY)})`);
+
 		// フリーズアロー色の設定
 		// - 通常時 (矢印枠/矢印塗りつぶし/帯): g_attrObj[frzName].Normal / NormalShadow / NormalBar
 		// - ヒット時 (矢印枠/矢印塗りつぶし/帯): g_attrObj[frzName].Hit / HitShadow / HitBar
@@ -13044,12 +13047,13 @@ const mainInit = () => {
 		});
 		arrowSprite[g_workObj.dividePos[_j]].appendChild(frzRoot);
 		let shadowColor = _shadowColor === `Default` ? _normalColor : _shadowColor;
+		const frzSubRoot = createEmptySprite(frzRoot, `sub${frzName}`, { x: 0, y: 0, w: C_ARW_WIDTH, h: C_ARW_WIDTH + firstBarLength });
 
 		/**
 		 * フリーズアローオブジェクトの生成
 		 * - 後で生成されたものが手前に表示されるため、以下の順で作成
 		 */
-		multiAppend(frzRoot,
+		multiAppend(frzSubRoot,
 
 			// フリーズアロー帯(frzBar)
 			createColorObject2(`${_name}Bar${frzNo}`, {
@@ -13057,9 +13061,9 @@ const mainInit = () => {
 				opacity: 0.75,
 			}),
 		);
-		const frzTopRoot = createEmptySprite(frzRoot, `${_name}TopRoot${frzNo}`,
+		const frzTopRoot = createEmptySprite(frzSubRoot, `${_name}TopRoot${frzNo}`,
 			{ x: 0, y: 0, w: C_ARW_WIDTH, h: C_ARW_WIDTH });
-		const frzBtmRoot = createEmptySprite(frzRoot, `${_name}BtmRoot${frzNo}`,
+		const frzBtmRoot = createEmptySprite(frzSubRoot, `${_name}BtmRoot${frzNo}`,
 			{ x: 0, y: g_attrObj[frzName].btmY, w: C_ARW_WIDTH, h: C_ARW_WIDTH });
 
 		multiAppend(frzTopRoot,
@@ -13089,8 +13093,8 @@ const mainInit = () => {
 
 		);
 		if (g_workObj[`${_name}CssMotions`][_j] !== ``) {
-			frzRoot.classList.add(g_workObj[`${_name}CssMotions`][_j]);
-			frzRoot.style.animationDuration = `${_attrs.arrivalFrame / g_fps}s`;
+			frzSubRoot.classList.add(g_workObj[`${_name}CssMotions`][_j]);
+			frzSubRoot.style.animationDuration = `${_attrs.arrivalFrame / g_fps}s`;
 		}
 		if (g_workObj[`${_name}ArrowCssMotions`][_j] !== ``) {
 			[frzTopRoot, frzBtmRoot].forEach(obj => {
@@ -13123,7 +13127,7 @@ const mainInit = () => {
 				if (g_workObj.currentSpeed !== 0) {
 					currentFrz.prevY = currentFrz.y;
 					currentFrz.y -= movY + (g_workObj.motionOnFrames[currentFrz.boostCnt] || 0) * currentFrz.dir * currentFrz.boostDir;
-					$id(frzName).top = wUnit(currentFrz.y);
+					addTransform(frzName, `root`, `translateY(${wUnit(currentFrz.y)})`);
 					g_motionAlphaFunc.get(g_stateObj.motion)(frzName, currentFrz);
 					currentFrz.boostCnt--;
 				}
@@ -13163,7 +13167,7 @@ const mainInit = () => {
 			currentFrz.frzBarLength -= movY * currentFrz.dir;
 			if (currentFrz.frzBarLength > 0) {
 				currentFrz.y -= movY;
-				$id(frzName).top = wUnit(currentFrz.y);
+				addTransform(frzName, `root`, `translateY(${wUnit(currentFrz.y)})`);
 			} else {
 				judgeObjDelete[_name](_j, frzName);
 			}
@@ -13576,19 +13580,20 @@ const changeAppearanceFilter = (_num = 10) => {
 		$id(`arrowSprite${topNum + j}`).clipPath = topShape;
 		$id(`arrowSprite${bottomNum + j}`).clipPath = bottomShape;
 
-		addY(`filterBar${topNum + j}`, `appearance`, parseFloat($id(`arrowSprite${j}`).top) + topDist);
-		addY(`filterBar${bottomNum + j}`, `appearance`, parseFloat($id(`arrowSprite${j + 1}`).top) + bottomDist);
+		addY(`filterBar${topNum + j}`, `appearance`, parseFloat($id(`arrowSprite${j}`).top) + topDist, { priority: g_transPriority.layer });
+		addY(`filterBar${bottomNum + j}`, `appearance`, parseFloat($id(`arrowSprite${j + 1}`).top) + bottomDist, { priority: g_transPriority.layer });
 
 		if (![`Default`, `Halfway`].includes(g_stateObj.stepArea)) {
-			addY(`filterBar${bottomNum + j}_HS`, `appearance`, parseFloat($id(`arrowSprite${j}`).top) + bottomDist);
-			addY(`filterBar${topNum + j}_HS`, `appearance`, parseFloat($id(`arrowSprite${j + 1}`).top) + topDist);
+			addY(`filterBar${bottomNum + j}_HS`, `appearance`, parseFloat($id(`arrowSprite${j}`).top) + bottomDist, { priority: g_transPriority.layer });
+			addY(`filterBar${topNum + j}_HS`, `appearance`, parseFloat($id(`arrowSprite${j + 1}`).top) + topDist, { priority: g_transPriority.layer });
 		}
 	}
 
 	// フィルターバーのパーセント表示（フィルターバーが複数表示されるなど複雑なため、最初の階層グループの位置に追従）
 	if (g_appearanceRanges.includes(g_stateObj.appearance)) {
 		const currentBarNum = g_hidSudObj.std[g_stateObj.appearance][g_stateObj.reverse];
-		$id(`filterView`).top = $id(`filterBar${currentBarNum % 2}`).top;
+		addY(`filterView`, `appearance`, parseFloat($id(`arrowSprite${currentBarNum % 2}`).top) +
+			(currentBarNum % 2 === 0 ? bottomDist : topDist), { priority: g_transPriority.layer });
 		filterView.textContent = `${_num}%`;
 		g_hidSudObj.filterPos = _num;
 	}
@@ -13678,12 +13683,12 @@ const changeReturn = (_rad, _axis) => {
 		}
 		sprite.style.opacity = isBack ? 0.7 : 1;
 
-		addTransform(`mainSprite`, `frzReturn`, _transform);
+		addTransform(`mainSprite`, `frzReturn`, _transform, g_transPriority.frzReturn);
 
 		if (_rad < 360 && g_workObj.frzReturnFlg) {
 			setTimeout(() => changeReturn(_rad + 4, _axis), 20);
 		} else {
-			addTransform(`mainSprite`, `frzReturn`, ``);
+			delTransform(`mainSprite`, `frzReturn`);
 			g_workObj.frzReturnFlg = false;
 		}
 	}
@@ -13781,7 +13786,7 @@ const changeScrollArrowDirs = (_frameNum) => {
 			tmpObj.set(g_workObj.dividePos[targetj], g_workObj.mkScrollchArrowLayerTrans[_frameNum][j]);
 		}
 	});
-	tmpObj.forEach((val, key, map) => addTransform(`mainSprite${key}`, `scrollch`, val));
+	tmpObj.forEach((val, key, map) => addTransform(`mainSprite${key}`, `scrollch`, val, g_transPriority.layer));
 };
 
 /**
@@ -13831,7 +13836,6 @@ const changeHitFrz = (_j, _k, _name, _difFrame = 0) => {
 
 	// フリーズアロー位置の修正（ステップゾーン上に来るように）
 	const delFrzLength = parseFloat($id(`stepRoot${_j}`).top) - currentFrz.y;
-	$id(frzName).top = $id(`stepRoot${_j}`).top;
 
 	// 早押ししたboostCnt分のフリーズアロー終端位置の修正
 	const delFrzMotionLength = sumData(g_workObj.motionOnFrames.slice(0, currentFrz.boostCnt + 1));
@@ -13844,6 +13848,7 @@ const changeHitFrz = (_j, _k, _name, _difFrame = 0) => {
 	currentFrz.btmY -= delFrzLength + delFrzMotionLength + hitPos;
 	currentFrz.y += delFrzLength;
 	currentFrz.isMoving = false;
+	addTransform(frzName, `root`, `translateY(${wUnit(currentFrz.y)})`);
 
 	/**
 	 * フリーズアロー(ヒット時)の色変更
@@ -15132,7 +15137,7 @@ const getSelectedSettingList = (_shuffleName) => {
 	}
 
 	let display2Data = [
-		withDisplays(g_stateObj.d_speed, C_FLG_ON, g_lblNameObj.rd_Speed),
+		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),

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/02/23 (v44.5.2)
+ * Revised : 2026/02/26 (v45.1.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1154,7 +1154,7 @@ const g_stateObj = {
     d_filterline: C_FLG_ON,
 
     d_color: C_FLG_ON,
-    d_speed: C_FLG_ON,
+    d_velocity: C_FLG_ON,
     d_arroweffect: C_FLG_ON,
     d_lyrics: C_FLG_ON,
     d_background: C_FLG_ON,
@@ -1313,7 +1313,7 @@ const g_settings = {
 
     // Display設定の拡張リスト
     d_stepZones: [`FlatBar`],
-    d_speeds: [`Extreme`, `Soft`],
+    d_velocitys: [`Extreme`, `Soft`],
 
     displayNum: {
         stepZone: 0,
@@ -1322,7 +1322,7 @@ const g_settings = {
         lifeGauge: 0,
         score: 0,
         musicInfo: 0,
-        speed: 0,
+        velocity: 0,
         color: 0,
         lyrics: 0,
         background: 0,
@@ -1388,6 +1388,15 @@ const g_moveSettingWindow = (_changePageFlg = true, _direction = 1) => {
 const g_transforms = {};
 const g_posXs = {};
 const g_posYs = {};
+const g_transPriority = {
+    base: 0,
+    layer: 10,
+    playWindow: 100,
+    stepArea: 110,
+    frzReturn: 120,
+    shaking: 130,
+    scale: 200,
+};
 
 /**
  * idごとのtransformを追加・変更
@@ -1395,13 +1404,37 @@ const g_posYs = {};
  * @param {string} _id 
  * @param {string} _transformId
  * @param {string} _transform 
+ * @param {number} [_priority=1000] transformの優先度（数値が小さいほど優先される。デフォルトは1000）
  */
-const addTransform = (_id, _transformId, _transform) => {
+const addTransform = (_id, _transformId, _transform, _priority = 1000) => {
     if (g_transforms[_id] === undefined) {
         g_transforms[_id] = new Map();
     }
-    g_transforms[_id].set(_transformId, _transform);
-    $id(_id).transform = Array.from(g_transforms[_id].values()).join(` `);
+    g_transforms[_id].set(_transformId, { transform: _transform, priority: _priority });
+    $id(_id).transform = Array.from(g_transforms[_id].values())
+        .sort((a, b) => b.priority - a.priority)
+        .map(v => v.transform)
+        .join(` `);
+};
+
+/**
+ * id, transformIdに合致するtransformの削除
+ * @param {string} _id 
+ * @param {string} _transformId 
+ */
+const delTransform = (_id, _transformId) => {
+    if (g_transforms[_id]) {
+        g_transforms[_id].delete(_transformId);
+        if (g_transforms[_id].size === 0) {
+            delete g_transforms[_id];
+            $id(_id).transform = ``;
+            return;
+        }
+        $id(_id).transform = Array.from(g_transforms[_id].values())
+            .sort((a, b) => b.priority - a.priority)
+            .map(v => v.transform)
+            .join(` `);
+    }
 };
 
 /**
@@ -1427,7 +1460,7 @@ const resetTransform = () => {
  * @returns {string}
  */
 const getTransform = (_id, _transformId) => {
-    return g_transforms[_id]?.[_transformId] || ``;
+    return g_transforms[_id]?.get(_transformId)?.transform || ``;
 };
 
 /**
@@ -1435,10 +1468,11 @@ const getTransform = (_id, _transformId) => {
  * @param {string} _id 
  * @param {string} _typeId 
  * @param {number} [_x=0] 
- * @param {boolean} [_overwrite=false] 
+ * @param {boolean} [overwrite=false] 
+ * @param {number} [priority=1000] transformの優先度（数値が小さいほど優先される。デフォルトは1000）
  */
-const addX = (_id, _typeId, _x = 0, _overwrite = false) => {
-    if (_overwrite) {
+const addX = (_id, _typeId, _x = 0, { overwrite = false, priority = 1000 } = {}) => {
+    if (overwrite) {
         delete g_posXs?.[_id];
     }
     if (g_posXs[_id] === undefined) {
@@ -1446,7 +1480,7 @@ const addX = (_id, _typeId, _x = 0, _overwrite = false) => {
     }
     if (g_posXs[_id].get(_typeId) !== _x) {
         g_posXs[_id].set(_typeId, _x);
-        $id(_id).left = `${sumData(Array.from(g_posXs[_id].values()))}px`;
+        addTransform(_id, `posX`, `translateX(${sumData(Array.from(g_posXs[_id].values()))}px)`, priority);
     }
 };
 
@@ -1455,10 +1489,11 @@ const addX = (_id, _typeId, _x = 0, _overwrite = false) => {
  * @param {string} _id 
  * @param {string} _typeId 
  * @param {number} [_y=0] 
- * @param {boolean} [_overwrite=false] 
+ * @param {boolean} [overwrite=false] 
+ * @param {number} [priority=1000] transformの優先度（数値が小さいほど優先される。デフォルトは1000）
  */
-const addY = (_id, _typeId, _y = 0, _overwrite = false) => {
-    if (_overwrite) {
+const addY = (_id, _typeId, _y = 0, { overwrite = false, priority = 1000 } = {}) => {
+    if (overwrite) {
         delete g_posYs?.[_id];
     }
     if (g_posYs[_id] === undefined) {
@@ -1466,7 +1501,7 @@ const addY = (_id, _typeId, _y = 0, _overwrite = false) => {
     }
     if (g_posYs[_id].get(_typeId) !== _y) {
         g_posYs[_id].set(_typeId, _y);
-        $id(_id).top = `${sumData(Array.from(g_posYs[_id].values()))}px`;
+        addTransform(_id, `posY`, `translateY(${sumData(Array.from(g_posYs[_id].values()))}px)`, priority);
     }
 };
 
@@ -1476,8 +1511,14 @@ const addY = (_id, _typeId, _y = 0, _overwrite = false) => {
  * @param {string} _typeId 
  */
 const delX = (_id, _typeId) => {
+    if (g_posXs[_id] === undefined) return;
     g_posXs[_id]?.delete(_typeId);
-    $id(_id).left = `${sumData(Array.from(g_posXs[_id].values()))}px`;
+    if (g_posXs[_id].size === 0) {
+        delTransform(_id, `posX`);
+        return;
+    }
+    const priority = g_transforms[_id]?.get(`posX`)?.priority ?? 1000;
+    addTransform(_id, `posX`, `translateX(${sumData(Array.from(g_posXs[_id].values()))}px)`, priority);
 };
 
 /**
@@ -1486,8 +1527,14 @@ const delX = (_id, _typeId) => {
  * @param {string} _typeId 
  */
 const delY = (_id, _typeId) => {
+    if (g_posYs[_id] === undefined) return;
     g_posYs[_id]?.delete(_typeId);
-    $id(_id).top = `${sumData(Array.from(g_posYs[_id].values()))}px`;
+    if (g_posYs[_id].size === 0) {
+        delTransform(_id, `posY`);
+        return;
+    }
+    const priority = g_transforms[_id]?.get(`posY`)?.priority ?? 1000;
+    addTransform(_id, `posY`, `translateY(${sumData(Array.from(g_posYs[_id].values()))}px)`, priority);
 };
 
 /**
@@ -1496,11 +1543,30 @@ const delY = (_id, _typeId) => {
  * @param {string} _typeId 
  * @param {number} _x 
  * @param {number} _y 
- * @param {boolean} [_overwrite=false]
+ * @param {boolean} [overwrite=false]
+ * @param {number} [priority=1000] transformの優先度（数値が小さいほど優先される。デフォルトは1000）
  */
-const addXY = (_id, _typeId, _x = 0, _y = 0, _overwrite = false) => {
-    addX(_id, _typeId, _x, _overwrite);
-    addY(_id, _typeId, _y, _overwrite);
+const addXY = (_id, _typeId, _x = 0, _y = 0, { overwrite = false, priority = 1000 } = {}) => {
+    addX(_id, _typeId, _x, { overwrite, priority });
+    addY(_id, _typeId, _y, { overwrite, priority });
+};
+
+/**
+ * 座標を回転させた場合の変換処理
+ * @param {number} _x 
+ * @param {number} _y 
+ * @param {number} _angleDeg 
+ * @returns {object} {x: number, y: number}
+ */
+const rotateXY = (_x, _y, _angleDeg) => {
+    const rad = _angleDeg * Math.PI / 180;
+    const cos = Math.cos(rad);
+    const sin = Math.sin(rad);
+
+    const rx = _x * cos - _y * sin;
+    const ry = _x * sin + _y * cos;
+
+    return { x: rx, y: ry };
 };
 
 /**
@@ -1667,7 +1733,7 @@ const g_stepAreaFunc = new Map([
     }],
     ['Mismatched', () => {
         for (let j = 0; j < g_stateObj.layerNum; j++) {
-            addTransform(`mainSprite${j}`, `stepArea`, `rotate(${getDirFromLayer(j) * -15}deg)`);
+            addTransform(`mainSprite${j}`, `stepArea`, `rotate(${getDirFromLayer(j) * -15}deg)`, g_transPriority.stepArea);
         }
         if (g_workObj.orgFlatFlg) {
             g_arrowGroupSprite.forEach(sprite => {
@@ -1679,7 +1745,7 @@ const g_stepAreaFunc = new Map([
     }],
     ['R-Mismatched', () => {
         for (let j = 0; j < g_stateObj.layerNum; j++) {
-            addTransform(`mainSprite${j}`, `stepArea`, `rotate(${getDirFromLayer(j) * 15}deg)`);
+            addTransform(`mainSprite${j}`, `stepArea`, `rotate(${getDirFromLayer(j) * 15}deg)`, g_transPriority.stepArea);
         }
         if (g_workObj.orgFlatFlg) {
             g_arrowGroupSprite.forEach(sprite => {
@@ -1698,13 +1764,13 @@ const g_stepAreaFunc = new Map([
     }],
     ['X-Flower', () => {
         for (let j = 0; j < g_stateObj.layerNum; j++) {
-            addTransform(`mainSprite${j}`, `stepArea`, `rotate(${getDirFromLayer(j) * -15}deg)`);
+            addTransform(`mainSprite${j}`, `stepArea`, `rotate(${getDirFromLayer(j) * -15}deg)`, g_transPriority.stepArea);
         }
     }],
     ['Alt-Crossing', () => {
         for (let j = 0; j < g_stateObj.layerNum; j++) {
             addTransform(`mainSprite${j}`, `stepArea`, `rotate(${getDirFromLayer(j) * -10}deg) ` +
-                `translateX(${getDirFromLayer(j) * 20}px)`);
+                `translateX(${getDirFromLayer(j) * 20}px)`, g_transPriority.stepArea);
         }
     }],
 ]);
@@ -1861,7 +1927,7 @@ const g_keycons = {
 };
 
 let g_displays = [`stepZone`, `judgment`, `fastSlow`, `lifeGauge`, `score`, `musicInfo`, `filterLine`,
-    `speed`, `color`, `lyrics`, `background`, `arrowEffect`, `special`];
+    `velocity`, `color`, `lyrics`, `background`, `arrowEffect`, `special`];
 
 // ローカルストレージ保存対象
 let g_storeSettings = [`adjustment`, `volume`, `appearance`, `opacity`, `hitPosition`];
@@ -1870,7 +1936,7 @@ let g_storeSettings = [`adjustment`, `volume`, `appearance`, `opacity`, `hitPosi
 let g_storeSettingsEx = [`d_stepzone`, `d_judgment`, `d_fastslow`, `d_lifegauge`,
     `d_score`, `d_musicinfo`, `d_filterline`];
 
-let g_canDisabledSettings = [`motion`, `scroll`, `reverse`, `shuffle`, `autoPlay`, `gauge`,
+let g_canDisabledSettings = [`speed`, `motion`, `scroll`, `reverse`, `shuffle`, `autoPlay`, `gauge`,
     `excessive`, `appearance`, `playWindow`, `stepArea`, `frzReturn`, `shaking`, `effect`, `camoufrage`,
     `swapping`, `judgRange`, `autoRetry`];
 
@@ -2463,8 +2529,8 @@ const g_shortcutObj = {
         ShiftRight_Digit6: { id: `lnkmusicInfoR` },
         ShiftLeft_Digit7: { id: `lnkfilterLineR` },
         ShiftRight_Digit7: { id: `lnkfilterLineR` },
-        ShiftLeft_Digit8: { id: `lnkspeedR` },
-        ShiftRight_Digit8: { id: `lnkspeedR` },
+        ShiftLeft_Digit8: { id: `lnkvelocityR` },
+        ShiftRight_Digit8: { id: `lnkvelocityR` },
         ShiftLeft_Digit9: { id: `lnkcolorR` },
         ShiftRight_Digit9: { id: `lnkcolorR` },
         ShiftLeft_Digit0: { id: `lnklyricsR` },
@@ -2483,7 +2549,7 @@ const g_shortcutObj = {
         Digit5: { id: `lnkscore` },
         Digit6: { id: `lnkmusicInfo` },
         Digit7: { id: `lnkfilterLine` },
-        Digit8: { id: `lnkspeed` },
+        Digit8: { id: `lnkvelocity` },
         Digit9: { id: `lnkcolor` },
         Digit0: { id: `lnklyrics` },
         Semicolon: { id: `lnkbackground` },
@@ -2504,8 +2570,8 @@ const g_shortcutObj = {
         ShiftRight_Numpad6: { id: `lnkmusicInfoR` },
         ShiftLeft_Numpad7: { id: `lnkfilterLineR` },
         ShiftRight_Numpad7: { id: `lnkfilterLineR` },
-        ShiftLeft_Numpad8: { id: `lnkspeedR` },
-        ShiftRight_Numpad8: { id: `lnkspeedR` },
+        ShiftLeft_Numpad8: { id: `lnkvelocityR` },
+        ShiftRight_Numpad8: { id: `lnkvelocityR` },
         ShiftLeft_Numpad9: { id: `lnkcolorR` },
         ShiftRight_Numpad9: { id: `lnkcolorR` },
         ShiftLeft_Numpad0: { id: `lnklyricsR` },
@@ -2524,7 +2590,7 @@ const g_shortcutObj = {
         Numpad5: { id: `lnkscore` },
         Numpad6: { id: `lnkmusicInfo` },
         Numpad7: { id: `lnkfilterLine` },
-        Numpad8: { id: `lnkspeed` },
+        Numpad8: { id: `lnkvelocity` },
         Numpad9: { id: `lnkcolor` },
         Numpad0: { id: `lnklyrics` },
         NumpadAdd: { id: `lnkbackground` },
@@ -4091,7 +4157,7 @@ const g_lblNameObj = {
     d_Score: `Score`,
     d_MusicInfo: `MusicInfo`,
     d_FilterLine: `FilterLine`,
-    d_Speed: `Velocity`,
+    d_Velocity: `Velocity`,
     d_Color: `Color`,
     d_Lyrics: `Lyrics`,
     d_Background: `Background`,
@@ -4218,7 +4284,7 @@ const g_lblNameObj = {
     'u_Shakin(Great)': `Shakin(Great)`,
     'u_Fast/Slow': `Fast/Slow`,
 
-    'u_Speed': `Velocity`,
+    'u_Velocity': `Velocity`,
     'u_Density': `Density`,
     'u_ToolDif': `DifLevel`,
     'u_HighScore': `HighScore`,
@@ -4264,7 +4330,7 @@ const g_lblNameObj = {
     rd_Score: `Score`,
     rd_MusicInfo: `MusicInfo`,
     rd_FilterLine: `Filter`,
-    rd_Speed: `Speed`,
+    rd_Velocity: `Velocity`,
     rd_Color: `Color`,
     rd_Lyrics: `Lyrics`,
     rd_Background: `Back`,
@@ -4432,7 +4498,7 @@ const g_lang_msgObj = {
         d_score: `現時点の判定数を表示`,
         d_musicinfo: `音楽情報（時間表示含む）`,
         d_filterline: `Hidden+, Sudden+使用時のフィルターの境界線表示`,
-        d_speed: `途中変速、個別加速の有効化設定`,
+        d_velocity: `途中変速、個別加速の有効化設定`,
         d_color: `色変化の有効化設定`,
         d_lyrics: `歌詞表示の有効化設定`,
         d_background: `背景・マスクモーションの有効化設定`,
@@ -4525,7 +4591,7 @@ const g_lang_msgObj = {
         d_score: `Display the current number of judgments`,
         d_musicinfo: `Display the music credits and current time`,
         d_filterline: `Filter border display when using "Hidden+" or "Sudden+"`,
-        d_speed: `Enable speed change settings`,
+        d_velocity: `Enable velocity change settings`,
         d_color: `Enable color change settings`,
         d_lyrics: `Enable lyrics display`,
         d_background: `Enable background images and animations`,
@@ -4548,7 +4614,7 @@ const g_lang_msgObj = {
         judgRange: `Set the allowable range of judgment.\n[Normal] Normal judgment, [Narrow/Hard] Hard judgment, [ExHard] Very hard judgment`,
         autoRetry: `Set the conditions for automatic retry.\n[Miss] When missed, [Matari] When good, [Shakin] When great, [FS] When Fast/Slow occurs`,
 
-        lnkSpeedG: `Displays the speed change status by progression of the chart.`,
+        lnkSpeedG: `Displays the velocity change status by progression of the chart.`,
         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.`,

package/js/template/danoni_setting.js

@@ -1,7 +1,7 @@
 'use strict';
 /**
  * Dancing☆Onigiri 設定用jsファイル
- * Template Update: 2025/03/16 (v40.6.0)
+ * Template Update: 2026/02/26 (v45.0.0)
  * 
  * このファイルでは、作品全体に対しての初期設定を行うことができます。
  * 譜面データ側で個別に同様の項目が設定されている場合は、譜面データ側の設定が優先されます。
@@ -185,7 +185,7 @@ g_presetObj.customDesignUse = {
 	Flat時ステップ間隔：50(px) ※矢印サイズ
 	リモート時のディレクトリ：`` (指定なし。自サーバーの画像を使用する)
 */
-//g_presetObj.imageSets = [``, `classic,png`, `classic-thin,png`, `note,svg,false,0`];
+g_presetObj.imageSets = [``, `classic,png`, `classic-thin,png`, `note,svg,false,0`];
 
 /**
   デフォルト画像セット (C_IMG_XXXX, 厳密にはg_imgObj) に対して拡張子の上書きを行うか設定
@@ -226,6 +226,7 @@ g_presetObj.customDesignUse = {
   Display設定の場合は `true,OFF`(設定は有効だが初期値はOFF)といったことができる
 */
 g_presetObj.settingUse = {
+	// speed : `true`,
 	motion: `true`,
 	scroll: `true`,
 	// reverse: `true`,
@@ -242,7 +243,7 @@ g_presetObj.settingUse = {
 	//	score: `true`,
 	//	musicInfo: `true`,
 	//	filterLine: `true`,
-	//	speed: `true`,
+	//	velocity: `true`,
 	//	color: `true`,
 	//	lyrics: `true`,
 	//	background: `true`,
@@ -403,10 +404,17 @@ g_presetObj.msg = {
  * 設定名の上書き可否設定
  */
 g_presetObj.lblRenames = {
+	//  title: true,
+	//  dataMgt: true,
+	//  precondition: true,
 	option: true,
+	difSelector: true,
 	settingsDisplay: true,
-	main: true,
+	exSetting: true,
 	keyConfig: true,
+	//  loading: true,
+	//  loadingIos: true,
+	main: true,
 	result: true,
 };
 

package/package.json

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