danoniplus 36.6.1 → 37.0.1

package/js/danoni_main.js

@@ -8,7 +8,7 @@
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 36.6.1`;
+const g_version = `Ver 37.0.1`;
 const g_revisedDate = `2024/06/20`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -55,7 +55,6 @@ window.onload = async () => {
 	// ロード直後に定数・初期化ファイル、旧バージョン定義関数を読込
 	await loadScript2(`${g_rootPath}../js/lib/danoni_localbinary.js?${g_randTime}`, false);
 	await loadScript2(`${g_rootPath}../js/lib/danoni_constants.js?${g_randTime}`);
-	await loadScript2(`${g_rootPath}../js/lib/danoni_legacy_function.js?${g_randTime}`, false);
 	initialControl();
 };
 
@@ -7992,24 +7991,10 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 		return dataStr;
 	}
 
-	/**
-	 * 譜面データの優先順配列の取得
-	 * @param {string} _header 
-	 * @param {string} _type 
-	 * @param {number} _scoreNo 
-	 */
-	const getPriorityList = (_header, _type, _scoreNo) => [
-		getRefData(_header, `${_type}${g_localeObj.val}${_scoreNo}_data`),
-		getRefData(_header, `${_type}${g_localeObj.val}_data`),
-		getRefData(_header, `${_type}${_scoreNo}_data`),
-		getRefData(_header, `${_type}_data`)
-	];
-
 	/**
 	 * 譜面データの優先順配列パターンの取得
 	 * @param {string} _type 
 	 * @param {number} _scoreNo 
-	 * @returns 
 	 */
 	const getPriorityVal = (_type, _scoreNo) => [
 		`${_type}${g_localeObj.val}${_scoreNo}_data`,
@@ -8152,9 +8137,11 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 	 */
 	const makeBackgroundData = (_header, _scoreNo, { resultTypes = [] } = {}) => {
 		const dataList = [];
+		const animationTargets = [];
 		const calcFrameFunc = resultTypes.length > 0 ? undefined : calcFrame;
-		const addDataList = (_type = ``) => dataList.push(...getPriorityList(_header, _type, _scoreNo));
+		const addDataList = (_type = ``) => animationTargets.push(...getPriorityVal(_type, _scoreNo));
 		getPriorityHeader(resultTypes).forEach(val => addDataList(val));
+		makeDedupliArray(animationTargets).forEach(val => dataList.push(getRefData(_header, val)));
 
 		const data = dataList.find((v) => v !== undefined);
 		return (data !== undefined ? g_animationFunc.make[_header](data, calcFrameFunc) : [[], -1]);
@@ -8240,13 +8227,24 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 	// キー変化定義
 	obj.keychFrames = [];
 	obj.keychTarget = [];
+	obj.keychTargetAlpha = [];
 	if (hasVal(getRefData(`keych`, `${scoreIdHeader}_data`))) {
 		const keychdata = splitLF2(getRefData(`keych`, `${scoreIdHeader}_data`), `,`);
 		obj.keychFrames.push(...(keychdata.filter((val, j) => j % 2 === 0)).map(val => val === `0` ? 0 : calcFrame(val)));
-		obj.keychTarget.push(...keychdata.filter((val, j) => j % 2 === 1));
+
+		keychdata.filter((val, j) => j % 2 === 1)?.forEach(targets => {
+			const targetKeyList = [], targetKeyAlpha = [];
+			targets?.split(`/`).forEach(target => {
+				targetKeyList.push(trimStr(target?.split(`:`)[0]));
+				targetKeyAlpha.push(trimStr(target?.split(`:`)[1]) || 1);
+			})
+			obj.keychTarget.push(targetKeyList);
+			obj.keychTargetAlpha.push(targetKeyAlpha);
+		});
 	}
 	obj.keychFrames.unshift(0);
-	obj.keychTarget.unshift(`0`);
+	obj.keychTarget.unshift([`0`]);
+	obj.keychTargetAlpha.unshift([1]);
 
 	return obj;
 };
@@ -10274,7 +10272,7 @@ const mainInit = _ => {
 		// キー変化
 		while (currentFrame >= g_scoreObj.keychFrames[keychCnts]) {
 			for (let j = 0; j < keyNum; j++) {
-				appearKeyTypes(j, g_scoreObj.keychTarget[keychCnts]);
+				appearKeyTypes(j, g_scoreObj.keychTarget[keychCnts], g_scoreObj.keychTargetAlpha[keychCnts]);
 			}
 			keychCnts++;
 		}
@@ -10505,18 +10503,23 @@ const makeCounterSymbol = (_id, _x, _class, _heightPos, _text, _display = C_DIS_
  * @param {number} _j
  * @param {string} _display 
  */
-const appearStepZone = (_j, _display) => $id(`stepRoot${_j}`).display = _display;
+const appearStepZone = (_j, _display, _alpha = 1) => {
+	$id(`stepRoot${_j}`).display = _display;
+	$id(`stepRoot${_j}`).opacity = _alpha;
+};
 
 /**
  * 部分キーのステップゾーン出現処理
  * @param {number} _j 
- * @param {string} _target 
+ * @param {array} _targets 
  */
-const appearKeyTypes = (_j, _target) => {
+const appearKeyTypes = (_j, _targets, _alphas = fillArray(_targets.length, 1)) => {
 	appearStepZone(_j, C_DIS_NONE);
-	if (g_workObj.keyGroupMaps[_j].includes(_target)) {
-		appearStepZone(_j, C_DIS_INHERIT);
-	}
+	_targets.forEach((target, k) => {
+		if (g_workObj.keyGroupMaps[_j].includes(target)) {
+			appearStepZone(_j, C_DIS_INHERIT, _alphas[k]);
+		}
+	});
 };
 
 /**

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2024/06/08 (v36.6.0)
+ * Revised : 2024/06/15 (v37.0.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -23,45 +23,6 @@ const C_VALIGN_BOTTOM = `bottom`;
 
 const C_LBL_BASICFONT = `"Meiryo UI", sans-serif`;
 
-/** 廃止予定の定数群 */
-const C_LBL_TITLESIZE = 32;
-const C_LBL_BTNSIZE = 28;
-const C_LBL_LNKSIZE = 16;
-
-const C_BTN_HEIGHT = 50;
-const C_LNK_HEIGHT = 30;
-const C_LEN_SETLBL_LEFT = 160;
-const C_LEN_SETLBL_WIDTH = 210;
-const C_LEN_DIFSELECTOR_WIDTH = 250;
-const C_LEN_DIFCOVER_WIDTH = 110;
-const C_LEN_SETLBL_HEIGHT = 22;
-const C_SIZ_SETLBL = 17;
-const C_LEN_SETDIFLBL_HEIGHT = 25;
-const C_SIZ_SETDIFLBL = 17;
-const C_LEN_SETMINI_WIDTH = 40;
-const C_SIZ_SETMINI = 18;
-const C_SIZ_DIFSELECTOR = 14;
-const C_SIZ_MAIN = 14;
-const C_SIZ_MUSIC_TITLE = 13;
-
-const C_LEN_JDGCHARA_WIDTH = 200;
-const C_LEN_JDGCHARA_HEIGHT = 20;
-const C_SIZ_JDGCHARA = 20;
-
-const C_LEN_JDGCNTS_WIDTH = 100;
-const C_LEN_JDGCNTS_HEIGHT = 20;
-const C_SIZ_JDGCNTS = 16;
-
-const C_LEN_GRAPH_WIDTH = 286;
-const C_LEN_GRAPH_HEIGHT = 226;
-const C_CLR_SPEEDGRAPH_SPEED = `#cc3333`;
-const C_CLR_SPEEDGRAPH_BOOST = `#999900`;
-const C_CLR_DENSITY_MAX = `#990000cc`;
-const C_CLR_DENSITY_DEFAULT = `#999999cc`;
-const C_LEN_DENSITY_DIVISION = 16;
-
-const C_MAX_ADJUSTMENT = 30;
-
 /** 設定幅、位置などを管理するプロパティ */
 const g_limitObj = {
 

package/package.json

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