danoniplus 25.5.5 → 26.1.2

package/README.md

@@ -57,10 +57,15 @@ If the life of the life gauge remains by the end of the game or it is over the q
 - [ParaFla!ソース利用者向け移行方法](https://github.com/cwtickle/danoniplus/wiki/forParaFlaUser)
 
 ### How to Install / 導入方法
-- [Releases](https://github.com/cwtickle/danoniplus/releases)からダウンロードします。
-- npmからの導入も可能です。@以降はバージョン名を指定します(下記のxxは実際の番号に合わせます)。
+- [Releases](https://github.com/cwtickle/danoniplus/releases)からダウンロードします。(Download from [Releases](https://github.com/cwtickle/danoniplus/releases).)
+- npmからの導入も可能です。(You can install from npm.)
 ```
-npm i danoniplus@25.5.xx
+npm i danoniplus
+```
+- バージョン名を直接指定するときは下記のように @以降をバージョン指定します。  
+(When directly specifying the version name, specify the version after @ as shown below.)
+```
+npm i danoniplus@26.1.2
 ```
 
 ## System requirements / 動作環境
@@ -78,9 +83,9 @@ but the details are different from the conventional ones. See below for details.
 ## How to Contribute / 開発者の方へ 
 開発にご協力いただける方は、下記をご覧ください。GitHubアカウントの無い方でも協力できます！  
 If you would like to cooperate with the development, please see below. Even if you don't have a GitHub account, you can cooperate!
-- [貢献の仕方 / How to Contribute](https://github.com/cwtickle/danoniplus/blob/develop/.github/CONTRIBUTING.md)   
+- [貢献の仕方 / How to Contribute](https://github.com/cwtickle/blob/develop/.github/CONTRIBUTING.md)   
 - [要望・不具合報告用Gitter](https://gitter.im/danonicw/community)
-- [コントリビューター / Contributors](https://github.com/cwtickle/danoniplus/blob/develop/CONTRIBUTORS.md)
+- [コントリビューター / Contributors](https://github.com/cwtickle/blob/develop/CONTRIBUTORS.md)
 
 ## Community / コミュニティ
 - [Dancing☆Onigiri Discordサーバー](https://discord.gg/TegbHFY7zg)

package/js/danoni_main.js

@@ -8,7 +8,7 @@
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 25.5.5`;
+const g_version = `Ver 26.1.2`;
 const g_revisedDate = `2022/02/16`;
 const g_alphaVersion = ``;
 
@@ -125,7 +125,14 @@ const g_detailObj = {
 	arrowCnt: [],
 	frzCnt: [],
 	maxDensity: [],
+	maxDensity2Push: [],
+	maxDensity3Push: [],
 	densityData: [],
+	density2PushData: [],
+	density3PushData: [],
+	densityDiff: [],
+	density2PushDiff: [],
+	density3PushDiff: [],
 	startFrame: [],
 	playingFrame: [],
 	playingFrameWithBlank: [],
@@ -1607,6 +1614,7 @@ function storeBaseData(_scoreId, _scoreObj, _keyCtrlPtn) {
 	let allData = 0;
 
 	const types = [`arrow`, `frz`];
+	let fullData = [];
 	for (let j = 0; j < keyNum; j++) {
 		noteCnt.arrow[j] = 0;
 		noteCnt.frz[j] = 0;
@@ -1625,17 +1633,53 @@ function storeBaseData(_scoreId, _scoreObj, _keyCtrlPtn) {
 				}
 			})
 		});
+		fullData = fullData.concat(..._scoreObj.arrowData[j], ...tmpFrzData);
 	}
 
+	fullData = fullData.filter(val => !isNaN(parseFloat(val))).sort((a, b) => a - b);
+	let pushCnt = 0;
+	const density2PushData = [...Array(C_LEN_DENSITY_DIVISION)].fill(0);
+	const density3PushData = [...Array(C_LEN_DENSITY_DIVISION)].fill(0);
+	fullData.forEach((note, j) => {
+		if (fullData[j] === fullData[j + 1]) {
+			pushCnt++;
+		} else {
+			const point = Math.floor((note - firstArrowFrame) / playingFrame * C_LEN_DENSITY_DIVISION);
+			if (point >= 0) {
+				if (pushCnt > 2) {
+					density3PushData[point] += pushCnt;
+				}
+				density2PushData[point] += pushCnt;
+			}
+			pushCnt = 0;
+		}
+	});
+
 	g_detailObj.toolDif[_scoreId] = calcLevel(_scoreObj);
 	g_detailObj.speedData[_scoreId] = _scoreObj.speedData.concat();
 	g_detailObj.boostData[_scoreId] = _scoreObj.boostData.concat();
 
-	g_detailObj.maxDensity[_scoreId] = densityData.indexOf(Math.max.apply(null, densityData));
-	g_detailObj.densityData[_scoreId] = [];
-	for (let j = 0; j < C_LEN_DENSITY_DIVISION; j++) {
-		g_detailObj.densityData[_scoreId].push(Math.round(densityData[j] / allData * C_LEN_DENSITY_DIVISION * 10000) / 100);
+	const storeDensity = _densityData => {
+		const dataList = [];
+		for (let j = 0; j < C_LEN_DENSITY_DIVISION; j++) {
+			dataList.push(allData === 0 ? 0 : Math.round(_densityData[j] / allData * C_LEN_DENSITY_DIVISION * 10000) / 100);
+		}
+		return dataList;
 	}
+	const diffArray = (_array1, _array2) => {
+		const list = [];
+		_array1.forEach((val, j) => list.push(_array1[j] - _array2[j]));
+		return list;
+	};
+	g_detailObj.densityData[_scoreId] = storeDensity(densityData);
+	g_detailObj.density2PushData[_scoreId] = storeDensity(density2PushData);
+	g_detailObj.density3PushData[_scoreId] = storeDensity(density3PushData);
+
+	g_detailObj.densityDiff[_scoreId] = diffArray(g_detailObj.densityData[_scoreId], g_detailObj.density2PushData[_scoreId]);
+	g_detailObj.density2PushDiff[_scoreId] = diffArray(g_detailObj.density2PushData[_scoreId], g_detailObj.density3PushData[_scoreId]);
+	g_detailObj.density3PushDiff[_scoreId] = g_detailObj.density3PushData[_scoreId].concat();
+
+	g_detailObj.maxDensity[_scoreId] = densityData.indexOf(Math.max.apply(null, densityData));
 
 	g_detailObj.arrowCnt[_scoreId] = noteCnt.arrow.concat();
 	g_detailObj.frzCnt[_scoreId] = noteCnt.frz.concat();
@@ -2562,15 +2606,23 @@ function titleInit() {
 
 	// コメントエリア作成
 	if (g_headerObj.commentVal !== ``) {
+
+		// コメント文の加工
+		const comments = g_headerObj.commentVal.split(`}`).join(`{`).split(`{`);
+		let convCommentVal = ``;
+		for (let j = 0; j < comments.length; j += 2) {
+			convCommentVal += escapeHtmlForEnabledTag(comments[j]);
+			convCommentVal += setVal(comments[j + 1], ``, C_TYP_CALC);
+		}
+
 		if (g_headerObj.commentExternal) {
 			if (document.querySelector(`#commentArea`) !== null) {
-				commentArea.innerHTML = g_headerObj.commentVal;
+				commentArea.innerHTML = convCommentVal;
 			}
 		} else {
-			let tmpComment = g_headerObj.commentVal;
 			multiAppend(divRoot,
 
-				createDivCss2Label(`lblComment`, tmpComment, {
+				createDivCss2Label(`lblComment`, convCommentVal, {
 					x: 0, y: 70, w: g_sWidth, h: g_sHeight - 180, siz: C_SIZ_DIFSELECTOR, align: C_ALIGN_LEFT,
 					overflow: `auto`, background: `#222222`, color: `#cccccc`, display: C_DIS_NONE,
 				}),
@@ -2579,10 +2631,11 @@ function titleInit() {
 					const lblCommentDef = lblComment.style.display;
 					lblComment.style.display = (lblCommentDef === C_DIS_NONE ? C_DIS_INHERIT : C_DIS_NONE);
 				}, {
-					x: g_sWidth - 180, y: (g_sHeight / 2) + 150, w: 150, h: 50, siz: 20, border: `solid 1px #999999`,
+					x: g_sWidth - 160, y: (g_sHeight / 2) + 150, w: 140, h: 50, siz: 20, border: `solid 1px #999999`,
 				}, g_cssObj.button_Default),
 
 			);
+			setUserSelect(lblComment.style, `text`);
 		}
 	}
 
@@ -3396,7 +3449,7 @@ function headerConvert(_dosObj) {
 	const newlineTag = setVal(_dosObj.commentAutoBr, true, C_TYP_BOOLEAN) ? `<br>` : ``;
 	let tmpComment = setVal(_dosObj[`commentVal${g_localeObj.val}`] || _dosObj.commentVal, ``, C_TYP_STRING);
 	tmpComment = tmpComment.split(`\r\n`).join(`\n`);
-	obj.commentVal = escapeHtmlForEnabledTag(tmpComment.split(`\n`).join(newlineTag));
+	obj.commentVal = tmpComment.split(`\n`).join(newlineTag);
 
 	// クレジット表示
 	if (document.querySelector(`#webMusicTitle`) !== null) {
@@ -4441,13 +4494,30 @@ function createOptionWindow(_sprite) {
 		drawBaseLine(context);
 		for (let j = 0; j < C_LEN_DENSITY_DIVISION; j++) {
 			context.beginPath();
-			context.fillStyle = (j === g_detailObj.maxDensity[_scoreId] ? C_CLR_DENSITY_MAX : C_CLR_DENSITY_DEFAULT);
-			context.fillRect(16 * j * 16 / C_LEN_DENSITY_DIVISION + 30, 195 - 9 * g_detailObj.densityData[_scoreId][j] / 10,
-				15.5 * 16 / C_LEN_DENSITY_DIVISION, 9 * g_detailObj.densityData[_scoreId][j] / 10
-			);
+			[``, `2Push`, `3Push`].forEach(val => {
+				context.fillStyle = (j === g_detailObj.maxDensity[_scoreId] ? g_graphColorObj[`max${val}`] : g_graphColorObj[`default${val}`]);
+				context.fillRect(16 * j * 16 / C_LEN_DENSITY_DIVISION + 30, 195 - 9 * g_detailObj[`density${val}Data`][_scoreId][j] / 10,
+					15.5 * 16 / C_LEN_DENSITY_DIVISION, 9 * g_detailObj[`density${val}Diff`][_scoreId][j] / 10
+				);
+			});
 			context.stroke();
 		}
 
+		const lineNames = [`1Push`, `2Push`, `3Push+`];
+		Object.keys(g_graphColorObj).filter(val => val.indexOf(`max`) !== -1).forEach((val, j) => {
+			const lineX = 70 + j * 70;
+
+			context.beginPath();
+			context.lineWidth = 3;
+			context.fillStyle = g_rankObj.rankColorAllPerfect;
+			context.strokeStyle = g_graphColorObj[val];
+			context.moveTo(lineX, 215);
+			context.lineTo(lineX + 20, 215);
+			context.stroke();
+			context.font = `${C_SIZ_DIFSELECTOR}px ${getBasicFont()}`;
+			context.fillText(lineNames[j], lineX + 20, 218);
+		});
+
 		const obj = getScoreBaseData(_scoreId);
 		updateScoreDetailLabel(`Density`, g_lblNameObj.s_apm, obj.apm, 0);
 		updateScoreDetailLabel(`Density`, g_lblNameObj.s_time, obj.playingTime, 1);
@@ -6630,20 +6700,27 @@ function scoreConvert(_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 	obj.speedData = setSpeedData(`speed`, scoreIdHeader, speedFooter);
 
 	// 色変化（個別・全体）の分解 (3つで1セット, セット毎の改行区切り可)
-	g_typeLists.color.forEach(sprite =>
-		obj[`${sprite}Data`] = setColorData(sprite, scoreIdHeader));
+	g_typeLists.color.forEach(sprite => {
+		obj[`${sprite}Data`] = setColorData(sprite, scoreIdHeader);
+		if (g_stateObj.dummyId !== ``) {
+			obj[`${sprite}DummyData`] = setColorData(sprite, _dummyNo);
+		}
+	});
 
 	if (_scoreAnalyzeFlg) {
 		return obj;
 	}
 
 	obj.colorData = mergeColorData();
+	obj.dummyColorData = mergeColorData(`Dummy`);
 
 	// 矢印モーション（個別）データの分解（3～4つで1セット, セット毎の改行区切り）
 	obj.arrowCssMotionData = setCssMotionData(`arrow`, scoreIdHeader);
 	obj.frzCssMotionData = setCssMotionData(`frz`, scoreIdHeader);
-	obj.dummyArrowCssMotionData = setCssMotionData(`arrow`, _dummyNo);
-	obj.dummyFrzCssMotionData = setCssMotionData(`frz`, _dummyNo);
+	if (g_stateObj.dummyId !== ``) {
+		obj.dummyArrowCssMotionData = setCssMotionData(`arrow`, _dummyNo);
+		obj.dummyFrzCssMotionData = setCssMotionData(`frz`, _dummyNo);
+	}
 
 	// 歌詞データの分解 (3つで1セット, セット毎の改行区切り可)
 	obj.wordData = [];
@@ -6719,8 +6796,9 @@ function scoreConvert(_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 	 * @param {string} _header 
 	 * @returns 
 	 */
-	function mergeColorData(_header = `color`) {
-		const tmpArr = obj[`${_header}Data`].concat(obj[`a${_header}Data`]);
+	function mergeColorData(_header = ``) {
+		if (obj[`color${_header}Data`] === undefined) return [];
+		const tmpArr = obj[`color${_header}Data`].concat(obj[`acolor${_header}Data`]);
 		return tmpArr.sort((_a, _b) => _a[0] - _b[0]).flat();
 	}
 
@@ -7312,10 +7390,11 @@ function pushArrows(_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
 	}
 
 	// 個別・全体色変化、モーションデータのタイミング更新
-	calcDataTiming(`color`, ``, pushColors, { _colorFlg: true });
+	[``, `dummy`].forEach(type =>
+		calcDataTiming(`color`, type, pushColors, { _colorFlg: true }));
 
 	g_typeLists.arrow.forEach(header =>
-		calcDataTiming(`CssMotion`, header, pushCssMotions, { _calcFrameFlg: true }));
+		calcDataTiming(`cssMotion`, header, pushCssMotions, { _calcFrameFlg: true }));
 
 	/**
 	 * 色変化・モーションデータのタイミング更新
@@ -7327,7 +7406,9 @@ function pushArrows(_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
 	 */
 	function calcDataTiming(_type, _header, _setFunc = _ => true,
 		{ _term = 4, _colorFlg = false, _calcFrameFlg = false } = {}) {
-		const baseData = _dataObj[`${_header}${_type}Data`];
+
+		const camelHeader = _header === `` ? _type : `${_header}${toCapitalize(_type)}`;
+		const baseData = _dataObj[`${camelHeader}Data`];
 
 		if (!hasArrayList(baseData, _term)) {
 			return;
@@ -7566,7 +7647,7 @@ function pushColors(_header, _frame, _val, _colorCd, _allFlg) {
 
 		// フリーズアロー色の追随設定がある場合、対象を追加
 		g_headerObj.frzScopeFromArrowColors.forEach(type => {
-			baseHeaders.push(`mkF${_header}Color${type}`, `mkF${_header}Color${type}Bar`);
+			baseHeaders.push(`mk${_header}FColor${type}`, `mk${_header}FColor${type}Bar`);
 		});
 		if (g_headerObj.frzScopeFromArrowColors.length > 0) {
 			allUseTypes.push(`Frz`);
@@ -7589,7 +7670,7 @@ function pushColors(_header, _frame, _val, _colorCd, _allFlg) {
 		});
 
 	} else {
-		const baseHeader = `mkF${_header}Color`;
+		const baseHeader = `mk${_header}FColor`;
 		allUseTypes.push(`Frz`);
 
 		// フリーズアローの色変化
@@ -7856,6 +7937,9 @@ function MainInit() {
 	// マスクスプライトを作成 (最上位)
 	createMultipleSprite(`maskSprite`, g_scoreObj.maskMaxDepth);
 
+	// カラー・モーションを適用するオブジェクトの種類
+	const objList = (g_stateObj.dummyId === `` ? [``] : [`dummy`, ``]);
+
 	// 背景・マスクモーション(0フレーム指定)
 	if (g_scoreObj.frameNum === 0) {
 		g_animationData.forEach(sprite => {
@@ -8348,56 +8432,70 @@ function MainInit() {
 	}
 
 	/**
-	 * 全体色変化
-	 * 
-	 * @param _j 矢印位置
-	 * @param _k 矢印の表示順
-	 * @param _state フリーズアローの色変化対象 (Normal: 通常時、Hit: ヒット時)
+	 * 全体色変化（矢印）
+	 * @param {number} _j 
+	 * @param {number} _k 
+	 * @param {string} _name 
 	 */
-	const changeColorFunc = {
+	const changeArrowColor = (_j, _k, _name) => {
+		if (g_workObj[`mk${toCapitalize(_name)}ColorChangeAll`][g_scoreObj.frameNum]) {
+			const colorSelf = g_workObj[`${_name}Colors`][_j];
+			const colorAll = g_workObj[`${_name}ColorsAll`][_j];
+			const arrowTop = document.querySelector(`#${_name}Top${_j}_${_k}`);
 
-		// TODO: この部分を矢印塗りつぶし部分についても適用できるように対応
-		arrow: (_j, _k) => {
-			const arrowTop = document.querySelector(`#arrowTop${_j}_${_k}`);
-			if (g_workObj.mkArrowColorChangeAll[g_scoreObj.frameNum]) {
-				if (arrowTop.getAttribute(`color`) !== g_workObj.arrowColors[_j] &&
-					g_workObj.arrowColors[_j] === g_workObj.arrowColorsAll[_j]) {
-					arrowTop.style.background = g_workObj.arrowColorsAll[_j];
-					arrowTop.setAttribute(`color`, g_workObj.arrowColorsAll[_j]);
-				}
+			if (arrowTop.getAttribute(`color`) !== colorSelf && colorAll === colorSelf) {
+				arrowTop.style.background = colorAll;
+				arrowTop.setAttribute(`color`, colorAll);
 			}
-		},
-
-		dummyArrow: (_j, _k) => { },
-
-		// TODO: この部分を矢印塗りつぶし部分についても適用できるように対応
-		frz: (_j, _k, _state) => {
-			const frzTop = document.querySelector(`#frzTop${_j}_${_k}`);
-			const frzBar = document.querySelector(`#frzBar${_j}_${_k}`);
-			const frzBtm = document.querySelector(`#frzBtm${_j}_${_k}`);
+		}
+	};
 
-			if (g_workObj.mkFrzColorChangeAll[g_scoreObj.frameNum]) {
-				if (frzBtm.getAttribute(`color`) !== g_workObj[`frz${_state}Colors`][_j]) {
-					const toColorCode = g_workObj[`frz${_state}ColorsAll`][_j];
-					if (g_workObj[`frz${_state}Colors`][_j] === toColorCode) {
-						if (_state === `Normal`) {
-							frzTop.style.background = toColorCode;
-						}
-						frzBtm.style.background = toColorCode;
-						frzBtm.setAttribute(`color`, toColorCode);
+	/**
+	 * 全体色変化（フリーズアロー）
+	 * @param {number} _j 矢印位置
+	 * @param {number} _k 矢印の表示順
+	 * @param {string} _name 通常, ダミー
+	 * @param {string} _state フリーズアローの色変化対象 (Normal: 通常時、Hit: ヒット時)
+	 */
+	const changeFrzColor = (_j, _k, _name, _state) => {
+
+		if (g_workObj[`mk${toCapitalize(_name)}ColorChangeAll`][g_scoreObj.frameNum]) {
+			const frzTop = document.querySelector(`#${_name}Top${_j}_${_k}`);
+			const frzBar = document.querySelector(`#${_name}Bar${_j}_${_k}`);
+			const frzBtm = document.querySelector(`#${_name}Btm${_j}_${_k}`);
+			const frzName = `${_name}${_state}`;
+
+			// 矢印部分の色変化
+			if (frzBtm.getAttribute(`color`) !== g_workObj[`${frzName}Colors`][_j]) {
+				const toColorCode = g_workObj[`${frzName}ColorsAll`][_j];
+				if (g_workObj[`${frzName}Colors`][_j] === toColorCode) {
+					if (_state === `Normal`) {
+						frzTop.style.background = toColorCode;
 					}
+					frzBtm.style.background = toColorCode;
+					frzBtm.setAttribute(`color`, toColorCode);
 				}
-				if (frzBar.getAttribute(`color`) !== g_workObj[`frz${_state}BarColors`][_j]) {
-					const toBarColorCode = g_workObj[`frz${_state}BarColorsAll`][_j];
-					if (g_workObj[`frz${_state}BarColors`][_j] === toBarColorCode) {
-						frzBar.style.background = toBarColorCode;
-						frzBar.setAttribute(`color`, toBarColorCode);
-					}
+			}
+			// 帯部分の色変化
+			if (frzBar.getAttribute(`color`) !== g_workObj[`${frzName}BarColors`][_j]) {
+				const toBarColorCode = g_workObj[`${frzName}BarColorsAll`][_j];
+				if (g_workObj[`${frzName}BarColors`][_j] === toBarColorCode) {
+					frzBar.style.background = toBarColorCode;
+					frzBar.setAttribute(`color`, toBarColorCode);
 				}
 			}
-		},
+		}
+	};
 
-		dummyFrz: (_j, _k, _state) => { },
+
+	/**
+	 * 全体色変化
+	 */
+	const changeColorFunc = {
+		arrow: (_j, _k) => changeArrowColor(_j, _k, `arrow`),
+		dummyArrow: (_j, _k) => changeArrowColor(_j, _k, `dummyArrow`),
+		frz: (_j, _k, _state) => changeFrzColor(_j, _k, `frz`, _state),
+		dummyFrz: (_j, _k, _state) => changeFrzColor(_j, _k, `dummyFrz`, _state),
 	};
 
 	/**
@@ -8870,29 +8968,30 @@ function MainInit() {
 			boostCnts += 2;
 		}
 
-		// 個別・全体色変化 (矢印)
-		changeColors(g_workObj.mkColor[currentFrame], g_workObj.mkColorCd[currentFrame]);
+		objList.forEach(header => {
+			const headerU = toCapitalize(header);
 
-		// 個別・全体色変化（フリーズアロー）
-		g_typeLists.frzColor.forEach(ctype =>
-			changeColors(g_workObj[`mkFColor${ctype}`][currentFrame], g_workObj[`mkFColor${ctype}Cd`][currentFrame], `frz${ctype}`));
+			// 個別・全体色変化 (矢印)
+			changeColors(g_workObj[`mk${headerU}Color`][currentFrame],
+				g_workObj[`mk${headerU}ColorCd`][currentFrame], header, `arrow`);
 
-		// 矢印モーション
-		changeCssMotions(g_workObj.mkArrowCssMotion[currentFrame], g_workObj.mkArrowCssMotionName[currentFrame], `arrow`);
+			// 個別・全体色変化（フリーズアロー）
+			g_typeLists.frzColor.forEach(ctype =>
+				changeColors(g_workObj[`mk${headerU}FColor${ctype}`][currentFrame],
+					g_workObj[`mk${headerU}FColor${ctype}Cd`][currentFrame], header, `frz${ctype}`));
 
-		// フリーズアローモーション
-		changeCssMotions(g_workObj.mkFrzCssMotion[currentFrame], g_workObj.mkFrzCssMotionName[currentFrame], `frz`);
+			// 矢印モーション
+			changeCssMotions(header, `arrow`, currentFrame);
 
-		// ダミー矢印モーション
-		changeCssMotions(g_workObj.mkDummyArrowCssMotion[currentFrame], g_workObj.mkDummyArrowCssMotionName[currentFrame], `dummyArrow`);
+			// フリーズアローモーション
+			changeCssMotions(header, `frz`, currentFrame);
 
-		// ダミーフリーズアローモーション
-		changeCssMotions(g_workObj.mkDummyFrzCssMotion[currentFrame], g_workObj.mkDummyFrzCssMotionName[currentFrame], `dummyFrz`);
+		});
 
 		// ダミー矢印生成（背面に表示するため先に処理）
 		if (g_workObj.mkDummyArrow[currentFrame] !== undefined) {
 			g_workObj.mkDummyArrow[currentFrame].forEach(data =>
-				makeArrow(data, ++dummyArrowCnts[data], `dummyArrow`, C_CLR_DUMMY));
+				makeArrow(data, ++dummyArrowCnts[data], `dummyArrow`, g_workObj.dummyArrowColors[data]));
 		}
 
 		// 矢印生成
@@ -8904,7 +9003,7 @@ function MainInit() {
 		// ダミーフリーズアロー生成
 		if (g_workObj.mkDummyFrzArrow[currentFrame] !== undefined) {
 			g_workObj.mkDummyFrzArrow[currentFrame].forEach(data =>
-				makeFrzArrow(data, ++dummyFrzCnts[data], `dummyFrz`, C_CLR_DUMMY, `#888888`));
+				makeFrzArrow(data, ++dummyFrzCnts[data], `dummyFrz`, g_workObj.dummyFrzNormalColors[data], g_workObj.dummyFrzNormalBarColors[data]));
 		}
 
 		// フリーズアロー生成
@@ -9123,19 +9222,21 @@ function makeCounterSymbol(_id, _x, _class, _heightPos, _text, _display = C_DIS_
  * 個別・全体色変化
  * @param {array} _mkColor 
  * @param {array} _mkColorCd 
- * @param {string} _objType
+ * @param {string} _header
+ * @param {string} _name
  */
-function changeColors(_mkColor, _mkColorCd, _objType = `arrow`) {
+function changeColors(_mkColor, _mkColorCd, _header, _name) {
 
 	if (_mkColor === undefined) {
 		return;
 	}
+	const camelHeader = _header === `` ? _name : `${_header}${toCapitalize(_name)}`;
 	_mkColor.forEach((tempj, j) => {
 		const targetj = tempj % 1000;
-		g_workObj[`${_objType}Colors`][targetj] = _mkColorCd[j];
+		g_workObj[`${camelHeader}Colors`][targetj] = _mkColorCd[j];
 		if (tempj >= 1000) {
-			g_workObj[`${_objType}ColorsAll`][targetj] = _mkColorCd[j];
-			if (_objType.indexOf(`HitBar`) !== -1 && isNaN(Number(g_workObj.arrowRtn[targetj]))) {
+			g_workObj[`${camelHeader}ColorsAll`][targetj] = _mkColorCd[j];
+			if (camelHeader.indexOf(`frzHitBar`) !== -1 && isNaN(Number(g_workObj.arrowRtn[targetj]))) {
 				$id(`frzHitTop${targetj}`).background = _mkColorCd[j];
 			}
 		}
@@ -9144,16 +9245,20 @@ function changeColors(_mkColor, _mkColorCd, _objType = `arrow`) {
 
 /**
  * 個別モーション
- * @param {array} _mkCssMotion 
- * @param {array} _mkCssMotionName 
+ * @param {string} _header
  * @param {string} _name
+ * @param {number} _frameNum
  */
-function changeCssMotions(_mkCssMotion, _mkCssMotionName, _name) {
+function changeCssMotions(_header, _name, _frameNum) {
+
+	const camelHeader = _header === `` ? _name : `${_header}${toCapitalize(_name)}`;
+	const frameData = g_workObj[`mk${toCapitalize(camelHeader)}CssMotion`][_frameNum];
 
-	if (_mkCssMotion !== undefined) {
-		for (let j = 0; j < _mkCssMotion.length; j++) {
-			const targetj = _mkCssMotion[j];
-			g_workObj[`${_name}CssMotions`][targetj] = _mkCssMotionName[2 * j + g_workObj.dividePos[targetj]];
+	if (frameData !== undefined) {
+		for (let j = 0; j < frameData.length; j++) {
+			const targetj = frameData[j];
+			g_workObj[`${camelHeader}CssMotions`][targetj] =
+				g_workObj[`mk${toCapitalize(camelHeader)}CssMotionName`][_frameNum][2 * j + g_workObj.dividePos[targetj]];
 		}
 	}
 }
@@ -9601,8 +9706,16 @@ function resultInit() {
 	// diffListから適正Adjを算出（20個以下の場合は算出しない）
 	const getSign = _val => (_val > 0 ? `+` : ``);
 	const getDiffFrame = _val => `${getSign(_val)}${_val}${g_lblNameObj.frame}`;
-	const estimatedAdj = (g_workObj.diffList.length <= 20 ?
-		`` : Math.round((g_stateObj.adjustment - g_workObj.diffList.reduce((x, y) => x + y, 0) / g_workObj.diffList.length) * 10) / 10);
+	const diffLength = g_workObj.diffList.length;
+	const bayesFunc = (_offset, _length) => {
+		let result = 0;
+		for (let j = _offset; j < _length; j++) {
+			result += (_length - j) * (j + 1) * g_workObj.diffList[j];
+		}
+		return result;
+	};
+	const bayesExVal = 6 * bayesFunc(0, diffLength) / (diffLength * (diffLength + 1) * (diffLength + 2));
+	const estimatedAdj = (diffLength <= 20 ? `` : Math.round((g_stateObj.adjustment - bayesExVal) * 10) / 10);
 
 	// 背景スプライトを作成
 	createMultipleSprite(`backResultSprite`, g_headerObj.backResultMaxDepth);

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2022/01/26 (v25.5.1)
+ * Revised : 2022/02/05 (v26.1.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -245,6 +245,15 @@ const C_CLR_DENSITY_MAX = `#990000cc`;
 const C_CLR_DENSITY_DEFAULT = `#999999cc`;
 const C_LEN_DENSITY_DIVISION = 16;
 
+const g_graphColorObj = {
+    max: `#993333cc`,
+    default: `#999999cc`,
+    max2Push: `#9933cccc`,
+    default2Push: `#777777cc`,
+    max3Push: `#003399cc`,
+    default3Push: `#555555cc`,
+};
+
 const g_settingBtnObj = {
     chara: {
         L: `<`,
@@ -2389,7 +2398,7 @@ const g_escapeStr = {
     escapeTag: [
         [`*amp*`, `&amp;`], [`*pipe*`, `|`], [`*dollar*`, `$`], [`*rsquo*`, `&rsquo;`],
         [`*quot*`, `&quot;`], [`*comma*`, `&sbquo;`], [`*squo*`, `&#39;`], [`*bkquo*`, `&#96;`],
-        [`*lt*`, `&lt;`], [`*gt*`, `&gt;`],
+        [`*lt*`, `&lt;`], [`*gt*`, `&gt;`], [`*lbrace*`, `{`], [`*rbrace*`, `}`],
     ],
     unEscapeTag: [
         [`&amp;`, `&`], [`&rsquo;`, `’`], [`&quot;`, `"`], [`&sbquo;`, `,`],

package/package.json

@@ -1,23 +1,23 @@
-{
-  "name": "danoniplus",
-  "version": "25.5.5",
-  "description": "Dancing☆Onigiri (CW Edition) - Web-based Rhythm Game",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/cwtickle/danoniplus.git"
-  },
-  "keywords": [
-    "rhythm-game",
-    "dancing-onigiri"
-  ],
-  "author": "tickle <quc_tickle@cw7.sakura.ne.jp> (https://github.com/cwtickle/)",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/cwtickle/danoniplus/issues"
-  },
-  "homepage": "https://github.com/cwtickle/danoniplus#readme"
+{
+  "name": "danoniplus",
+  "version": "26.1.2",
+  "description": "Dancing☆Onigiri (CW Edition) - Web-based Rhythm Game",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/cwtickle/danoniplus.git"
+  },
+  "keywords": [
+    "rhythm-game",
+    "dancing-onigiri"
+  ],
+  "author": "tickle <quc_tickle@cw7.sakura.ne.jp> (https://github.com/cwtickle/)",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/cwtickle/danoniplus/issues"
+  },
+  "homepage": "https://github.com/cwtickle/danoniplus#readme"
 }