danoniplus 42.5.0 → 42.5.2

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2025/08/22
+ * Revised : 2025/08/27
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 42.5.0`;
-const g_revisedDate = `2025/08/22`;
+const g_version = `Ver 42.5.2`;
+const g_revisedDate = `2025/08/27`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -3045,6 +3045,8 @@ const resetGaugeSetting = _scoreId => {
  */
 const copySetColor = (_baseObj, _scoreId) => {
 	const obj = {};
+	// Todo: dosIdを引数にして、dosIdと一致するscoreIdを算出
+	//       算出したscoreIdすべてに対して下記処理を実行
 	const srcIdHeader = setScoreIdHeader(_scoreId, g_stateObj.scoreLockFlg, true);
 	const targetIdHeader = setScoreIdHeader(_scoreId, false, true);
 	[``, `Shadow`].forEach(pattern =>
@@ -11211,20 +11213,33 @@ const getArrowSettings = () => {
 		g_workObj.dividePos[j] = baseLayer * 2 + ((posj <= divideCnt ? 0 : 1) + (scrollDirOptions[j] === 1 ? 0 : 1) + (g_stateObj.reverse === C_FLG_OFF ? 0 : 1)) % 2;
 		g_workObj.scrollDir[j] = (posj <= divideCnt ? 1 : -1) * scrollDirOptions[j] * (g_stateObj.reverse === C_FLG_OFF ? 1 : -1);
 
-		eachOrAll.forEach(type => {
-			g_workObj[`arrowColors${type}`][j] = g_headerObj.setColor[colorj];
-			g_workObj[`dummyArrowColors${type}`][j] = g_headerObj.setDummyColor[colorj];
-			g_workObj[`arrowShadowColors${type}`][j] = g_headerObj.setShadowColor[colorj] || ``;
-			g_workObj[`dummyArrowShadowColors${type}`][j] = g_headerObj.setDummyColor[colorj] || ``;
-
-			g_typeLists.frzColor.forEach((frzType, k) => {
-				g_workObj[`frz${frzType}Colors${type}`][j] = g_headerObj.frzColor[colorj][k] || ``;
-				g_workObj[`dummyFrz${frzType}Colors${type}`][j] =
-					frzType.includes(`Shadow`) ? `` : g_headerObj.setDummyColor[colorj] || ``;
-			});
-			g_workObj[`frzNormalShadowColors${type}`][j] = g_headerObj.frzShadowColor[colorj][0] || ``;
-			g_workObj[`frzHitShadowColors${type}`][j] = g_headerObj.frzShadowColor[colorj][1] || ``;
+		// 個別色設定
+		g_workObj.arrowColors[j] = g_headerObj.setColor[colorj];
+		g_workObj.dummyArrowColors[j] = g_headerObj.setDummyColor[colorj];
+		g_workObj.arrowShadowColors[j] = g_headerObj.setShadowColor[colorj] || ``;
+		g_workObj.dummyArrowShadowColors[j] = g_headerObj.setDummyColor[colorj] || ``;
+
+		g_typeLists.frzColor.forEach((frzType, k) => {
+			g_workObj[`frz${frzType}Colors`][j] = g_headerObj.frzColor[colorj][k] || ``;
+			g_workObj[`dummyFrz${frzType}Colors`][j] =
+				frzType.includes(`Shadow`) ? `` : g_headerObj.setDummyColor[colorj] || ``;
+		});
+		g_workObj.frzNormalShadowColors[j] = g_headerObj.frzShadowColor[colorj][0] || ``;
+		g_workObj.frzHitShadowColors[j] = g_headerObj.frzShadowColor[colorj][1] || ``;
+
+		// 全体色設定
+		g_workObj.arrowColorsAll[j] = ``;
+		g_workObj.dummyArrowColorsAll[j] = ``;
+		g_workObj.arrowShadowColorsAll[j] = ``;
+		g_workObj.dummyArrowShadowColorsAll[j] = ``;
+
+		g_typeLists.frzColor.forEach((frzType, k) => {
+			g_workObj[`frz${frzType}ColorsAll`][j] = ``;
+			g_workObj[`dummyFrz${frzType}ColorsAll`][j] = ``;
 		});
+		g_workObj.frzNormalShadowColorsAll[j] = ``;
+		g_workObj.frzHitShadowColorsAll[j] = ``;
+
 	}
 	g_workObj.orgFlatFlg = g_workObj.dividePos.every(v => v % 2 === g_workObj.dividePos[0] % 2);
 	g_stateObj.layerNumDf = Math.max(g_stateObj.layerNumDf, Math.ceil((Math.max(...g_workObj.dividePos) + 1) / 2) * 2);
@@ -12475,7 +12490,13 @@ const mainInit = () => {
 		// フリーズアロー色の設定
 		// - 通常時 (矢印枠/矢印塗りつぶし/帯): g_attrObj[frzName].Normal / NormalShadow / NormalBar
 		// - ヒット時 (矢印枠/矢印塗りつぶし/帯): g_attrObj[frzName].Hit / HitShadow / HitBar
-		g_typeLists.frzColor.forEach(val => g_attrObj[frzName][val] = g_workObj[`${_name}${val}Colors`][_j]);
+		// - ヒット時（矢印枠/矢印塗りつぶし/帯別の生成時全体色）: g_attrObj[frzName].HitAll / HitShadowAll / HitBarAll
+		g_typeLists.frzColor.forEach(val => {
+			g_attrObj[frzName][val] = g_workObj[`${_name}${val}Colors`][_j];
+			if (val.startsWith(`Hit`)) {
+				g_attrObj[frzName][`${val}All`] = g_workObj[`${_name}${val}ColorsAll`][_j];
+			}
+		});
 		arrowSprite[g_workObj.dividePos[_j]].appendChild(frzRoot);
 		let shadowColor = _shadowColor === `Default` ? _normalColor : _shadowColor;
 
@@ -13227,9 +13248,9 @@ const changeHitFrz = (_j, _k, _name, _difFrame = 0) => {
 	 * @returns {string}
 	 */
 	const getColor = (_type) => {
-		const cColor = g_workObj[`${_name}${_type}Colors`][_j];
 		const cColorAll = g_workObj[`${_name}${_type}ColorsAll`][_j];
-		return currentFrz[_type] !== cColor && cColorAll === cColor ? cColorAll : currentFrz[_type];
+		return currentFrz[_type] !== cColorAll && currentFrz[`${_type}All`] !== cColorAll
+			? cColorAll : currentFrz[_type];
 	};
 
 	const tmpHitColor = getColor(`Hit`);

package/package.json

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