danoniplus 42.2.1 → 42.2.3

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2025/06/15
- * 
+ * Revised : 2025/06/20
+ *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 42.2.1`;
-const g_revisedDate = `2025/06/17`;
+const g_version = `Ver 42.2.3`;
+const g_revisedDate = `2025/06/20`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -5088,7 +5088,7 @@ const titleInit = (_initFlg = false) => {
 				changeMSelect(Math.floor(Math.random() * (g_headerObj.musicIdxList.length - 1)) + 1),
 				g_lblPosObj.btnMusicSelectRandom, g_cssObj.button_Default),
 			createDivCss2Label(`lblMusicCnt`, ``, g_lblPosObj.lblMusicCnt),
-			createDivCss2Label(`lblComment`, ``, g_lblPosObj.lblComment_music),
+			createDivCss2Label(`lblCommentM`, ``, g_lblPosObj.lblComment_music),
 
 			createDivCss2Label(`lblBgmVolume`, `BGM Volume`, g_lblPosObj.lblBgmVolume),
 			createCss2Button(`btnBgmMute`, g_stateObj.bgmMuteFlg ? g_emojiObj.muted : g_emojiObj.speaker, evt => {
@@ -5110,14 +5110,17 @@ const titleInit = (_initFlg = false) => {
 		let wheelCnt = 0;
 		wheelHandler = g_handler.addListener(divRoot, `wheel`, e => {
 
-			// コメント欄（lblComment）のスクロール可能性をチェック
-			const isScrollable = lblComment.scrollHeight > lblComment.clientHeight;
+			if (document.getElementById(`lblComment`) !== null && lblComment.style.display === C_DIS_INHERIT) {
+				return;
+			}
+			// コメント欄（lblCommentM）のスクロール可能性をチェック
+			const isScrollable = lblCommentM.scrollHeight > lblCommentM.clientHeight;
 
 			// マウスがコメント欄上にあり、スクロールが可能ならイベントをスキップ
-			if (lblComment.contains(e.target) && isScrollable) {
+			if (lblCommentM.contains(e.target) && isScrollable) {
 				// スクロール位置の判定
-				const atTop = lblComment.scrollTop === 0 && e.deltaY < 0;
-				const atBottom = (lblComment.scrollTop + lblComment.clientHeight >= lblComment.scrollHeight) && e.deltaY > 0;
+				const atTop = lblCommentM.scrollTop === 0 && e.deltaY < 0;
+				const atBottom = (lblCommentM.scrollTop + lblCommentM.clientHeight >= lblCommentM.scrollHeight) && e.deltaY > 0;
 
 				// スクロール可能＆上端または下端ではないなら処理をスキップ
 				if (!atTop && !atBottom) {
@@ -5286,6 +5289,9 @@ const titleInit = (_initFlg = false) => {
 					lblComment.style.display = (lblCommentDef === C_DIS_NONE ? C_DIS_INHERIT : C_DIS_NONE);
 				}, g_lblPosObj.btnComment, g_cssObj.button_Default),
 			);
+			if (g_headerObj.musicSelectUse && getQueryParamVal(`scoreId`) === null) {
+				lblComment.style.height = `${g_sHeight - 100}px`;
+			}
 			setUserSelect(lblComment.style, `text`);
 		}
 	}
@@ -5468,11 +5474,13 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 	const FADE_INTERVAL_MS = 100;
 	const FADE_DELAY_MS = 500;
 
+	const currentIdx = g_headerObj.musicIdxList[g_settings.musicIdxNum];
 	const musicUrl = getMusicUrl(g_headerObj.viewLists[0]);
 	const url = getFullMusicUrl(musicUrl);
 	const encodeFlg = listMatching(musicUrl, [`.js`, `.txt`], { suffix: `$` });
-	const musicStart = g_headerObj.musicStarts?.[g_headerObj.musicIdxList[g_settings.musicIdxNum]] ?? 0;
-	const musicEnd = g_headerObj.musicEnds?.[g_headerObj.musicIdxList[g_settings.musicIdxNum]] ?? 0;
+	const musicStart = g_headerObj.musicStarts?.[currentIdx] ?? 0;
+	const musicEnd = g_headerObj.musicEnds?.[currentIdx] ?? 0;
+	const isTitle = () => g_currentPage === `title`;
 
 	/**
 	 * BGMのフェードアウトとシーク
@@ -5480,7 +5488,7 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 	const fadeOutAndSeek = () => {
 		let volume = g_audio.volume;
 		const fadeInterval = setInterval(() => {
-			if (volume > FADE_STEP && g_currentPage === `title`) {
+			if (volume > FADE_STEP && isTitle()) {
 				volume -= FADE_STEP;
 				g_audio.volume = Math.max(volume, 0);
 			} else {
@@ -5490,7 +5498,7 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 				g_audio.currentTime = musicStart;
 
 				// フェードイン開始
-				if (g_currentPage === `title`) {
+				if (isTitle()) {
 					setTimeout(() => {
 						fadeIn();
 						if (encodeFlg) {
@@ -5517,13 +5525,20 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 		let volume = 0;
 		g_audio.play();
 		const fadeInterval = setInterval(() => {
-			if (volume < g_stateObj.bgmVolume / 100 && g_currentPage === `title`) {
+			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 = null;
+			}
 		}, FADE_INTERVAL_MS);
 		g_stateObj.bgmFadeIn = fadeInterval;
 	};
@@ -5612,6 +5627,9 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
  * @param {boolean} _initFlg 
  */
 const changeMSelect = (_num, _initFlg = false) => {
+	if (document.getElementById(`lblComment`) !== null && lblComment.style.display === C_DIS_INHERIT) {
+		return;
+	}
 	const limitedMLength = 35;
 	pauseBGM();
 
@@ -5685,7 +5703,7 @@ const changeMSelect = (_num, _initFlg = false) => {
 	}
 
 	// コメント文の加工
-	lblComment.innerHTML = convertStrToVal(g_headerObj[`commentVal${g_settings.musicIdxNum}`]);
+	lblCommentM.innerHTML = convertStrToVal(g_headerObj[`commentVal${g_settings.musicIdxNum}`]);
 
 	// BGM再生処理
 	if (!g_stateObj.bgmMuteFlg) {

package/package.json

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