danoniplus 43.1.1 → 43.2.1

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2025/09/21
+ * Revised : 2025/12/30
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 43.1.1`;
-const g_revisedDate = `2025/09/21`;
+const g_version = `Ver 43.2.1`;
+const g_revisedDate = `2025/12/30`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -2350,13 +2350,28 @@ class AudioPlayer {
 		this._eventListeners[`canplaythrough`]?.forEach(_listener => _listener());
 	}
 
+	/**
+	 * 再生処理
+	 * @param {number} _adjustmentTime
+	 * - 実際の再生開始時間は、scheduleLead + _adjustmentTime から開始される
+	 * - ただしゲーム内での経過時間計算は _adjustmentTime を基準に行う
+	 * - scheduleLead は安定した再生タイミングを確保するための内部マージン
+	 */
 	play(_adjustmentTime = 0) {
 		this._source = this._context.createBufferSource();
 		this._source.buffer = this._buffer;
 		this._source.playbackRate.value = this.playbackRate;
 		this._source.connect(this._gain);
-		this._startTime = this._context.currentTime;
-		this._source.start(this._context.currentTime + _adjustmentTime, this._fadeinPosition);
+
+		// 内部スケジューリング用のマージン時間(100ms)
+		const scheduleLead = 0.1;
+
+		// 実際の予約時刻（内部スケジューリング用のマージンを含む）
+		const startAt = this._context.currentTime + scheduleLead + _adjustmentTime;
+		this._source.start(startAt, this._fadeinPosition);
+
+		// ゲーム側の論理的開始時刻（scheduleLead を含めない）
+		this._startTime = this._context.currentTime + _adjustmentTime;
 	}
 
 	pause() {
@@ -2697,7 +2712,7 @@ const initialControl = async () => {
 
 	// 未使用のg_keyObjプロパティを削除
 	const keyProp = g_keyCopyLists.simple.concat(g_keyCopyLists.multiple, `keyCtrl`, `keyName`, `minWidth`, `ptchara`);
-	const delKeyPropList = [`ptchara7`, `keyTransPattern`, `dfPtnNum`, `minKeyCtrlNum`, `minPatterns`];
+	const delKeyPropList = [`ptchara7`, `dfPtnNum`, `minKeyCtrlNum`, `minPatterns`];
 	Object.keys(g_keyObj).forEach(key => {
 		const type = keyProp.find(prop => key.startsWith(prop)) || ``;
 		if (type !== ``) {
@@ -4592,6 +4607,23 @@ const getKeyUnitName = _key => unEscapeHtml(escapeHtml(g_keyObj[`keyName${_key}`
 const getTransKeyName = (_spaceFlg = false) => hasVal(g_keyObj[`transKey${g_keyObj.currentKey}_${g_keyObj.currentPtn}`])
 	? (_spaceFlg ? ` ` : ``) + `(${g_keyObj[`transKey${g_keyObj.currentKey}_${g_keyObj.currentPtn}`]})` : ``;
 
+/**
+ * ハイスコア定義を行う際のストレージキー名の取得
+ * @param {string} _key 
+ * @param {string} _transName 
+ * @param {string} _assistFlg 
+ * @param {string} _mirrorName 
+ * @param {string} _scoreId 
+ * @returns {string}
+ */
+const getStorageKeyName = (_key, _transName, _assistFlg, _mirrorName, _scoreId) => {
+	let scoreName = `${_key}${_transName}${getStgDetailName('k-')}${g_headerObj.difLabels[_scoreId]}${_assistFlg}${_mirrorName}`;
+	if (g_headerObj.makerView) {
+		scoreName += `-${g_headerObj.creatorNames[_scoreId]}`;
+	}
+	return scoreName;
+};
+
 /**
  * KeyBoardEvent.code の値をCW Edition用のキーコードに変換
  * 簡略指定ができるように、以下の記述を許容
@@ -5525,7 +5557,7 @@ const pauseBGM = () => {
 	}
 	[`bgmLooped`, `bgmFadeIn`, `bgmFadeOut`].forEach(id => {
 		if (g_stateObj[id]) {
-			clearInterval(g_stateObj[id]);
+			clearTimeout(g_stateObj[id]);
 			g_stateObj[id] = null;
 		}
 	});
@@ -5549,95 +5581,177 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 	const musicEnd = g_headerObj.musicEnds?.[currentIdx] ?? 0;
 	const isTitle = () => g_currentPage === `title` && _currentLoopNum === g_settings.musicLoopNum;
 
+	/**
+	 * 汎用フェード処理
+	 * @param {number} startVolume - 開始音量 (0〜1)
+	 * @param {number} endVolume - 終了音量 (0〜1)
+	 * @param {number} step - 1ステップの増減量
+	 * @param {function} onEnd - フェード完了時の処理
+	 * @param {function} isValid - フェード継続条件（true: 継続, false: 中断）
+	 * @returns {number} timeoutId
+	 */
+	const fadeVolume = (startVolume, endVolume, step, onEnd, isValid) => {
+
+		// 開始時点で終了音量とイコールの場合は終了
+		if (startVolume === endVolume || step === 0) {
+			g_audio.volume = endVolume;
+			onEnd(true);
+			return null;
+		}
+
+		let volume = startVolume;
+		g_audio.volume = startVolume;
+
+		const stepFunc = () => {
+			// 継続条件チェック
+			if (!isValid()) {
+				onEnd(false); // 中断
+				return;
+			}
+
+			// 終了判定
+			const reached =
+				(startVolume < endVolume && volume >= endVolume) ||
+				(startVolume > endVolume && volume <= endVolume);
+
+			if (reached) {
+				g_audio.volume = endVolume;
+				onEnd(true); // 正常終了
+				return;
+			}
+
+			// 音量更新
+			volume += step;
+			g_audio.volume = Math.min(Math.max(volume, 0), 1);
+
+			// 次のステップへ
+			setTimeout(stepFunc, FADE_INTERVAL_MS);
+		};
+
+		return setTimeout(stepFunc, FADE_INTERVAL_MS);
+	};
+
+	/**
+	 * 汎用ポーリング（監視）処理
+	 * @param {function} check - 条件チェック関数（true なら終了）
+	 * @param {function} onEnd - 終了時の処理
+	 * @param {function} isValid - 継続条件（true: 継続, false: 中断）
+	 * @returns {number} timeoutId
+	 */
+	const poll = (check, onEnd, isValid) => {
+		const step = () => {
+			// 継続条件チェック
+			if (!isValid()) {
+				onEnd(false); // 中断
+				return;
+			}
+
+			// 条件成立
+			if (check()) {
+				onEnd(true); // 正常終了
+				return;
+			}
+
+			// 次のチェックへ
+			setTimeout(step, FADE_INTERVAL_MS);
+		};
+
+		return setTimeout(step, FADE_INTERVAL_MS);
+	};
+
 	/**
 	 * BGMのフェードアウトとシーク
 	 */
 	const fadeOutAndSeek = () => {
-		let volume = g_audio.volume;
-		const fadeInterval = setInterval(() => {
-			if (volume > FADE_STEP && isTitle()) {
-				volume -= FADE_STEP;
-				g_audio.volume = Math.max(volume, 0);
-			} else {
-				clearInterval(fadeInterval);
+		const start = g_audio.volume;
+		const end = 0;
+
+		g_stateObj.bgmFadeOut = fadeVolume(
+			start,
+			end,
+			-FADE_STEP,
+			/* onEnd */
+			(finished) => {
 				g_stateObj.bgmFadeOut = null;
+
+				if (!finished) return; // 中断された
+
 				g_audio.pause();
 				g_audio.currentTime = musicStart;
 
-				// フェードイン開始
 				if (isTitle()) {
 					setTimeout(() => {
 						fadeIn();
-						if (encodeFlg) {
-							// base64エンコード時はtimeupdateイベントが発火しないため、
-							// setIntervalで時間を取得する
-							repeatBGM();
-						}
+						if (encodeFlg) repeatBGM();
 					}, FADE_DELAY_MS);
 				} else {
 					pauseBGM();
 				}
-			}
-		}, FADE_INTERVAL_MS);
-		g_stateObj.bgmFadeOut = fadeInterval;
+			},
+			/* isValid */
+			() =>
+				isTitle() &&
+				g_stateObj.bgmFadeOut !== null
+		);
 	};
 
 	/**
 	 * BGMのフェードイン
 	 */
 	const fadeIn = () => {
-		if (!(g_audio instanceof AudioPlayer) && !g_audio.src) {
-			return;
-		}
-		let volume = 0;
+		if (!(g_audio instanceof AudioPlayer) && !g_audio.src) return;
+
+		const start = 0;
+		const end = g_stateObj.bgmVolume / 100;
+
+		g_audio.volume = 0;
 		g_audio.play();
-		const fadeInterval = setInterval(() => {
-			if (volume < g_stateObj.bgmVolume / 100 && isTitle()) {
-				volume += FADE_STEP;
-				g_audio.volume = Math.min(volume, 1);
-			} else {
-				clearInterval(fadeInterval);
-				g_stateObj.bgmFadeIn = null;
-			}
 
-			// フェードイン中に楽曲が変更された場合は停止
-			if (currentIdx !== g_headerObj.musicIdxList[g_settings.musicIdxNum]) {
-				pauseBGM();
-				clearInterval(fadeInterval);
+		g_stateObj.bgmFadeIn = fadeVolume(
+			start,
+			end,
+			FADE_STEP,
+			/* onEnd */
+			() => {
 				g_stateObj.bgmFadeIn = null;
-			}
-		}, FADE_INTERVAL_MS);
-		g_stateObj.bgmFadeIn = fadeInterval;
+			},
+			/* isValid */
+			() =>
+				isTitle() &&
+				g_stateObj.bgmFadeIn !== null &&
+				currentIdx === g_headerObj.musicIdxList[g_settings.musicIdxNum]
+		);
 	};
 
 	/**
-	 * BGMのループ処理
+	 * BGMのループ処理 (base64エンコード時用)
+	 * - base64エンコード時はtimeupdateイベントが発火しないため、setIntervalで時間を取得する
 	 */
 	const repeatBGM = () => {
-		if (encodeFlg) {
-			// base64エンコード時はtimeupdateイベントが発火しないため、setIntervalで時間を取得する
-			const repeatCheck = setInterval((num = g_settings.musicIdxNum) => {
+		const numAtStart = g_settings.musicIdxNum;
+
+		g_stateObj.bgmLooped = poll(
+			/* check */
+			() => {
 				try {
-					if (((g_audio.elapsedTime >= musicEnd) ||
-						num !== g_settings.musicIdxNum) && g_stateObj.bgmLooped !== null) {
-						clearInterval(repeatCheck);
-						g_stateObj.bgmLooped = null;
-						fadeOutAndSeek();
-					}
-				} catch (e) {
-					clearInterval(repeatCheck);
-					g_stateObj.bgmLooped = null;
+					return (
+						g_audio.elapsedTime >= musicEnd ||
+						numAtStart !== g_settings.musicIdxNum
+					);
+				} catch {
+					return true; // エラー時は終了扱い
 				}
-			}, FADE_INTERVAL_MS);
-			g_stateObj.bgmLooped = repeatCheck;
-
-		} else {
-			g_stateObj.bgmTimeupdateEvtId = g_handler.addListener(g_audio, "timeupdate", () => {
-				if (g_audio.currentTime >= musicEnd) {
+			},
+			/* onEnd */
+			(finished) => {
+				g_stateObj.bgmLooped = null;
+				if (finished) {
 					fadeOutAndSeek();
 				}
-			});
-		}
+			},
+			/* isValid */
+			() => g_stateObj.bgmLooped !== null
+		);
 	};
 
 	if (encodeFlg) {
@@ -5659,9 +5773,10 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 				g_audio = tmpAudio;
 			}
 			g_audio.volume = g_stateObj.bgmVolume / 100;
-			if (g_currentPage === `title`) {
+			if (g_currentPage === `title` && musicEnd > 0) {
 				g_audio.currentTime = musicStart;
 				g_audio.play();
+				repeatBGM();
 			}
 		} catch (e) {
 			// 音源の読み込みに失敗した場合、エラーを表示
@@ -5681,9 +5796,14 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 			g_audio.currentTime = musicStart;
 			g_audio.play();
 		}, { once: true });
-	}
-	if (musicEnd > 0) {
-		repeatBGM();
+
+		if (musicEnd > 0) {
+			g_stateObj.bgmTimeupdateEvtId = g_handler.addListener(g_audio, "timeupdate", () => {
+				if (g_audio.currentTime >= musicEnd) {
+					fadeOutAndSeek();
+				}
+			});
+		}
 	}
 };
 
@@ -6861,9 +6981,24 @@ const makeHighScore = _scoreId => {
 	const assistFlg = (g_autoPlaysBase.includes(g_stateObj.autoPlay) ? `` : `-${getStgDetailName(g_stateObj.autoPlay)}${getStgDetailName('less')}`);
 	const mirrorName = (g_stateObj.shuffle === C_FLG_OFF ? `` : `-${g_stateObj.shuffle}`);
 	const transKeyName = getTransKeyName();
-	let scoreName = `${g_headerObj.keyLabels[_scoreId]}${transKeyName}${getStgDetailName('k-')}${g_headerObj.difLabels[_scoreId]}${assistFlg}${mirrorName}`;
-	if (g_headerObj.makerView) {
-		scoreName += `-${g_headerObj.creatorNames[_scoreId]}`;
+	let scoreName = getStorageKeyName(g_headerObj.keyLabels[_scoreId], transKeyName, assistFlg, mirrorName, _scoreId);
+
+	if (!hasVal(g_localStorage.highscores?.[scoreName])) {
+
+		// 古いキー定義の情報を検索
+		const relatedKeys = Object.entries(g_keyObj.keyTransPattern)
+			.filter(([key, value]) => value === g_headerObj.keyLabels[_scoreId])
+			.map(([key]) => key);
+
+		// 古いキー定義のハイスコアがいる場合は、現行キー定義として表示
+		for (const legacyKey of relatedKeys) {
+			let tmpScoreName = getStorageKeyName(legacyKey, transKeyName, assistFlg, mirrorName, _scoreId);
+			const src = g_localStorage.highscores?.[tmpScoreName];
+			if (hasVal(src)) {
+				g_localStorage.highscores[scoreName] = structuredClone(src);
+				break;
+			}
+		}
 	}
 
 	const createScoreLabel = (_id, _text, { xPos = 0, yPos = 0, dx = 0, w = 150, h = 17, colorName = _id, align = C_ALIGN_LEFT, overflow = `visible` } = {}) =>
@@ -7792,26 +7927,28 @@ const gaugeFormat = (_mode, _border, _rcv, _dmg, _init, _lifeValFlg) => {
 	const initVal = g_headerObj.maxLifeVal * _init / 100;
 	const borderVal = g_headerObj.maxLifeVal * _border / 100;
 
-	// 整形用にライフ初期値を整数、回復・ダメージ量を小数第1位で丸める
+	// 整形用にライフ初期値を整数、回復・ダメージ量を小数第2位に丸める
 	const init = Math.round(initVal);
 	const borderText = (_mode === C_LFE_BORDER && _border !== 0 ? Math.round(borderVal) : `-`);
-	const toFixed2 = _val => Math.round(_val * 100) / 100;
+	const round2 = _val => Math.round(_val * 100) / 100;
 
-	let rcvText = toFixed2(_rcv), dmgText = toFixed2(_dmg);
+	let rcvText = round2(_rcv), dmgText = round2(_dmg);
 	let realRcv = _rcv, realDmg = _dmg;
 	const allCnt = sumData(g_detailObj.arrowCnt[g_stateObj.scoreId]) +
 		(g_headerObj.frzStartjdgUse ? 2 : 1) * sumData(g_detailObj.frzCnt[g_stateObj.scoreId]);
 
+	// ゲージ設定が矢印数依存の場合、実際の値に変換して表示する
+	// 表示上、計算した値は小数第二位までの表示とする（それ以外はそのまま）
 	if (_lifeValFlg === C_FLG_ON) {
 		rcvText = ``, dmgText = ``;
 		if (allCnt > 0) {
 			realRcv = Math.min(calcLifeVal(_rcv, allCnt), g_headerObj.maxLifeVal);
 			realDmg = Math.min(calcLifeVal(_dmg, allCnt), g_headerObj.maxLifeVal);
-			rcvText = `${toFixed2(realRcv)}<br>`;
-			dmgText = `${toFixed2(realDmg)}<br>`;
+			rcvText = `${realRcv.toFixed(2)}<br>`;
+			dmgText = `${realDmg.toFixed(2)}<br>`;
 		}
-		rcvText += `<span class="settings_lifeVal">(${toFixed2(_rcv)})</span>`;
-		dmgText += `<span class="settings_lifeVal">(${toFixed2(_dmg)})</span>`;
+		rcvText += `<span class="settings_lifeVal">(${round2(_rcv)})</span>`;
+		dmgText += `<span class="settings_lifeVal">(${round2(_dmg)})</span>`;
 	}
 
 	// 達成率(Accuracy)・許容ミス数の計算
@@ -10403,7 +10540,7 @@ const calcLifeVals = _allArrows => {
  * @param {number} _val 
  * @param {number} _allArrows 
  */
-const calcLifeVal = (_val, _allArrows) => Math.round(_val * g_headerObj.maxLifeVal * 100 / _allArrows) / 100;
+const calcLifeVal = (_val, _allArrows) => _val * g_headerObj.maxLifeVal / _allArrows;
 
 /**
  * 最終フレーム数の取得
@@ -14004,10 +14141,8 @@ const resultInit = () => {
 	// ハイスコア差分計算
 	const assistFlg = (g_autoPlaysBase.includes(g_stateObj.autoPlay) ? `` : `-${g_stateObj.autoPlay}less`);
 	const mirrorName = (g_stateObj.shuffle.indexOf(`Mirror`) !== -1 ? `-${g_stateObj.shuffle}` : ``);
-	let scoreName = `${g_headerObj.keyLabels[g_stateObj.scoreId]}${transKeyName}${getStgDetailName('k-')}${g_headerObj.difLabels[g_stateObj.scoreId]}${assistFlg}${mirrorName}`;
-	if (g_headerObj.makerView) {
-		scoreName += `-${g_headerObj.creatorNames[g_stateObj.scoreId]}`;
-	}
+	let scoreName = getStorageKeyName(g_headerObj.keyLabels[g_stateObj.scoreId], transKeyName, assistFlg, mirrorName, g_stateObj.scoreId);
+
 	const highscoreDfObj = {
 		ii: 0, shakin: 0, matari: 0, shobon: 0, uwan: 0,
 		kita: 0, iknai: 0,
@@ -14038,6 +14173,30 @@ const resultInit = () => {
 
 	if (highscoreCondition) {
 
+		// 古いキー定義の情報を検索
+		const relatedKeys = Object.entries(g_keyObj.keyTransPattern)
+			.filter(([key, value]) => value === g_headerObj.keyLabels[g_stateObj.scoreId])
+			.map(([key]) => key);
+
+		// 古いキー定義のスコアデータを現行キー定義に移行
+		for (const legacyKey of relatedKeys) {
+			let tmpScoreName = getStorageKeyName(
+				legacyKey, transKeyName, assistFlg, mirrorName, g_stateObj.scoreId
+			);
+			const src = g_localStorage.highscores?.[tmpScoreName];
+			if (!hasVal(src)) {
+				continue;
+			}
+
+			// 現行キー定義にスコアデータが存在しない場合、移行元のスコアデータをコピー
+			if (!hasVal(g_localStorage.highscores?.[scoreName])) {
+				g_localStorage.highscores[scoreName] = structuredClone(src);
+			}
+
+			// 古いキー定義は見つかった最初の1件のみ移行し、以降は削除
+			delete g_localStorage.highscores[tmpScoreName];
+		}
+
 		Object.keys(jdgScoreObj).filter(judge => judge !== ``)
 			.forEach(judge => highscoreDfObj[judge] = g_resultObj[judge] -
 				(scoreName in g_localStorage.highscores ? g_localStorage.highscores[scoreName][judge] : 0));

package/package.json

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