danoniplus 50.1.2 → 50.3.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/08/31
+ * Revised : 2026/09/08
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 50.1.2`;
-const g_revisedDate = `2026/08/31`;
+const g_version = `Ver 50.3.0`;
+const g_revisedDate = `2026/09/08`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -1757,7 +1757,7 @@ const createColorPicker = (_parentObj, _id, _func, { x = 0, y = 0 } = {}) => {
 	picker.style.top = wUnit(y);
 	picker.style.position = `absolute`;
 	picker.style.pointerEvents = C_DIS_AUTO;
-	picker.addEventListener(`change`, _func);
+	g_handler.addListener(picker, `change`, _func);
 	_parentObj.appendChild(picker);
 	return picker;
 };
@@ -1871,16 +1871,16 @@ const g_handler = (() => {
 		 * @param {EventTarget} _target 
 		 * @param {string} _type 
 		 * @param {EventListenerOrEventListenerObject} _listener 
-		 * @param {boolean} [_capture=false] 
+		 * @param {boolean|AddEventListenerOptions} [_options=false] 
 		 * @returns {number}
 		 */
-		addListener: (_target, _type, _listener, _capture = false) => {
-			_target.addEventListener(_type, _listener, _capture);
+		addListener: (_target, _type, _listener, _options = false) => {
+			_target.addEventListener(_type, _listener, _options);
 			events[key] = {
 				target: _target,
 				type: _type,
 				listener: _listener,
-				capture: _capture
+				options: _options // boolean/objectどちらでもそのまま保持
 			};
 			return key++;
 		},
@@ -1891,9 +1891,104 @@ const g_handler = (() => {
 		removeListener: key => {
 			if (key in events) {
 				const e = events[key];
-				e.target.removeEventListener(e.type, e.listener, e.capture);
+				e.target.removeEventListener(e.type, e.listener, e.options);
 				delete events[key];
 			}
+		},
+		/**
+		 * すべてのイベントリスナーを削除
+		 */
+		removeAll: () => {
+			Object.values(events).forEach(e => {
+				e.target.removeEventListener(e.type, e.listener, e.options);
+			});
+			for (const k in events) delete events[k];
+		},
+		/**
+		 * 指定した要素配下（自身含む）のイベントリスナーをまとめて削除
+		 * @param {HTMLDivElement} _container 
+		 */
+		removeByContainer: _container => {
+			Object.entries(events).forEach(([k, e]) => {
+				if (_container.contains(e.target)) {
+					e.target.removeEventListener(e.type, e.listener, e.options);
+					delete events[k];
+				}
+			});
+		}
+	};
+})();
+
+// setInterval/setTimeout版
+const g_timerHandler = (() => {
+	const timers = {}; // key -> { id, type: 'interval' | 'timeout' }
+	let key = 0;
+
+	const clearByType = entry => {
+		if (entry.type === 'interval') {
+			clearInterval(entry.id);
+		} else {
+			clearTimeout(entry.id);
+		}
+	};
+
+	const clear = key => {
+		if (key in timers) {
+			clearByType(timers[key]);
+			delete timers[key];
+		}
+	};
+
+	return {
+		setInterval: (_callback, _ms) => {
+			const id = setInterval(_callback, _ms);
+			timers[key] = { id, type: 'interval' };
+			return key++;
+		},
+		setTimeout: (_callback, _ms, ..._args) => {
+			const id = setTimeout(() => {
+				_callback(..._args);
+				delete timers[myKey]; // 発火し終わったら自動で登録簿から消す
+			}, _ms);
+			const myKey = key;
+			timers[key] = { id, type: 'timeout' };
+			return key++;
+		},
+		clear,
+		clearInterval: clear,
+		clearTimeout: clear,
+		clearAll: () => {
+			Object.values(timers).forEach(clearByType);
+			for (const k in timers) delete timers[k];
+		}
+	};
+})();
+
+// requestAnimationFrame版
+const g_rafHandler = (() => {
+	const loops = {};
+	let key = 0;
+
+	return {
+		start: _callback => {
+			const myKey = key++;
+			function loop() {
+				if (!(myKey in loops)) return; // clearAll済みなら自然停止
+				_callback();
+				loops[myKey] = requestAnimationFrame(loop);
+			}
+			loops[myKey] = requestAnimationFrame(loop);
+			return myKey;
+		},
+		stop: key => {
+			if (key in loops) {
+				cancelAnimationFrame(loops[key]);
+				delete loops[key];
+			}
+		},
+		stopAll: () => {
+			Object.values(loops).forEach(id => cancelAnimationFrame(id));
+			for (const k in loops) delete loops[k];
 		}
 	};
 })();
@@ -1905,10 +2000,8 @@ const g_handler = (() => {
 const deleteChildspriteAll = _parentObjName => {
 
 	const parentsprite = document.getElementById(_parentObjName);
+	g_handler.removeByContainer(parentsprite);
 	while (parentsprite.hasChildNodes()) {
-		g_handler.removeListener(parentsprite.firstChild.getAttribute(`lsnrkey`));
-		g_handler.removeListener(parentsprite.firstChild.getAttribute(`lsnrkeyTS`));
-		g_handler.removeListener(parentsprite.firstChild.getAttribute(`lsnrkeyTE`));
 		parentsprite.removeChild(parentsprite.firstChild);
 	}
 };
@@ -1920,6 +2013,7 @@ const deleteChildspriteAll = _parentObjName => {
  */
 const deleteDiv = (_parentId, _idName) => {
 	if (document.getElementById(_idName) !== null) {
+		g_handler.removeByContainer(document.getElementById(_idName));
 		_parentId.removeChild(document.getElementById(_idName));
 	}
 };
@@ -1969,13 +2063,13 @@ const createCss2Button = (_id, _text, _func = () => true, {
 			(g_initialFlg && g_btnWaitFrame[groupName].initial)) {
 		} else {
 			style.pointerEvents = C_DIS_NONE;
-			setTimeout(() => style.pointerEvents = rest.pointerEvents ?? C_DIS_AUTO,
+			g_timerHandler.setTimeout(() => style.pointerEvents = rest.pointerEvents ?? C_DIS_AUTO,
 				g_btnWaitFrame[groupName].b_frame * 1000 / g_fps);
 		}
 	}
 
 	// ボタンを押したときの動作
-	const lsnrkey = g_handler.addListener(div, `click`, evt => {
+	g_handler.addListener(div, `click`, evt => {
 		if (!setBoolVal(g_btnDeleteFlg[_id])) {
 			_func(evt);
 		}
@@ -2006,9 +2100,6 @@ const createCss2Button = (_id, _text, _func = () => true, {
 		return false;
 	};
 
-	// イベントリスナー用のキーをセット
-	div.setAttribute(`lsnrkey`, lsnrkey);
-
 	return div;
 };
 
@@ -2788,7 +2879,7 @@ const warmUpAudioContext = async () => {
 	const baseTime = ctx.currentTime;
 	const limitTime = performance.now() + 500;
 	while (ctx.currentTime === baseTime && performance.now() < limitTime) {
-		await new Promise(resolve => setTimeout(resolve, 10));
+		await new Promise(resolve => g_timerHandler.setTimeout(resolve, 10));
 	}
 };
 
@@ -5905,7 +5996,7 @@ const titleInit = (_initFlg = false) => {
 			createDivCss2Label(`lblMusicSelectDetail`, ``, g_lblPosObj.lblMusicSelectDetail),
 			createCss2Button(`btnStart`,
 				`>`, () => {
-					clearTimeout(g_timeoutEvtTitleId);
+					g_timerHandler.clearTimeout(g_timeoutEvtTitleId);
 					g_handler.removeListener(wheelHandler);
 					g_keyObj.prevKey = `Dummy${g_settings.musicIdxNum}`;
 					g_langStorage.bgmVolume = g_stateObj.bgmVolume;
@@ -5992,14 +6083,14 @@ const titleInit = (_initFlg = false) => {
 
 			let spriteOpacity = 1;
 			let fadeOpacity = null;
-			const fadeStartOpacity = setTimeout(() => {
-				clearTimeout(fadeStartOpacity);
+			const fadeStartOpacity = g_timerHandler.setTimeout(() => {
+				g_timerHandler.clearTimeout(fadeStartOpacity);
 				setOpacity(spriteOpacity);
 			}, 2000);
 
 			const setOpacity = (_opacity) => {
 				if (_opacity <= 0) {
-					clearTimeout(fadeOpacity);
+					g_timerHandler.clearTimeout(fadeOpacity);
 					mSelectTitleSprite.style.display = C_DIS_NONE;
 					if (!g_stateObj.bgmMuteFlg && g_audioForMS) {
 						g_audioForMS.muted = false;
@@ -6012,7 +6103,7 @@ const titleInit = (_initFlg = false) => {
 					}
 				} else {
 					mSelectTitleSprite.style.opacity = _opacity;
-					fadeOpacity = setTimeout(() => {
+					fadeOpacity = g_timerHandler.setTimeout(() => {
 						spriteOpacity -= 0.25;
 						setOpacity(spriteOpacity);
 					}, 50);
@@ -6074,7 +6165,7 @@ const titleInit = (_initFlg = false) => {
 
 			// Click Here
 			createCss2Button(`btnStart`, g_lblNameObj.clickHere, () => {
-				clearTimeout(g_timeoutEvtTitleId);
+				g_timerHandler.clearTimeout(g_timeoutEvtTitleId);
 				g_keyObj.prevKey = `Dummy${g_settings.musicIdxNum}`;
 			}, {
 				x: g_btnX(), w: g_btnWidth(), siz: g_limitObj.titleSiz, resetFunc: () => optionInit(),
@@ -6093,7 +6184,7 @@ const titleInit = (_initFlg = false) => {
 
 		// Reset
 		createCss2Button(`btnReset`, g_lblNameObj.dataReset, () => {
-			clearTimeout(g_timeoutEvtTitleId);
+			g_timerHandler.clearTimeout(g_timeoutEvtTitleId);
 			g_handler.removeListener(wheelHandler);
 			dataMgtInit();
 		}, g_lblPosObj.btnReset, g_cssObj.button_Reset),
@@ -6173,10 +6264,10 @@ const titleInit = (_initFlg = false) => {
 
 		g_scoreObj.titleFrameNum++;
 		g_animationData.forEach(sprite => g_scoreObj[`${sprite}TitleFrameNum`]++);
-		g_timeoutEvtTitleId = setTimeout(flowTitleTimeline, 1000 / g_fps - buffTime);
+		g_timeoutEvtTitleId = g_timerHandler.setTimeout(flowTitleTimeline, 1000 / g_fps - buffTime);
 	};
 
-	g_timeoutEvtTitleId = setTimeout(flowTitleTimeline, 1000 / g_fps);
+	g_timeoutEvtTitleId = g_timerHandler.setTimeout(flowTitleTimeline, 1000 / g_fps);
 
 	// キー操作イベント（デフォルト）
 	setShortcutEvent(g_currentPage, () => true, { dfEvtFlg: true });
@@ -6315,7 +6406,7 @@ const pauseBGM = () => {
 	}
 	[`bgmLooped`, `bgmFadeIn`, `bgmFadeOut`].forEach(id => {
 		if (g_stateObj[id]) {
-			clearTimeout(g_stateObj[id]);
+			g_timerHandler.clearTimeout(g_stateObj[id]);
 			g_stateObj[id] = null;
 		}
 	});
@@ -6383,10 +6474,10 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 			g_audioForMS.volume = Math.min(Math.max(volume, 0), 1);
 
 			// 次のステップへ
-			setTimeout(stepFunc, FADE_INTERVAL_MS);
+			g_timerHandler.setTimeout(stepFunc, FADE_INTERVAL_MS);
 		};
 
-		return setTimeout(stepFunc, FADE_INTERVAL_MS);
+		return g_timerHandler.setTimeout(stepFunc, FADE_INTERVAL_MS);
 	};
 
 	/**
@@ -6411,10 +6502,10 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 			}
 
 			// 次のチェックへ
-			setTimeout(step, FADE_INTERVAL_MS);
+			g_timerHandler.setTimeout(step, FADE_INTERVAL_MS);
 		};
 
-		return setTimeout(step, FADE_INTERVAL_MS);
+		return g_timerHandler.setTimeout(step, FADE_INTERVAL_MS);
 	};
 
 	/**
@@ -6438,7 +6529,7 @@ const playBGM = async (_num, _currentLoopNum = g_settings.musicLoopNum) => {
 				g_audioForMS.currentTime = musicStart;
 
 				if (isTitle()) {
-					setTimeout(() => {
+					g_timerHandler.setTimeout(() => {
 						fadeIn();
 						if (encodeFlg) repeatBGM();
 					}, FADE_DELAY_MS);
@@ -6700,7 +6791,7 @@ const changeMSelect = (_num, _initFlg = false) => {
 		if (_initFlg) {
 			playBGM(_num);
 		} else {
-			setTimeout(() => {
+			g_timerHandler.setTimeout(() => {
 				if (currentLoopNum === g_settings.musicLoopNum) {
 					playBGM(_num, currentLoopNum);
 				}
@@ -8528,25 +8619,26 @@ const resolveKeyFamily = () => {
 	const allPaths = new Set(g_familyObj.families.flatMap(f => Object.keys(f.fields)));
 	allPaths.forEach(path => {
 		const spec = newFamily?.fields[path];
-		// 該当プロパティのカスタム処理があれば優先し、なければ通常のプロパティ代入を使用
-		const applier = g_familyObj.families.map(f => f.appliers[path]).find(Boolean) ?? (v => setPathVal(path, v));
 
 		if (spec !== undefined) {
 			// 【変更値の適用】現在のファミリーにそのプロパティの設定がある場合
 			// 初めて書き換えるプロパティの場合のみ、元の値をスナップショット（初期値）として退避
 			if (!g_familyObj.ownership[path]) {
 				g_familyObj.snapshot[path] = getPathVal(path);
-				g_familyObj.ownership[path] = true;
 			}
 			// 関数なら評価し、値ならそのまま適用値とする
+			g_familyObj.ownership[path] = newFamily;
+			const applier = newFamily.appliers[path] ?? (v => setPathVal(path, v));
 			applyIfChanged(path, typeof spec === `function` ? spec() : spec, applier);
+
 		} else if (g_familyObj.ownership[path]) {
 			// 【標準への復元】別のファミリーに移行し、かつ元々自分が書き換えていたプロパティの場合
 			// スナップショットから元の値（初期値）を復元し、オーナーシップを解放
+			const applier = g_familyObj.ownership[path].appliers[path] ?? (v => setPathVal(path, v));
 			applyIfChanged(path, g_familyObj.snapshot[path], applier);
-			g_familyObj.ownership[path] = false;
+			g_familyObj.ownership[path] = null;
 		}
-		// ownership[path]がfalseのままなら、標準同士の切り替えでも一切触らない
+		// ownership[path]がnullのままなら、標準同士の切り替えでも一切触らない
 	});
 };
 
@@ -8890,7 +8982,7 @@ const createOptionWindow = _sprite => {
 	);
 
 	const fadeinSlider = document.getElementById(`fadeinSlider`);
-	fadeinSlider.addEventListener(`input`, () => {
+	g_handler.addListener(fadeinSlider, `input`, () => {
 		g_stateObj.fadein = inputSlider(fadeinSlider, lnkFadein, `fadein`);
 		updateSettingSummary();
 		drawMinimap(g_stateObj.scoreId, { _fadeinFlg: true });
@@ -9515,9 +9607,6 @@ const settingsDisplayInit = () => {
 /** プレビューウィンドウのルートdiv */
 let g_previewRoot = null;
 
-/** プレビューで登録した一時リスナー群 */
-let g_previewLsnrKeys = new Set();
-
 /** プレビュー内の各UIオブジェクトの現在座標 */
 const g_previewPos = {
 	arrowJdg: { x: null, y: null },   // 通常判定キャラクタ・コンボ
@@ -9525,15 +9614,6 @@ const g_previewPos = {
 	shortcut: { x: null, y: null },
 };
 
-/**
- * プレビュー用リスナー登録（キーをレジストリへ格納）
- */
-const addPreviewListener = (target, type, listener, capture = false) => {
-	const key = g_handler.addListener(target, type, listener, capture);
-	g_previewLsnrKeys.add(key);
-	return key;
-};
-
 /**
  * プレビューのトグル（表示 / 非表示）
  */
@@ -9621,11 +9701,6 @@ const closeDisplayPreview = () => {
 		deleteChildspriteAll(`displayPreviewOverlay`);
 		overlay.remove();
 	}
-	// プレビュー専用に登録した残りのハンドラを明示解除
-	if (g_previewLsnrKeys?.size) {
-		g_previewLsnrKeys.forEach(k => g_handler.removeListener(k));
-		g_previewLsnrKeys.clear();
-	}
 	g_previewRoot = null;
 };
 
@@ -9974,7 +10049,7 @@ const makeElementDraggable = (_target, _key, _playW, _playH, _bounds, _config) =
 		background: `rgba(${bgColor},0.04)`,
 	});
 
-	const keyDown = addPreviewListener(_target, `pointerdown`, _evt => {
+	g_handler.addListener(_target, `pointerdown`, _evt => {
 		dragging = true;
 		dragStartX = _evt.clientX;
 		dragStartY = _evt.clientY;
@@ -9985,7 +10060,7 @@ const makeElementDraggable = (_target, _key, _playW, _playH, _bounds, _config) =
 		_evt.stopPropagation();
 	});
 
-	const keyMove = addPreviewListener(_target, `pointermove`, _evt => {
+	g_handler.addListener(_target, `pointermove`, _evt => {
 		if (!dragging) return;
 
 		// 1. マウスの実際の移動量を計算
@@ -10006,7 +10081,7 @@ const makeElementDraggable = (_target, _key, _playW, _playH, _bounds, _config) =
 		_evt.stopPropagation();
 	});
 
-	const keyUp = addPreviewListener(_target, `pointerup`, _evt => {
+	g_handler.addListener(_target, `pointerup`, _evt => {
 		if (!dragging) return;
 		dragging = false;
 		_target.style.cursor = `grab`;
@@ -10024,15 +10099,10 @@ const makeElementDraggable = (_target, _key, _playW, _playH, _bounds, _config) =
 		_evt.stopPropagation();
 	});
 
-	addPreviewListener(_target, `pointercancel`, _evt => {
+	g_handler.addListener(_target, `pointercancel`, _evt => {
 		dragging = false;
 		_target.style.cursor = `grab`;
 	});
-
-	// 既存の管理用属性（必要に応じて）
-	_target.setAttribute(`lsnrkey`, keyMove);
-	_target.setAttribute(`lsnrkeyTS`, keyDown);
-	_target.setAttribute(`lsnrkeyTE`, keyUp);
 };
 
 /**
@@ -10086,8 +10156,8 @@ const showToast = _msg => {
 		opacity: `1`,
 	});
 	divRoot.appendChild(toast);
-	setTimeout(() => { toast.style.opacity = `0`; }, 2200);
-	setTimeout(() => { if (toast.parentNode) toast.remove(); }, 2700);
+	g_timerHandler.setTimeout(() => { toast.style.opacity = `0`; }, 2200);
+	g_timerHandler.setTimeout(() => { if (toast.parentNode) toast.remove(); }, 2700);
 };
 
 /**
@@ -10211,7 +10281,7 @@ const createSettingsDisplayWindow = _sprite => {
 	};
 
 	const appearanceSlider = document.getElementById(`appearanceSlider`);
-	appearanceSlider.addEventListener(`input`, () => {
+	g_handler.addListener(appearanceSlider, `input`, () => {
 		g_hidSudObj.filterPos = inputSlider(appearanceSlider, lblAppearancePos, `appearance`);
 		updateSettingSummary();
 	}, false);
@@ -12500,8 +12570,8 @@ const fetchMusicBlobUrl = (_url, _lblLoading) => new Promise((resolve, reject) =
 
 	// 停滞タイマーをリセット
 	const resetStallTimer = () => {
-		clearTimeout(stallTimer);
-		stallTimer = setTimeout(() => {
+		g_timerHandler.clearTimeout(stallTimer);
+		stallTimer = g_timerHandler.setTimeout(() => {
 			request.abort();
 			makeWarningWindow(g_msgInfoObj.E_0033, { backBtnUse: true });
 			reject(new Error(`stalled`));
@@ -12510,7 +12580,7 @@ const fetchMusicBlobUrl = (_url, _lblLoading) => new Promise((resolve, reject) =
 
 	// 読み込み完了時
 	request.addEventListener(`load`, () => {
-		clearTimeout(stallTimer);
+		g_timerHandler.clearTimeout(stallTimer);
 		if (request.status >= 200 && request.status < 300) {
 			const blobUrl = URL.createObjectURL(request.response);
 			createEmptySprite(divRoot, `loader`, g_windowObj.loader);
@@ -12540,7 +12610,7 @@ const fetchMusicBlobUrl = (_url, _lblLoading) => new Promise((resolve, reject) =
 	});
 
 	request.addEventListener(`error`, () => {
-		clearTimeout(stallTimer);
+		g_timerHandler.clearTimeout(stallTimer);
 		makeWarningWindow(g_msgInfoObj.E_0034, { backBtnUse: true });
 		reject(new Error(`network error`));
 	});
@@ -14815,7 +14885,7 @@ const getArrowSettings = () => {
 	g_workObj.frzReturnFlg = false;
 	g_workObj.frzReturnSeq = g_frzReturnSeqFunc.get(g_stateObj.frzReturnType)();
 	if (g_workObj.frzReturnTimerId) {
-		clearTimeout(g_workObj.frzReturnTimerId);
+		g_timerHandler.clearTimeout(g_workObj.frzReturnTimerId);
 		g_workObj.frzReturnTimerId = null;
 	}
 
@@ -15479,7 +15549,7 @@ const mainInit = () => {
 			if (g_isMac && keyIsShift()) {
 				// Mac OS、IPad OSはDeleteキーが無いためShift+BSで代用
 				g_audio.pause();
-				clearTimeout(g_timeoutEvtId);
+				g_timerHandler.clearTimeout(g_timeoutEvtId);
 				titleInit();
 
 			} else {
@@ -15489,7 +15559,7 @@ const mainInit = () => {
 
 		} else if (setCode === g_kCdN[g_headerObj.keyTitleBack]) {
 			g_audio.pause();
-			clearTimeout(g_timeoutEvtId);
+			g_timerHandler.clearTimeout(g_timeoutEvtId);
 			if (keyIsShift()) {
 				if (g_currentArrows !== g_fullArrows || g_stateObj.lifeMode === C_LFE_BORDER && g_workObj.lifeVal < g_workObj.lifeBorder) {
 					g_gameOverFlg = true;
@@ -15897,6 +15967,10 @@ const mainInit = () => {
 		// 矢印色の設定
 		// - 枠/塗りつぶし色: g_attrObj[arrowName].Arrow / ArrowShadow
 		g_typeLists.arrowColor.forEach(val => g_attrObj[arrowName][`Arrow${val}`] = g_workObj[`${_name}${val}Colors`][_j]);
+
+		// g_attrObj定義後のカスタムイベント
+		safeExecuteCustomHooks(`g_customJsObj.preMakeArrow`, g_customJsObj.preMakeArrow, _attrs, arrowName, _name, _arrowCnt);
+
 		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 });
 
@@ -16037,6 +16111,10 @@ const mainInit = () => {
 				g_attrObj[frzName][`${val}All`] = g_workObj[`${_name}${val}ColorsAll`][_j];
 			}
 		});
+
+		// g_attrObj定義後のカスタムイベント
+		safeExecuteCustomHooks(`g_customJsObj.preMakeFrzArrow`, g_customJsObj.preMakeFrzArrow, _attrs, frzName, _name, _arrowCnt);
+
 		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 });
@@ -16375,13 +16453,18 @@ const mainInit = () => {
 			}
 		});
 
+		// ユーザカスタムイベント(フレーム毎、タイマー直前)
+		safeExecuteCustomHooks(`g_customJsObj.mainBeforeFrameTimer`, g_customJsObj.mainBeforeFrameTimer, {
+			arrowCnts, frzCnts, dummyArrowCnts, dummyFrzCnts,
+		});
+
 		// 曲終了判定
 		if (currentFrame >= fullFrame) {
 			if (g_stateObj.lifeMode === C_LFE_BORDER && g_workObj.lifeVal < g_workObj.lifeBorder) {
 				g_gameOverFlg = true;
 			}
 			resetKeyControl();
-			clearTimeout(g_timeoutEvtId);
+			g_timerHandler.clearTimeout(g_timeoutEvtId);
 			g_workObj.mainEndTime = thisTime;
 			resultInit();
 
@@ -16389,7 +16472,7 @@ const mainInit = () => {
 
 			// ライフ制＆ライフ０の場合は途中終了
 			g_audio.pause();
-			clearTimeout(g_timeoutEvtId);
+			g_timerHandler.clearTimeout(g_timeoutEvtId);
 			g_gameOverFlg = true;
 			g_finishFlg = false;
 			resultInit();
@@ -16428,7 +16511,7 @@ const mainInit = () => {
 				g_scoreObj.frameNum++;
 				g_scoreObj.baseFrame++;
 			}
-			g_timeoutEvtId = setTimeout(flowTimeline, holdFrame ? g_maxFrameWait :
+			g_timeoutEvtId = g_timerHandler.setTimeout(flowTimeline, holdFrame ? g_maxFrameWait :
 				Math.min(Math.max(1000 / g_fps - buffTime, 0), g_maxFrameWait));
 		}
 	};
@@ -16442,7 +16525,7 @@ const mainInit = () => {
 	 */
 	const cancelResumeCountdown = () => {
 		if (countdownTimeoutId !== null) {
-			clearTimeout(countdownTimeoutId);
+			g_timerHandler.clearTimeout(countdownTimeoutId);
 			countdownTimeoutId = null;
 		}
 		document.getElementById(`lblResumeCountdown`)?.remove();
@@ -16491,7 +16574,7 @@ const mainInit = () => {
 			// 一時停止時点で早期終了させる(位置復元はせず、通常終了時と同じ後片付けを行う)
 			resetFrzReturn();
 		}
-		clearTimeout(g_timeoutEvtId);
+		g_timerHandler.clearTimeout(g_timeoutEvtId);
 		g_audio.pause();
 
 		// フォーカスを失うとkeyupが届かなくなり、押しっぱなし判定・表示が残り得るため、
@@ -16564,7 +16647,7 @@ const mainInit = () => {
 			manualPauseFlg = false;
 			pausedElapsedTime = null;
 			pausedStartAdjustment = null;
-			g_timeoutEvtId = setTimeout(flowTimeline, 1000 / g_fps);
+			g_timeoutEvtId = g_timerHandler.setTimeout(flowTimeline, 1000 / g_fps);
 		};
 
 		const tick = _remaining => {
@@ -16573,7 +16656,7 @@ const mainInit = () => {
 				return;
 			}
 			countdownLabel.innerHTML = String(_remaining);
-			countdownTimeoutId = setTimeout(() => tick(_remaining - 1), 1000);
+			countdownTimeoutId = g_timerHandler.setTimeout(() => tick(_remaining - 1), 1000);
 		};
 		tick(3);
 	};
@@ -16600,7 +16683,7 @@ const mainInit = () => {
 	if (document.hidden) {
 		pauseTimeline();
 	} else {
-		g_timeoutEvtId = setTimeout(flowTimeline, 1000 / g_fps);
+		g_timeoutEvtId = g_timerHandler.setTimeout(flowTimeline, 1000 / g_fps);
 	}
 };
 
@@ -16864,7 +16947,7 @@ const appearKeyTypes = (_j, _targets, _alphas = fillArray(_targets.length, 1)) =
 const startFrzReturn = () => {
 	if (!g_workObj.frzReturnFlg) {
 		if (g_workObj.frzReturnTimerId) {
-			clearTimeout(g_workObj.frzReturnTimerId);
+			g_timerHandler.clearTimeout(g_workObj.frzReturnTimerId);
 			g_workObj.frzReturnTimerId = null;
 		}
 		lifeBarFrz.classList.remove(g_cssObj.life_frzNormal, g_cssObj.life_frzActive);
@@ -16882,7 +16965,7 @@ const startFrzReturn = () => {
  */
 const resetFrzReturn = () => {
 	if (g_workObj.frzReturnTimerId) {
-		clearTimeout(g_workObj.frzReturnTimerId);
+		g_timerHandler.clearTimeout(g_workObj.frzReturnTimerId);
 	}
 	g_workObj.frzReturnTimerId = null;
 	g_workObj.frzReturnFlg = false;
@@ -16954,7 +17037,7 @@ const executeFrzReturn = (_seq, _idx, _axis) => {
 
 	addTransform(`mainSprite`, `frzReturn`, _transform, g_transPriority.frzReturn);
 
-	g_workObj.frzReturnTimerId = setTimeout(() => executeFrzReturn(_seq, _idx + 1, _axis), 20);
+	g_workObj.frzReturnTimerId = g_timerHandler.setTimeout(() => executeFrzReturn(_seq, _idx + 1, _axis), 20);
 };
 
 /**
@@ -16970,7 +17053,7 @@ const executeRetry = async (_logLabel = `Retry`) => {
 	g_retryInProgress = true;
 	try {
 		g_audio.pause();
-		clearTimeout(g_timeoutEvtId);
+		g_timerHandler.clearTimeout(g_timeoutEvtId);
 		clearWindow(`Main`);
 		await musicAfterLoaded();
 		await loadChartFile();
@@ -16993,7 +17076,7 @@ const quickRetry = (_retryCondition) => {
 		return;
 	}
 	if (g_settings.autoRetryNum >= retryNum && !g_retryInProgress) {
-		setTimeout(async () => {
+		g_timerHandler.setTimeout(async () => {
 			await executeRetry(`AutoRetry`);
 		}, 16);
 	}
@@ -17240,6 +17323,7 @@ const judgeArrow = _j => {
 			// 空押し判定（有効かつ早押し時のみ）
 			displayDiff(_difFrame);
 			stepHitTargetArrow(`Excessive`);
+			safeExecuteCustomHooks(`g_customJsObj.judg_excessive`, g_customJsObj.judg_excessive, _difFrame, _j);
 			return true;
 
 		} else if (_difCnt <= g_judgObj.arrowJ[g_judgPosObj.shobon]) {
@@ -18288,8 +18372,8 @@ const resultInit = () => {
 			if (g_finishFlg) {
 				g_audio.pause();
 			}
-			clearTimeout(g_timeoutEvtId);
-			clearTimeout(g_timeoutEvtResultId);
+			g_timerHandler.clearTimeout(g_timeoutEvtId);
+			g_timerHandler.clearTimeout(g_timeoutEvtResultId);
 		}, { ..._posObj, resetFunc: () => _func() }, _cssClass);
 
 	/**
@@ -18358,14 +18442,14 @@ const resultInit = () => {
 		// リザルト画面移行後のフェードアウト処理
 		if (g_scoreObj.fadeOutFrame >= g_scoreObj.frameNum) {
 			if (g_scoreObj.frameNum >= g_scoreObj.fullFrame) {
-				clearTimeout(g_timeoutEvtId);
+				g_timerHandler.clearTimeout(g_timeoutEvtId);
 			}
 			g_scoreObj.frameNum++;
 		} else {
 			const tmpVolume = (g_audio.volume - (3 * g_stateObj.volume / 100 * C_FRM_AFTERFADE / g_scoreObj.fadeOutTerm) / 1000);
 			if (tmpVolume < 0) {
 				g_audio.volume = 0;
-				clearTimeout(g_timeoutEvtId);
+				g_timerHandler.clearTimeout(g_timeoutEvtId);
 			} else {
 				g_audio.volume = tmpVolume;
 			}
@@ -18376,7 +18460,7 @@ const resultInit = () => {
 
 		g_scoreObj.resultFrameNum++;
 		g_animationData.forEach(sprite => g_scoreObj[`${sprite}ResultFrameNum`]++);
-		g_timeoutEvtResultId = setTimeout(flowResultTimeline, 1000 / g_fps - buffTime);
+		g_timeoutEvtResultId = g_timerHandler.setTimeout(flowResultTimeline, 1000 / g_fps - buffTime);
 	};
 	flowResultTimeline();
 

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/08/31 (v50.1.2)
+ * Revised : 2026/09/08 (v50.3.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -5244,6 +5244,8 @@ const g_customJsObj = {
     progress: [],
     main: [],
 
+    preMakeArrow: [],
+    preMakeFrzArrow: [],
     makeArrow: [],
     makeFrzArrow: [],
 
@@ -5259,11 +5261,13 @@ const g_customJsObj = {
     judg_uwan: [],
     judg_kita: [],
     judg_iknai: [],
+    judg_excessive: [],
 
     judg_frzHit: [],
     judg_dummyFrzHit: [],
 
     mainEnterFrame: [],
+    mainBeforeFrameTimer: [],
     result: [],
     resultEnterFrame: [],
 };

package/js/template/danoni_custom.js

@@ -40,6 +40,16 @@ g_customJsObj.titleEnterFrame.push(() => {
 
 });
 
+/**
+ * 選曲変更時（選曲モード時のみ）
+ * - この設定は譜面ヘッダーの|packageName=パッケージ名|を指定した場合のみ利用可能です。
+ * - 曲を変更したときに呼び出されます。
+ * @param {number} _musicIdxNum 選択曲番号
+ */
+g_customJsObj.musicSelect.push((_musicIdxNum) => {
+
+});
+
 /**
  * データ管理画面 [Scene: Data Management / Pear]
  */
@@ -55,7 +65,7 @@ g_customJsObj.precondition.push(() => {
 });
 
 /**
- * オプション画面(初期表示) [Scene: Option / Lime]
+ * Settings画面(初期表示) [Scene: Option / Lime]
  */
 g_customJsObj.option.push(() => {
 
@@ -71,19 +81,36 @@ g_customJsObj.difficulty.push((_initFlg, _canLoadDifInfoFlg) => {
 });
 
 /**
- * 表示変更(初期表示) [Scene: Settings-Display / Lemon]
+ * Display画面(初期表示) [Scene: Settings-Display / Lemon]
  */
 g_customJsObj.settingsDisplay.push(() => {
 
 });
 
 /**
- * 表示変更(初期表示) [Scene: Ex-Settings / apple]
+ * Display画面(プレビュー表示) [Scene: Settings-Display / Lemon]
+ * @param {object} _parent Display設定のプレビューの親要素
+ * @param {number} _playingWidth プレイ画面の横幅(px)
+ * @param {number} _playingHeight プレイ画面の高さ(px)
+ */
+g_customJsObj.displayPreview.push((_parent, _playingWidth, _playingHeight) => {
+
+});
+
+/**
+ * Ex-Settings画面(初期表示) [Scene: Ex-Settings / apple]
  */
 g_customJsObj.exSetting.push(() => {
 
 });
 
+/**
+ * 設定サマリー表示描画時
+ */
+g_customJsObj.settingSummary.push(() => {
+
+});
+
 /**
  * キーコンフィグ画面(初期表示) [Scene: KeyConfig / Orange]
  */
@@ -125,98 +152,152 @@ g_customJsObj.main.push(() => {
 });
 
 /**
- * 矢印生成
+ * 矢印生成前（g_attrObj定義後）
+ * - g_attrObjの書き換えを行いたいときなどの使用を想定
  * @param {object} _attrs 矢印属性
  * @param {string} _arrowName 矢印名
  * @param {string} _name 矢印識別名
  * @param {number} _arrowCnt 矢印番号
  */
-g_customJsObj.makeArrow.push((_attrs, _arrowName, _name, _arrowCnt) => {
+g_customJsObj.preMakeArrow.push((_attrs, _arrowName, _name, _arrowCnt) => {
 
 });
 
 /**
- * フリーズアロー生成
+ * 矢印生成
  * @param {object} _attrs 矢印属性
  * @param {string} _arrowName 矢印名
  * @param {string} _name 矢印識別名
  * @param {number} _arrowCnt 矢印番号
  */
+g_customJsObj.makeArrow.push((_attrs, _arrowName, _name, _arrowCnt) => {
+
+});
+
+/**
+ * フリーズアロー生成前（g_attrObj定義後）
+ * - g_attrObjの書き換えを行いたいときなどの使用を想定
+ * @param {object} _attrs フリーズアロー属性
+ * @param {string} _arrowName フリーズアロー名
+ * @param {string} _name フリーズアロー識別名
+ * @param {number} _arrowCnt フリーズアロー番号
+ */
+g_customJsObj.preMakeFrzArrow.push((_attrs, _arrowName, _name, _arrowCnt) => {
+
+});
+
+/**
+ * フリーズアロー生成
+ * @param {object} _attrs フリーズアロー属性
+ * @param {string} _arrowName フリーズアロー名
+ * @param {string} _name フリーズアロー識別名
+ * @param {number} _arrowCnt フリーズアロー番号
+ */
 g_customJsObj.makeFrzArrow.push((_attrs, _arrowName, _name, _arrowCnt) => {
 
 });
 
 /**
  * ダミー矢印判定時
+ * @param {number} _j レーン番号
  */
-g_customJsObj.dummyArrow.push(() => {
+g_customJsObj.dummyArrow.push((_j) => {
 
 });
 
 /**
  * ダミーフリーズアロー判定時
+ * @param {number} _j レーン番号
+ */
+g_customJsObj.dummyFrz.push((_j) => {
+
+});
+
+/**
+ * Appearanceフィルター動作時
+ * @param {number} _topNum 上部のフィルターに対応するmainSpriteの番号
+ * @param {number} _bottomNum 下部のフィルターに対応するmainSpriteの番号
  */
-g_customJsObj.dummyFrz.push(() => {
+g_customJsObj.appearanceFilter.push((_topNum, _bottomNum) => {
 
 });
 
 /**
  * 判定カスタム処理 (引数は共通で1つ保持)
  * @param {number} _difFrame タイミング誤差(フレーム数)
+ * @param {number} _j レーン番号
  */
 // イイ
-g_customJsObj.judg_ii.push((_difFrame) => {
+g_customJsObj.judg_ii.push((_difFrame, _j) => {
 
 });
 
 // シャキン
-g_customJsObj.judg_shakin.push((_difFrame) => {
+g_customJsObj.judg_shakin.push((_difFrame, _j) => {
 
 });
 
 // マターリ
-g_customJsObj.judg_matari.push((_difFrame) => {
+g_customJsObj.judg_matari.push((_difFrame, _j) => {
 
 });
 
 // ショボーン
-g_customJsObj.judg_shobon.push((_difFrame) => {
+g_customJsObj.judg_shobon.push((_difFrame, _j) => {
 
 });
 
 // ウワァン
-g_customJsObj.judg_uwan.push((_difFrame) => {
+g_customJsObj.judg_uwan.push((_difFrame, _j) => {
 
 });
 
 // キター
-g_customJsObj.judg_kita.push((_difFrame) => {
+g_customJsObj.judg_kita.push((_difFrame, _j) => {
 
 });
 
 // イクナイ
-g_customJsObj.judg_iknai.push((_difFrame) => {
+g_customJsObj.judg_iknai.push((_difFrame, _j) => {
+
+});
+
+// Excessive
+g_customJsObj.judg_excessive.push((_difFrame, _j) => {
 
 });
 
 // 通常フリーズアローヒット時
-g_customJsObj.judg_frzHit.push((_difFrame) => {
+g_customJsObj.judg_frzHit.push((_difFrame, _j) => {
 
 });
 
 // ダミーフリーズアローヒット時
-g_customJsObj.judg_dummyFrzHit.push((_difFrame) => {
+g_customJsObj.judg_dummyFrzHit.push((_difFrame, _j) => {
 
 });
 
 /**
  * メイン画面(フレーム毎表示) [Scene: Main / Banana]
  * - 現在のフレーム数は g_scoreObj.baseFrame で取得可能
+ * - 矢印生成、移動前に処理を行いたいときに記述
  */
 g_customJsObj.mainEnterFrame.push(() => {
 
 });
 
+/**
+ * メイン画面(フレーム毎表示、タイマー直前)
+ * - 矢印生成、移動後に処理を行いたいときに記述
+ * @param {number[]} arrowCnts 矢印カウント情報
+ * @param {number[]} frzCnts フリーズアローカウント情報
+ * @param {number[]} dummyArrowCnts ダミー矢印カウント情報
+ * @param {number[]} dummyFrzCnts ダミーフリーズアローカウント情報
+ */
+g_customJsObj.mainBeforeFrameTimer.push(({ arrowCnts, frzCnts, dummyArrowCnts, dummyFrzCnts }) => {
+
+});
+
 /**
  * 結果画面(初期表示) [Scene: Result / Grape]
  */

package/package.json

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