danoniplus 47.6.4 → 48.0.0

package/css/danoni_main.css

@@ -4,7 +4,7 @@
   本体cssファイル
 
   Created : 2018/10/08
-  Revised : 2025/02/01 (v39.0.0)
+  Revised : 2026/05/17 (v48.0.0)
 
   https://github.com/cwtickle/danoniplus
 ------------------------------------------ */
@@ -839,6 +839,14 @@ input[type="color"] {
 	color: var(--life-color-border-x, #cccccc);
 }
 
+.life_frzNormal {
+	background: var(--life-frz-normal, var(--main-stepShobon, #ccccff));
+}
+
+.life_frzActive {
+	background: var(--life-frz-active, var(--main-stepMatari, #ff9966));
+}
+
 /* 結果画面：項目、設定値 */
 .result_lbl {
 	color: var(--result-lbl-x, #999999);
@@ -909,6 +917,22 @@ input[type="color"] {
 	color: var(--common-excessive, var(--common-kita));
 }
 
+.common_auto {
+	color: var(--common-auto, var(--common-kita, #ffff99));
+}
+
+.common_shuffle {
+	color: var(--settings-shuffle-x, var(--common-iknai, #99ff66));
+}
+
+.common_assist {
+	color: var(--settings-assist-x, var(--common-kita, #ffff99));
+}
+
+.common_another {
+	color: var(--settings-another-x, var(--common-ii, #66ffff));
+}
+
 /* 結果画面：枠 */
 .result_PlayDataWindow {
 	border: solid 0.5px #666666;

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/05/15
+ * Revised : 2026/05/17
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 47.6.4`;
-const g_revisedDate = `2026/05/15`;
+const g_version = `Ver 48.0.0`;
+const g_revisedDate = `2026/05/17`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -6924,7 +6924,7 @@ const commonSettingBtn = _labelName => {
 		// キーコンフィグ画面へ移動
 		createCss2Button(`btnKeyConfig`, g_lblNameObj.b_keyConfig, () => true, {
 			...g_lblPosObj.btnKeyConfig,
-			animationName: (g_initialFlg ? `` : `smallToNormalY`), resetFunc: () => keyConfigInit(`Main`),
+			animationName: (g_initialFlg ? `` : `smallToNormalY`), resetFunc: () => keyConfigInit(`Main`, true),
 		}, g_cssObj.button_Setting),
 
 		// プレイ開始
@@ -7006,7 +7006,7 @@ const updateSettingSummary = () => {
 	const estimatedHighscoreCondition = g_stateObj.dataSaveFlg && (g_stateObj.autoPlay !== C_FLG_ALL && g_headerObj.playbackRate === 1 && g_stateObj.fadein < 10 &&
 		(g_stateObj.shuffle === C_FLG_OFF || (g_stateObj.shuffle.endsWith(`Mirror`) && orgShuffleFlg)));
 
-	document.getElementById(`lblSummaryDifInfo`).innerHTML = settingData.difData + `${estimatedHighscoreCondition ? '' : ` | <span class="common_kita common_bold">No Records</span>`}`;
+	document.getElementById(`lblSummaryDifInfo`).innerHTML = settingData.difData + `${estimatedHighscoreCondition ? '' : ` | <span class="common_auto common_bold">No Records</span>`}`;
 	document.getElementById(`lblSummaryPlaystyleInfo`).textContent = settingData.playStyleData + `${g_stateObj.excessive === C_FLG_ON ? ' | Excessive' : ''}`;
 	document.getElementById(`lblSummaryDisplayInfo`).textContent = settingData.displayData;
 	document.getElementById(`lblSummaryDisplay2Info`).textContent = settingData.display2Data;
@@ -7784,9 +7784,9 @@ const makeHighScore = _scoreId => {
 			`${g_localStorage.highscores?.[scoreName]?.allPerfect ?? '' ? '<span class="result_AllPerfect">◆</span>' : ''}`, { xPos: 1, dx: 20, yPos: 12, w: 100, align: C_ALIGN_CENTER }),
 		createScoreLabel(`lblHClearLamps`, `Cleared: ` + (g_localStorage.highscores?.[scoreName]?.clearLamps?.join(', ') ?? C_FLG_HYPHEN), { yPos: 13, overflow: C_DIS_AUTO, w: g_sWidth / 2 + 40, h: 37 }),
 
-		createScoreLabel(`lblHShuffle`, g_stateObj.shuffle.indexOf(`Mirror`) < 0 ? `` : `Shuffle: <span class="common_iknai">${g_stateObj.shuffle}</span>`, { yPos: 11.5, dx: -130 }),
-		createScoreLabel(`lblHAssist`, g_autoPlaysBase.includes(g_stateObj.autoPlay) ? `` : `Assist: <span class="common_kita">${g_stateObj.autoPlay}</span>`, { yPos: 12.5, dx: -130 }),
-		createScoreLabel(`lblHAnother`, !hasVal(g_keyObj[`transKey${keyCtrlPtn}`]) ? `` : `A.Keymode: <span class="common_ii">${g_keyObj[`transKey${keyCtrlPtn}`]}</span>`, { yPos: 13.5, dx: -130 }),
+		createScoreLabel(`lblHShuffle`, g_stateObj.shuffle.indexOf(`Mirror`) < 0 ? `` : `Shuffle: <span class="common_shuffle">${g_stateObj.shuffle}</span>`, { yPos: 11.5, dx: -130 }),
+		createScoreLabel(`lblHAssist`, g_autoPlaysBase.includes(g_stateObj.autoPlay) ? `` : `Assist: <span class="common_assist">${g_stateObj.autoPlay}</span>`, { yPos: 12.5, dx: -130 }),
+		createScoreLabel(`lblHAnother`, !hasVal(g_keyObj[`transKey${keyCtrlPtn}`]) ? `` : `A.Keymode: <span class="common_another">${g_keyObj[`transKey${keyCtrlPtn}`]}</span>`, { yPos: 13.5, dx: -130 }),
 	);
 
 	// 結果をクリップボードへコピー (ハイスコア保存分)
@@ -9444,8 +9444,9 @@ const createGeneralSettingEx = (_spriteList, _name, { defaultList = [C_FLG_OFF],
 /**
  * キーコンフィグ画面初期化
  * @param {string} _kcType
+ * @param {boolean} _initFlg 初期表示フラグ
  */
-const keyConfigInit = (_kcType = g_kcType) => {
+const keyConfigInit = (_kcType = g_kcType, _initFlg = false) => {
 
 	clearWindow(true);
 	const divRoot = document.getElementById(`divRoot`);
@@ -9491,6 +9492,36 @@ const keyConfigInit = (_kcType = g_kcType) => {
 		g_keyObj[`keyGroupOrder${keyCtrlPtn}`] ?? tkObj.keyGroupList;
 	g_keycons.colorCursorNum = 0;
 
+	// 色変化中の初期色を取得（矢印枠のみ）
+	const arrowColorTmp = g_detailObj.miniMapParams[g_stateObj.scoreId]._scoreObj.ncolorData.Arrow;
+	const arrowColors = Array.from({ length: Math.ceil(arrowColorTmp.length / 5) }, (_, i) =>
+		arrowColorTmp.slice(i * 5, i * 5 + 5)
+	).filter(val => val[0] === 0);
+	const initColors = [];
+	arrowColors.forEach(val => {
+		const laneToken = val[1];
+		const laneStr = String(laneToken ?? ``);
+		if (laneStr.startsWith('g')) {
+			// g付きの場合は矢印グループから対象の矢印番号を検索
+			const groupVal = setIntVal(laneStr.slice(1));
+			for (let j = 0; j < tkObj.keyNum; j++) {
+				if (g_keyObj[`color${tkObj.keyCtrlPtn}`][j] === groupVal) {
+					initColors[j] = makeColorGradation(val[2]);
+				}
+			}
+		} else {
+			const laneIdx = setIntVal(laneToken, -1);
+			if (laneIdx >= 0 && laneIdx < tkObj.keyNum) {
+				initColors[laneIdx] = makeColorGradation(val[2]);
+			}
+		}
+	});
+	if (_initFlg) {
+		g_baseColorGrs = {};
+		const colorKey = Object.keys(g_keyObj).filter(val => val.startsWith(`color${g_keyObj.currentKey}`));
+		colorKey.forEach(val => g_baseColorGrs[val] = g_keyObj[val]);
+	}
+
 	/**
 	 * keyconSpriteのスクロール位置調整
 	 * @param {number} _targetX 
@@ -9509,6 +9540,20 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	 */
 	const getKeyConfigColor = (_j, _colorPos) => {
 		let arrowColor = g_headerObj.setColor[_colorPos];
+
+		// 色変化データの利用条件設定（Default/Type0限定）
+		const storageObj = g_stateObj.extraKeyFlg ? g_localStorage : g_localKeyStorage;
+		const baseGroupNum = g_keycons.colorGroupNum === -1
+			? (storageObj?.[`keyCtrlPtn${g_keyObj.currentKey}`] ?? storageObj?.keyCtrlPtn ?? 0)
+			: g_keycons.colorGroupNum;
+		const currentColorGr = g_keyObj[`color${keyCtrlPtn}_${g_keycons.colorGroupNum}`];
+		const baseColorGr = g_baseColorGrs?.[`color${keyCtrlPtn}_${baseGroupNum}`];
+		if (hasVal(initColors[_j]) && g_keycons.colorDefTypes.includes(g_colorType)
+			&& currentColorGr?.[_j] === baseColorGr?.[_j]) {
+			arrowColor = initColors[_j];
+		}
+
+		// アシスト設定時はアシストの色を優先して適用
 		if (typeof g_keyObj[`assistPos${keyCtrlPtn}`] === C_TYP_OBJECT &&
 			g_keyObj[`assistPos${keyCtrlPtn}`][g_stateObj.autoPlay] !== undefined &&
 			!g_autoPlaysBase.includes(g_stateObj.autoPlay)) {
@@ -9809,6 +9854,12 @@ const keyConfigInit = (_kcType = g_kcType) => {
 			hasVal(g_keyObj[`transKey${keyCtrlPtn}`]) ? g_lblNameObj.transKeyDesc : ``,
 			g_lblPosObj.kcMsg, g_cssObj.keyconfig_warning
 		),
+		// ColorType警告メッセージ
+		createDivCss2Label(
+			`kcMsg2`,
+			g_keycons.colorDefTypes.includes(g_colorType) ? `` : g_lblNameObj.colorTypeDesc,
+			g_lblPosObj.kcMsg2, g_cssObj.keyconfig_Defaultkey
+		),
 
 		// キーカラータイプ切替ボタン
 		makeKCButtonHeader(`lblcolorType`, `ColorType`, { x: 10 + g_btnX() }, g_cssObj.keyconfig_ColorType),
@@ -9988,14 +10039,18 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	const setColorType = (_scrollNum = 1, _reloadFlg = true) => {
 		const nextNum = getNextNum(_scrollNum, `colorTypes`, g_colorType);
 		g_colorType = g_keycons.colorTypes[nextNum];
+		const isDefault = g_keycons.colorDefTypes.includes(g_colorType);
 		if (g_headerObj.colorUse) {
 			g_stateObj.d_color = boolToSwitch(g_keycons.colorDefTypes.findIndex(val => val === g_colorType) !== -1);
 		}
 		changeSetColor();
 		viewGroupObj.color(`_${g_keycons.colorGroupNum}`);
 		lnkColorType.textContent = `${getStgDetailName(g_colorType)}${g_localStorage.colorType === g_colorType ? ' *' : ''}`;
+		kcMsg2.textContent = (isDefault || !g_headerObj.colorUse) ? `` : g_lblNameObj.colorTypeDesc;
+		kcMsg2.style.top = wUnit(hasVal(g_keyObj[`transKey${keyCtrlPtn}`]) ? g_lblPosObj.kcMsg2.y : g_lblPosObj.kcMsg.y);
+		kcMsg2.style.fontSize = wUnit(getFontSize2(kcMsg2.textContent, g_btnWidth()));
 		if (_reloadFlg) {
-			colorPickSprite.style.display = ([`Default`, `Type0`].includes(g_colorType) ? C_DIS_NONE : C_DIS_INHERIT);
+			colorPickSprite.style.display = isDefault ? C_DIS_NONE : C_DIS_INHERIT;
 			g_keycons.colorCursorNum = g_keycons.colorCursorNum % Math.ceil(g_headerObj.setColor.length / g_limitObj.kcColorPickerNum);
 			changeColorPickers();
 		}
@@ -10017,7 +10072,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	};
 
 	const colorPickSprite = createEmptySprite(divRoot, `colorPickSprite`, { ...g_windowObj.colorPickSprite, title: g_msgObj.pickArrow });
-	if ([`Default`, `Type0`].includes(g_colorType)) {
+	if (g_keycons.colorDefTypes.includes(g_colorType)) {
 		colorPickSprite.style.display = C_DIS_NONE;
 	}
 	multiAppend(colorPickSprite,
@@ -11052,7 +11107,7 @@ const updateKeyInfo = (_header, _keyCtrlPtn) => {
  * - ここでのID管理は1譜面目も区別して設定する (setScoreIdHeaderの第三引数を使用)
  */
 const changeSetColor = () => {
-	const isDefault = [`Default`, `Type0`].includes(g_colorType);
+	const isDefault = g_keycons.colorDefTypes.includes(g_colorType);
 	const idHeader = setScoreIdHeader(g_stateObj.scoreId, false, true);
 	const defaultType = idHeader + g_colorType;
 	const currentTypes = {
@@ -13819,7 +13874,7 @@ const mainInit = () => {
 		multiAppend(infoSprite,
 			// FrzReturnゲージ
 			createColorObject2(`lifeBackFrzObj`, { ...g_lblPosObj.lifeBackFrzObj, display: g_workObj.scoreDisp }, g_cssObj.life_Background),
-			createColorObject2(`lifeBarFrz`, { ...g_lblPosObj.lifeBarFrz, display: g_workObj.scoreDisp }, g_cssObj.main_stepShobon),
+			createColorObject2(`lifeBarFrz`, { ...g_lblPosObj.lifeBarFrz, display: g_workObj.scoreDisp }, g_cssObj.life_frzNormal),
 		)
 	}
 
@@ -14176,7 +14231,7 @@ const mainInit = () => {
 		// 矢印(枠外判定、AutoPlay: OFF)
 		arrowOFF: (_j, _arrowName, _cnt) => {
 			if (_cnt < (-1) * g_judgObj.arrowJ[g_judgPosObj.shobon]) {
-				judgeUwan(_cnt);
+				judgeUwan(_cnt, _j);
 				judgeObjDelete.arrow(_j, _arrowName);
 			}
 		},
@@ -14186,7 +14241,7 @@ const mainInit = () => {
 			if (_cnt === 0) {
 				const stepDivHit = document.getElementById(`stepHit${_j}`);
 
-				judgeIi(_cnt);
+				judgeIi(_cnt, _j);
 				stepDivHit.style.opacity = 1;
 				stepDivHit.setAttribute(`cnt`, C_FRM_HITMOTION);
 				judgeObjDelete.arrow(_j, _arrowName);
@@ -14198,7 +14253,7 @@ const mainInit = () => {
 			if (_cnt === 0) {
 				const stepDivHit = document.getElementById(`stepHit${_j}`);
 
-				safeExecuteCustomHooks(`g_customJsObj.dummyArrow`, g_customJsObj.dummyArrow);
+				safeExecuteCustomHooks(`g_customJsObj.dummyArrow`, g_customJsObj.dummyArrow, _j);
 				stepDivHit.style.top = wUnit(-15);
 				stepDivHit.style.opacity = 1;
 				stepDivHit.classList.value = ``;
@@ -14214,7 +14269,7 @@ const mainInit = () => {
 
 		// フリーズアロー(成功時)
 		frzOK: (_j, _k, _frzName, _cnt) => {
-			judgeKita(_cnt);
+			judgeKita(_cnt, _j);
 			$id(`frzHit${_j}`).opacity = 0;
 			g_attrObj[_frzName].judgEndFlg = true;
 			judgeObjDelete.frz(_j, _frzName);
@@ -14222,7 +14277,7 @@ const mainInit = () => {
 
 		// ダミーフリーズアロー(成功時)
 		dummyFrzOK: (_j, _k, _frzName, _cnt) => {
-			safeExecuteCustomHooks(`g_customJsObj.dummyFrz`, g_customJsObj.dummyFrz);
+			safeExecuteCustomHooks(`g_customJsObj.dummyFrz`, g_customJsObj.dummyFrz, _j);
 			$id(`frzHit${_j}`).opacity = 0;
 			g_attrObj[_frzName].judgEndFlg = true;
 			judgeObjDelete.dummyFrz(_j, _frzName);
@@ -14231,12 +14286,12 @@ const mainInit = () => {
 		// フリーズアロー(枠外判定)
 		frzNG: (_j, _k, _frzName, _cnt) => {
 			if (_cnt < (-1) * g_judgObj.frzJ[g_judgPosObj.iknai]) {
-				judgeIknai(_cnt);
+				judgeIknai(_cnt, _j);
 				g_attrObj[_frzName].judgEndFlg = true;
 
 				changeFailedFrz(_j, _k);
 				if (g_headerObj.frzStartjdgUse) {
-					judgeUwan(_cnt);
+					judgeUwan(_cnt, _j);
 				}
 			}
 		},
@@ -14247,7 +14302,7 @@ const mainInit = () => {
 		// フリーズアロー(キーを離したときの処理)
 		frzKeyUp: (_j, _k, _frzName, _cnt) => {
 			if (g_attrObj[_frzName].keyUpFrame > g_headerObj.frzAttempt) {
-				judgeIknai(_cnt);
+				judgeIknai(_cnt, _j);
 				g_attrObj[_frzName].judgEndFlg = true;
 				changeFailedFrz(_j, _k);
 			}
@@ -14289,7 +14344,7 @@ const mainInit = () => {
 
 					// 自身より前の矢印が未判定の場合、強制的に枠外判定を行い矢印を削除
 					if (prevArrow.cnt >= (-1) * g_judgObj.arrowJ[g_judgPosObj.uwan]) {
-						judgeUwan(prevArrow.cnt);
+						judgeUwan(prevArrow.cnt, _j);
 						judgeObjDelete.arrow(_j, prevArrowName);
 					}
 				}
@@ -14316,9 +14371,9 @@ const mainInit = () => {
 
 					// 自身より前のフリーズアローが未判定の場合、強制的に枠外判定を行う
 					if (prevFrz.cnt >= (-1) * g_judgObj.frzJ[g_judgPosObj.iknai] && !prevFrz.judgEndFlg) {
-						judgeIknai(prevFrz.cnt);
+						judgeIknai(prevFrz.cnt, _j);
 						if (g_headerObj.frzStartjdgUse) {
-							judgeUwan(prevFrz.cnt);
+							judgeUwan(prevFrz.cnt, _j);
 						}
 					}
 					// 自身より前のフリーズアローを削除して判定対象を自身に変更 (g_workObj.judgFrzCnt[_j]をカウントアップ)
@@ -14332,7 +14387,7 @@ const mainInit = () => {
 			if (_cnt === 0) {
 				changeHitFrz(_j, _k, `frz`);
 				if (g_headerObj.frzStartjdgUse) {
-					judgeIi(_cnt);
+					judgeIi(_cnt, _j);
 				}
 			}
 		},
@@ -15204,8 +15259,8 @@ const startFrzReturn = () => {
 			clearTimeout(g_workObj.frzReturnTimerId);
 			g_workObj.frzReturnTimerId = null;
 		}
-		lifeBarFrz.classList.remove(g_cssObj.main_stepShobon, g_cssObj.main_stepMatari);
-		lifeBarFrz.classList.add(g_cssObj.main_stepMatari);
+		lifeBarFrz.classList.remove(g_cssObj.life_frzNormal, g_cssObj.life_frzActive);
+		lifeBarFrz.classList.add(g_cssObj.life_frzActive);
 		const seqLen = g_workObj.frzReturnSeq.length;
 		executeFrzReturn(
 			g_workObj.frzReturnSeq[seqLen > 1 ? Math.floor(Math.random() * seqLen) : 0], 0,
@@ -15236,8 +15291,8 @@ const executeFrzReturn = (_seq, _idx, _axis) => {
 		g_workObj.frzReturnFlg = false;
 		g_workObj.frzReturnTimerId = null;
 		const frzReturnGauge = document.getElementById(`lifeBarFrz`);
-		frzReturnGauge.classList.remove(g_cssObj.main_stepShobon, g_cssObj.main_stepMatari);
-		frzReturnGauge.classList.add(g_cssObj.main_stepShobon);
+		frzReturnGauge.classList.remove(g_cssObj.life_frzNormal, g_cssObj.life_frzActive);
+		frzReturnGauge.classList.add(g_cssObj.life_frzNormal);
 		return;
 	}
 
@@ -15470,7 +15525,7 @@ const changeHitFrz = (_j, _k, _name, _difFrame = 0) => {
 	if (g_stateObj.frzReturn !== C_FLG_OFF) {
 		startFrzReturn();
 	}
-	safeExecuteCustomHooks(`g_customJsObj.judg_${_name}Hit`, g_customJsObj[`judg_${_name}Hit`], _difFrame);
+	safeExecuteCustomHooks(`g_customJsObj.judg_${_name}Hit`, g_customJsObj[`judg_${_name}Hit`], _difFrame, _j);
 };
 
 /**
@@ -15544,7 +15599,7 @@ const judgeArrow = _j => {
 		} else if (_difCnt <= g_judgObj.arrowJ[g_judgPosObj.shobon]) {
 			// 通常判定
 			const [resultFunc, resultJdg] = checkJudgment(_difCnt);
-			resultFunc(_difFrame);
+			resultFunc(_difFrame, _j);
 			displayDiff(_difFrame);
 			stepHitTargetArrow(resultJdg);
 			document.getElementById(arrowName).remove();
@@ -15561,7 +15616,7 @@ const judgeArrow = _j => {
 
 			if (g_headerObj.frzStartjdgUse) {
 				const [resultFunc] = checkJudgment(_difCnt);
-				resultFunc(_difFrame);
+				resultFunc(_difFrame, _j);
 				displayDiff(_difFrame);
 			} else {
 				displayDiff(_difFrame, `F`);
@@ -15572,7 +15627,7 @@ const judgeArrow = _j => {
 			} else {
 				changeFailedFrz(_j, fcurrentNo);
 				if (g_headerObj.frzStartjdgUse) {
-					judgeIknai(_difFrame);
+					judgeIknai(_difFrame, _j);
 					currentFrz.judgEndFlg = true;
 				}
 			}
@@ -15708,8 +15763,9 @@ const updateCombo = () => {
  * 回復判定の共通処理
  * @param {string} _name 
  * @param {number} _difFrame 
+ * @param {number} _j
  */
-const judgeRecovery = (_name, _difFrame) => {
+const judgeRecovery = (_name, _difFrame, _j) => {
 	changeJudgeCharacter(_name, g_lblNameObj[`j_${_name}`]);
 	updateCombo();
 	lifeRecovery();
@@ -15727,65 +15783,72 @@ const judgeRecovery = (_name, _difFrame) => {
 	if (_name === `shakin`) {
 		quickRetry(`Shakin(Great)`);
 	}
-	safeExecuteCustomHooks(`g_customJsObj.judg_${_name}`, g_customJsObj[`judg_${_name}`], _difFrame);
+	safeExecuteCustomHooks(`g_customJsObj.judg_${_name}`, g_customJsObj[`judg_${_name}`], _difFrame, _j);
 };
 
 /**
  * ダメージ系共通処理
  * @param {string} _name 
  * @param {number} _difFrame 
+ * @param {number} _j
  */
-const judgeDamage = (_name, _difFrame) => {
+const judgeDamage = (_name, _difFrame, _j) => {
 	changeJudgeCharacter(_name, g_lblNameObj[`j_${_name}`]);
 	g_resultObj.combo = 0;
 	comboJ.textContent = ``;
 	diffJ.textContent = ``;
 	lifeDamage();
-	safeExecuteCustomHooks(`g_customJsObj.judg_${_name}`, g_customJsObj[`judg_${_name}`], _difFrame);
+	safeExecuteCustomHooks(`g_customJsObj.judg_${_name}`, g_customJsObj[`judg_${_name}`], _difFrame, _j);
 };
 
 /**
  * 判定処理：イイ
  * @param {number} _difFrame 
+ * @param {number} _j
  */
-const judgeIi = _difFrame => judgeRecovery(`ii`, _difFrame);
+const judgeIi = (_difFrame, _j) => judgeRecovery(`ii`, _difFrame, _j);
 
 /**
  * 判定処理：シャキン
  * @param {number} _difFrame 
+ * @param {number} _j
  */
-const judgeShakin = _difFrame => judgeRecovery(`shakin`, _difFrame);
+const judgeShakin = (_difFrame, _j) => judgeRecovery(`shakin`, _difFrame, _j);
 
 /**
  * 判定処理：マターリ
  * @param {number} _difFrame 
+ * @param {number} _j
  */
-const judgeMatari = _difFrame => {
+const judgeMatari = (_difFrame, _j) => {
 	changeJudgeCharacter(`matari`, g_lblNameObj.j_matari);
 	comboJ.textContent = ``;
 	finishViewing();
 	quickRetry(`Matari(Good)`);
 
-	safeExecuteCustomHooks(`g_customJsObj.judg_matari`, g_customJsObj.judg_matari, _difFrame);
+	safeExecuteCustomHooks(`g_customJsObj.judg_matari`, g_customJsObj.judg_matari, _difFrame, _j);
 };
 
 /**
  * 判定処理：ショボーン
  * @param {number} _difFrame 
+ * @param {number} _j
  */
-const judgeShobon = _difFrame => judgeDamage(`shobon`, _difFrame);
+const judgeShobon = (_difFrame, _j) => judgeDamage(`shobon`, _difFrame, _j);
 
 /**
  * 判定処理：ウワァン
  * @param {number} _difFrame 
+ * @param {number} _j
  */
-const judgeUwan = _difFrame => judgeDamage(`uwan`, _difFrame);
+const judgeUwan = (_difFrame, _j) => judgeDamage(`uwan`, _difFrame, _j);
 
 /**
  * 判定処理：キター
  * @param {number} _difFrame 
+ * @param {number} _j
  */
-const judgeKita = _difFrame => {
+const judgeKita = (_difFrame, _j) => {
 	changeJudgeCharacter(`kita`, g_lblNameObj.j_kita, `F`);
 
 	if (++g_resultObj.fCombo > g_resultObj.fmaxCombo) {
@@ -15797,21 +15860,22 @@ const judgeKita = _difFrame => {
 	lifeRecovery();
 	finishViewing();
 
-	safeExecuteCustomHooks(`g_customJsObj.judg_kita`, g_customJsObj.judg_kita, _difFrame);
+	safeExecuteCustomHooks(`g_customJsObj.judg_kita`, g_customJsObj.judg_kita, _difFrame, _j);
 };
 
 /**
  * 判定処理：イクナイ
  * @param {number} _difFrame 
+ * @param {number} _j
  */
-const judgeIknai = _difFrame => {
+const judgeIknai = (_difFrame, _j) => {
 	changeJudgeCharacter(`iknai`, g_lblNameObj.j_iknai, `F`);
 	comboFJ.textContent = ``;
 	g_resultObj.fCombo = 0;
 
 	lifeDamage();
 
-	safeExecuteCustomHooks(`g_customJsObj.judg_iknai`, g_customJsObj.judg_iknai, _difFrame);
+	safeExecuteCustomHooks(`g_customJsObj.judg_iknai`, g_customJsObj.judg_iknai, _difFrame, _j);
 };
 
 const jdgList = [`ii`, `shakin`, `matari`, `shobon`].map(jdg => toCapitalize(jdg));

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/05/13 (v47.6.1)
+ * Revised : 2026/05/17 (v48.0.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -542,7 +542,10 @@ const updateWindowSiz = () => {
             x: g_btnX(), y: g_sHeight - 50, w: g_btnWidth(1 / 4), h: 20,
         },
         kcMsg: {
-            x: g_btnX(), y: g_sHeight - 33, w: g_btnWidth(), h: 20, siz: g_limitObj.mainSiz,
+            x: g_btnX(), y: g_sHeight - 35, w: g_btnWidth(), h: 20, siz: g_limitObj.mainSiz,
+        },
+        kcMsg2: {
+            x: g_btnX(), y: g_sHeight - 20, w: g_btnWidth(), h: 20, siz: g_limitObj.mainSiz,
         },
         kcDesc: {
             x: g_btnX() + 50, y: 68, w: g_btnWidth() - 100, h: 20,
@@ -3097,6 +3100,8 @@ const g_cssObj = {
     life_Background: `life_Background`,
     life_Border: `life_Border`,
     life_BorderColor: `life_BorderColor`,
+    life_frzNormal: `life_frzNormal`,
+    life_frzActive: `life_frzActive`,
 
     result_lbl: `result_lbl`,
     result_style: `result_style`,
@@ -3118,6 +3123,11 @@ const g_cssObj = {
     common_excessive: `common_excessive`,
     common_estAdj: `common_estAdj`,
 
+    common_auto: `common_auto`,
+    common_shuffle: `common_shuffle`,
+    common_assist: `common_assist`,
+    common_another: `common_another`,
+
     result_score: `result_score`,
     result_scoreHiBlanket: `result_scoreHiBlanket`,
     result_scoreHi: `result_scoreHi`,
@@ -3835,6 +3845,8 @@ Object.keys(g_keyObj)
     .filter(key => key.startsWith(g_keyObj.defaultProp) && key.endsWith(`_0`))
     .forEach(key => g_keyObj.defaultKeyList.push(key.split(`_`)[0].slice(g_keyObj.defaultProp.length)));
 
+let g_baseColorGrs = {};
+
 // キーパターンのコピーリスト
 // ・コピー先：コピー元の順に指定する
 // ・上から順に処理する
@@ -4719,6 +4731,7 @@ const g_lang_lblNameObj = {
         kcShortcutDesc1: `タイトルバック: {0}`,
         kcShortcutDesc2: `リトライ: {1}`,
         transKeyDesc: `別キーモードではキーコンフィグ、ColorType等は保存されません`,
+        colorTypeDesc: `現在のColorTypeの設定では、色変化(Display:Color)は自動的にOFFになります`,
         sdShortcutDesc: `Hid+/Sud+時ショートカット：「pageUp」カバーを上へ / 「pageDown」下へ`,
         resultImageDesc: `画像を右クリックしてコピーできます`,
 
@@ -4775,6 +4788,7 @@ const g_lang_lblNameObj = {
         kcShortcutDesc1: `Return to title: {0}`,
         kcShortcutDesc2: `Retry the game: {1}`,
         transKeyDesc: `Key config, Color type, etc. are not saved in another key mode`,
+        colorTypeDesc: `With the current ColorType setting, color change (Display:Color) will be automatically turned OFF.`,
         sdShortcutDesc: `When "Hidden+" or "Sudden+" select, "pageUp" cover up / "pageDown" cover down`,
         resultImageDesc: `You can copy the image by right-clicking on it.`,
 

package/package.json

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

package/skin/danoni_skin_default.css

@@ -5,7 +5,7 @@
   スキンcssファイル (default)
 
   Created : 2019/11/04
-  Revised : 2025/02/01 (v39.0.0)
+  Revised : 2026/05/17 (v48.0.0)
 
   https://github.com/cwtickle/danoniplus
 ------------------------------------------ */
@@ -70,6 +70,10 @@
 	--settings-slice-gaugeTable-x: 1;
 	--settings-border-gaugeTable-x: 1px;
 
+	/* 譜面明細子画面: ハイスコア表示 */
+	/* --settings-assist-x: var(--common-kita); */
+	/* --settings-another-x: var(--common-ii); */
+
 	/* キーコンフィグ関連 */
 	--keyconfig-warning-x: #ffff99;
 	--keyconfig-imgType-x: #99ddff;
@@ -96,6 +100,7 @@
 	/* --common-diffSlow: var(--common-shobon); */
 	/* --common-estAdj: var(--common-shakin); */
 	/* --common-excessive: var(--common-kita); */
+	/* --common-auto: var(--common-kita); */
 
 	/* ステップゾーン */
 	--main-stepKeyDown: #66ffff;
@@ -115,6 +120,10 @@
 	--life-cleared: #004444;
 	--life-failed: #444444;
 
+	/* ライフゲージ: FrzReturn用 */
+	/* --life-frz-normal: var(--main-stepShobon); */
+	/* --life-frz-active: var(--main-stepMatari); */
+
 	/* ライフゲージ本体 */
 	--life-background: #222222;
 	--life-bg-border: #555555;

package/skin/danoni_skin_light.css

@@ -5,7 +5,7 @@
   スキンcssファイル (light)
 
   Created : 2019/11/04
-  Revised : 2025/02/01 (v39.0.0)
+  Revised : 2026/05/17 (v48.0.0)
 
   https://github.com/cwtickle/danoniplus
 ------------------------------------------ */
@@ -70,6 +70,10 @@
 	--settings-slice-gaugeTable-x: 1;
 	--settings-border-gaugeTable-x: 1px;
 
+	/* 譜面明細子画面: ハイスコア表示 */
+	/* --settings-assist-x: var(--common-kita); */
+	/* --settings-another-x: var(--common-ii); */
+
 	/* キーコンフィグ関連 */
 	--keyconfig-warning-x: #999900;
 	--keyconfig-imgType-x: #003377;
@@ -96,6 +100,7 @@
 	/* --common-diffSlow: var(--common-shobon); */
 	/* --common-estAdj: var(--common-shakin); */
 	/* --common-excessive: var(--common-kita); */
+	/* --common-auto: var(--common-kita); */
 
 	/* ステップゾーン */
 	--main-stepKeyDown: #009999;
@@ -115,6 +120,10 @@
 	--life-cleared: #66cccc;
 	--life-failed: #999999;
 
+	/* ライフゲージ: FrzReturn用 */
+	/* --life-frz-normal: var(--main-stepShobon); */
+	/* --life-frz-active: var(--main-stepMatari); */
+
 	/* ライフゲージ本体 */
 	--life-background: #cccccc;
 	--life-bg-border: #555555;

package/skin/danoni_skin_skyblue.css

@@ -5,7 +5,7 @@
   スキンcssファイル (skyblue)
 
   Created : 2019/11/04
-  Revised : 2025/02/01 (v39.0.0)
+  Revised : 2026/05/17 (v48.0.0)
 
   https://github.com/cwtickle/danoniplus
 ------------------------------------------ */
@@ -70,6 +70,10 @@
 	--settings-slice-gaugeTable-x: 1;
 	--settings-border-gaugeTable-x: 1px;
 
+	/* 譜面明細子画面: ハイスコア表示 */
+	/* --settings-assist-x: var(--common-kita); */
+	/* --settings-another-x: var(--common-ii); */
+
 	/* キーコンフィグ関連 */
 	--keyconfig-warning-x: #999900;
 	--keyconfig-imgType-x: #003377;
@@ -96,6 +100,7 @@
 	/* --common-diffSlow: var(--common-shobon); */
 	/* --common-estAdj: var(--common-shakin); */
 	/* --common-excessive: var(--common-kita); */
+	/* --common-auto: var(--common-kita); */
 
 	/* ステップゾーン */
 	--main-stepKeyDown: #009999;
@@ -115,6 +120,10 @@
 	--life-cleared: #66cccc;
 	--life-failed: #999999;
 
+	/* ライフゲージ: FrzReturn用 */
+	/* --life-frz-normal: var(--main-stepShobon); */
+	/* --life-frz-active: var(--main-stepMatari); */
+
 	/* ライフゲージ本体 */
 	--life-background: #cccccc;
 	--life-bg-border: #555555;