danoniplus 25.5.6 → 26.3.1

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2022/02/20
+ * Revised : 2022/02/23
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 25.5.6`;
-const g_revisedDate = `2022/02/20`;
+const g_version = `Ver 26.3.1`;
+const g_revisedDate = `2022/02/23`;
 const g_alphaVersion = ``;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -49,19 +49,16 @@ const current = _ => {
 const g_rootPath = current().match(/(^.*\/)/)[0];
 const g_remoteFlg = g_rootPath.match(`^https://cwtickle.github.io/danoniplus/`) !== null;
 
-window.onload = _ => {
+window.onload = async () => {
 	g_loadObj.main = true;
 	g_currentPage = `initial`;
 
 	// ロード直後に定数・初期化ファイル、旧バージョン定義関数を読込
 	const randTime = new Date().getTime();
-	loadScript(`${g_rootPath}../js/lib/danoni_localbinary.js?${randTime}`, _ => {
-		loadScript(`${g_rootPath}../js/lib/danoni_constants.js?${randTime}`, _ => {
-			loadScript(`${g_rootPath}../js/lib/danoni_legacy_function.js?${randTime}`, _ => {
-				initialControl();
-			}, false);
-		});
-	}, false);
+	await loadScript2(`${g_rootPath}../js/lib/danoni_localbinary.js?${randTime}`, false);
+	await loadScript2(`${g_rootPath}../js/lib/danoni_constants.js?${randTime}`);
+	await loadScript2(`${g_rootPath}../js/lib/danoni_legacy_function.js?${randTime}`, false);
+	initialControl();
 };
 
 /*-----------------------------------------------------------*/
@@ -113,6 +110,7 @@ let g_finishFlg = true;
 /** 共通オブジェクト */
 const g_loadObj = {};
 const g_rootObj = {};
+const g_presetObj = {};
 let g_headerObj = {};
 let g_scoreObj = {};
 let g_attrObj = {};
@@ -125,7 +123,14 @@ const g_detailObj = {
 	arrowCnt: [],
 	frzCnt: [],
 	maxDensity: [],
+	maxDensity2Push: [],
+	maxDensity3Push: [],
 	densityData: [],
+	density2PushData: [],
+	density3PushData: [],
+	densityDiff: [],
+	density2PushDiff: [],
+	density3PushDiff: [],
 	startFrame: [],
 	playingFrame: [],
 	playingFrameWithBlank: [],
@@ -234,11 +239,11 @@ const hasArrayList = (_data, _length = 1) => _data !== undefined && _data.length
 /**
  * 重複を排除した配列の生成
  * @param {array} _array1 
- * @param {array} _array2 
+ * @param {...any} _arrays 
  * @returns 
  */
-const makeDedupliArray = (_array1, _array2) =>
-	Array.from((new Set([..._array1, ..._array2])).values());
+const makeDedupliArray = (_array1, ..._arrays) =>
+	Array.from((new Set([..._array1, ..._arrays.flat()])).values());
 
 /**
  * 部分一致検索（リストのいずれかに合致、大小文字問わず）
@@ -517,8 +522,9 @@ function preloadFile(_as, _href, _type = ``, _crossOrigin = `anonymous`) {
 }
 
 /**
- * CSSファイルの読み込み（danoni_main.css以外）
+ * CSSファイルの読み込み (callback)
  * デフォルトは danoni_skin_default.css を読み込む
+ * @deprecated v27以降非推奨予定
  * @param {url} _href 
  * @param {function} _func
  */
@@ -539,6 +545,31 @@ function importCssFile(_href, _func) {
 	document.head.appendChild(link);
 }
 
+/**
+ * CSSファイルの読み込み (Promise)
+ * デフォルトは danoni_skin_default.css を読み込む
+ * @param {url} _href 
+ */
+function importCssFile2(_href) {
+	const baseUrl = _href.split(`?`)[0];
+	g_loadObj[baseUrl] = false;
+
+	return new Promise(resolve => {
+		const link = document.createElement(`link`);
+		link.rel = `stylesheet`;
+		link.href = _href;
+		link.onload = _ => {
+			g_loadObj[baseUrl] = true;
+			resolve(link);
+		};
+		link.onerror = _ => {
+			makeWarningWindow(g_msgInfoObj.E_0041.split(`{0}`).join(baseUrl), { resetFlg: `title` });
+			resolve(link);
+		};
+		document.head.appendChild(link);
+	});
+}
+
 /**
  * 画面共通のフォント設定
  * @param {string} _priorityFont 
@@ -713,7 +744,7 @@ function createColorObject2(_id,
 	style.webkitMaskImage = `url("${g_imgObj[charaStyle]}")`;
 	style.webkitMaskSize = `contain`;
 	Object.keys(rest).forEach(property => style[property] = rest[property]);
-	setAttrs(div, { color: rest.background || ``, type: charaStyle, cnt: 0, });
+	setAttrs(div, { color: rest.background ?? ``, type: charaStyle, cnt: 0, });
 
 	return div;
 }
@@ -803,7 +834,7 @@ function createCss2Button(_id, _text, _func = _ => true, { x = 0, y = g_sHeight
 		if (g_initialFlg && g_btnWaitFrame[groupName].initial) {
 		} else {
 			style.pointerEvents = C_DIS_NONE;
-			setTimeout(_ => style.pointerEvents = setVal(rest.pointerEvents, `auto`, C_TYP_STRING),
+			setTimeout(_ => style.pointerEvents = rest.pointerEvents ?? `auto`,
 				g_btnWaitFrame[groupName].b_frame * 1000 / g_fps);
 		}
 	}
@@ -945,8 +976,9 @@ function clearWindow(_redrawFlg = false, _customDisplayName = ``) {
 }
 
 /**
- * 外部jsファイルの読込
+ * 外部jsファイルの読込 (callback)
  * 読込可否を g_loadObj[ファイル名] で管理 (true: 読込成功, false: 読込失敗)
+ * @deprecated v27以降非推奨予定
  * @param {string} _url 
  * @param {function} _callback 
  * @param {boolean} _requiredFlg (default : true / 読込必須)
@@ -973,10 +1005,42 @@ function loadScript(_url, _callback, _requiredFlg = true, _charset = `UTF-8`) {
 	document.querySelector(`head`).appendChild(script);
 }
 
+/**
+ * 外部jsファイルの読込 (Promise)
+ * 読込可否を g_loadObj[ファイル名] で管理 (true: 読込成功, false: 読込失敗)
+ * @param {string} _url 
+ * @param {boolean} _requiredFlg (default : true / 読込必須)
+ * @param {string} _charset (default : UTF-8)
+ */
+function loadScript2(_url, _requiredFlg = true, _charset = `UTF-8`) {
+	const baseUrl = _url.split(`?`)[0];
+	g_loadObj[baseUrl] = false;
+
+	return new Promise((resolve, reject) => {
+		const script = document.createElement(`script`);
+		script.type = `text/javascript`;
+		script.src = _url;
+		script.charset = _charset;
+		script.onload = _ => {
+			g_loadObj[baseUrl] = true;
+			resolve(script);
+		};
+		script.onerror = _err => {
+			if (_requiredFlg) {
+				makeWarningWindow(g_msgInfoObj.E_0041.split(`{0}`).join(_url.split(`?`)[0]));
+				reject(_err);
+			} else {
+				resolve(script);
+			}
+		};
+		document.querySelector(`head`).appendChild(script);
+	});
+}
+
 // WebAudioAPIでAudio要素風に再生するクラス
 class AudioPlayer {
 	constructor() {
-		const AudioContext = window.AudioContext || window.webkitAudioContext;
+		const AudioContext = window.AudioContext ?? window.webkitAudioContext;
 		this._context = new AudioContext();
 		this._gain = this._context.createGain();
 		this._gain.connect(this._context.destination);
@@ -1148,12 +1212,12 @@ function makeSpriteData(_data, _calcFrame = _frame => _frame) {
 			}
 
 			const tmpObj = {
-				path: escapeHtml(setVal(tmpSpriteData[2], ``, C_TYP_STRING), g_escapeStr.escapeCode),	// 画像パス or テキスト
-				class: escapeHtml(setVal(tmpSpriteData[3], ``, C_TYP_STRING)),		// CSSクラス
+				path: escapeHtml(tmpSpriteData[2] ?? ``, g_escapeStr.escapeCode),	// 画像パス or テキスト
+				class: escapeHtml(tmpSpriteData[3] ?? ``),							// CSSクラス
 				left: setVal(tmpSpriteData[4], 0, C_TYP_CALC),						// X座標
 				top: setVal(tmpSpriteData[5], 0, C_TYP_CALC),						// Y座標
 				width: setVal(tmpSpriteData[6], 0, C_TYP_NUMBER),					// spanタグの場合は font-size
-				height: escapeHtml(setVal(tmpSpriteData[7], ``, C_TYP_STRING)),		// spanタグの場合は color(文字列可)
+				height: escapeHtml(tmpSpriteData[7] ?? ``),							// spanタグの場合は color(文字列可)
 				opacity: setVal(tmpSpriteData[8], 1, C_TYP_FLOAT),
 				animationName: escapeHtml(setVal(tmpSpriteData[9], C_DIS_NONE, C_TYP_STRING)),
 				animationDuration: setVal(tmpSpriteData[10], 0, C_TYP_NUMBER) / g_fps,
@@ -1282,7 +1346,120 @@ function initialControl() {
 	loadLocalStorage();
 
 	// 譜面データの読み込み
-	loadDos(_ => loadSettingJs(), 0);
+	loadDos(_ => loadBaseFiles(), 0);
+}
+
+/**
+ * 共通設定ファイル、スキンファイル、カスタムファイルの読込
+ */
+async function loadBaseFiles() {
+
+	// 共通設定ファイルの指定
+	let [settingType, settingRoot] = getFilePath(g_rootObj.settingType ?? ``, C_DIR_JS);
+	if (settingType !== ``) {
+		settingType = `_${settingType}`;
+	}
+
+	// 共通設定ファイルの読込
+	const randTime = new Date().getTime();
+	await loadScript2(`${settingRoot}danoni_setting${settingType}.js?${randTime}`, false);
+	loadLegacySettingFunc();
+	if (document.querySelector(`#lblLoading`) !== null) {
+		divRoot.removeChild(document.querySelector(`#lblLoading`));
+	}
+
+	// クエリで譜面番号が指定されていればセット
+	g_stateObj.scoreId = setVal(getQueryParamVal(`scoreId`), 0, C_TYP_NUMBER);
+
+	// 譜面ヘッダーの読込
+	Object.assign(g_headerObj, preheaderConvert(g_rootObj));
+
+	// CSSファイル内のbackgroundを取得するために再描画
+	if (document.querySelector(`#layer0`) === null) {
+		divRoot.removeChild(document.querySelector(`#divBack`));
+		createEmptySprite(divRoot, `divBack`);
+	} else if (!g_headerObj.defaultSkinFlg && !g_headerObj.customBackUse) {
+		createEmptySprite(divRoot, `divBack`);
+	}
+
+	// CSSファイルの読み込み
+	const skinList = g_headerObj.jsData.filter(file => file[0].indexOf(`danoni_skin`) !== -1);
+	await loadMultipleFiles2(skinList, `css`);
+
+	// JSファイルの読み込み
+	await loadMultipleFiles2(g_headerObj.jsData, `js`);
+	loadLegacyCustomFunc();
+
+	// 譜面ヘッダー、特殊キー情報の読込
+	Object.assign(g_headerObj, headerConvert(g_rootObj));
+	if (g_presetObj.keysData !== undefined) {
+		keysConvert(dosConvert(g_presetObj.keysData));
+		g_headerObj.undefinedKeyLists = g_headerObj.undefinedKeyLists.filter(key => g_keyObj[`chara${key}_0`] === undefined);
+	}
+	g_headerObj.keyExtraList = keysConvert(g_rootObj, {
+		keyExtraList: (g_rootObj.keyExtraList !== undefined ?
+			makeDedupliArray(g_rootObj.keyExtraList.split(`,`), g_headerObj.undefinedKeyLists) : g_headerObj.undefinedKeyLists),
+	});
+
+	// キー数情報を初期化
+	g_keyObj.currentKey = g_headerObj.keyLabels[g_stateObj.scoreId];
+	g_keyObj.currentPtn = 0;
+
+	// 画像ファイルの読み込み
+	g_imgInitList.forEach(img => preloadFile(`image`, g_imgObj[img]));
+
+	// その他の画像ファイルの読み込み
+	g_headerObj.preloadImages.filter(image => hasVal(image)).forEach(preloadImage => {
+
+		// Pattern A: |preloadImages=file.png|
+		// Pattern B: |preloadImages=file*.png@10|  -> file01.png ~ file10.png
+		// Pattern C: |preloadImages=file*.png@2-9| -> file2.png  ~ file9.png
+		// Pattern D: |preloadImages=file*.png@003-018| -> file003.png  ~ file018.png
+
+		const tmpPreloadImages = preloadImage.split(`@`);
+		if (tmpPreloadImages.length === 1) {
+			// Pattern Aの場合
+			preloadFile(`image`, preloadImage);
+		} else {
+			const termRoopCnts = tmpPreloadImages[1].split(`-`);
+			let startCnt = 1;
+			let lastCnt;
+			let paddingLen;
+
+			if (termRoopCnts.length === 1) {
+				// Pattern Bの場合
+				lastCnt = setVal(tmpPreloadImages[1], 1, C_TYP_NUMBER);
+				paddingLen = String(setVal(tmpPreloadImages[1], 1, C_TYP_STRING)).length;
+			} else {
+				// Pattern C, Dの場合
+				startCnt = setVal(termRoopCnts[0], 1, C_TYP_NUMBER);
+				lastCnt = setVal(termRoopCnts[1], 1, C_TYP_NUMBER);
+				paddingLen = String(setVal(termRoopCnts[1], 1, C_TYP_STRING)).length;
+			}
+			for (let k = startCnt; k <= lastCnt; k++) {
+				preloadFile(`image`, tmpPreloadImages[0].replace(/\*/g, String(k).padStart(paddingLen, `0`)));
+			}
+		}
+	});
+
+	// ローカルファイル起動時に各種警告文を表示
+	if (g_isFile) {
+		makeWarningWindow(g_msgInfoObj.W_0011);
+		if (!listMatching(getMusicUrl(g_stateObj.scoreId), [`.js`, `.txt`], { suffix: `$` })) {
+			if (g_userAgent.indexOf(`firefox`) !== -1) {
+				makeWarningWindow(g_msgInfoObj.W_0001);
+			}
+			makeWarningWindow(g_msgInfoObj.W_0012);
+		}
+	}
+
+	if (g_loadObj.main) {
+		// 譜面詳細情報取得のために譜面をロード
+		loadDos(_ => getScoreDetailData(0), 0, true);
+	} else {
+		getScoreDetailData(0);
+		reloadDos(0);
+	}
 }
 
 /**
@@ -1317,7 +1494,7 @@ function loadLocalStorage() {
 		g_localeObj.val = g_langStorage.locale;
 		g_localeObj.num = g_localeObj.list.findIndex(val => val === g_localeObj.val);
 	}
-	Object.keys(g_lang_msgInfoObj[g_localeObj.val]).forEach(property => g_msgInfoObj[property] = g_lang_msgInfoObj[g_localeObj.val][property]);
+	Object.assign(g_msgInfoObj, g_lang_msgInfoObj[g_localeObj.val]);
 
 	// 作品別ローカルストレージの読込
 	const checkStorage = localStorage.getItem(g_localStorageUrl);
@@ -1350,7 +1527,7 @@ function loadLocalStorage() {
  * @param {number} _scoreId 譜面番号
  * @param {boolean} _cyclicFlg 再読込フラグ（譜面詳細情報取得用、再帰的にloadDosを呼び出す）
  */
-function loadDos(_afterFunc, _scoreId = g_stateObj.scoreId, _cyclicFlg = false) {
+async function loadDos(_afterFunc, _scoreId = g_stateObj.scoreId, _cyclicFlg = false) {
 
 	const dosInput = document.querySelector(`#dos`);
 	const externalDosInput = document.querySelector(`#externalDos`);
@@ -1403,37 +1580,36 @@ function loadDos(_afterFunc, _scoreId = g_stateObj.scoreId, _cyclicFlg = false)
 			`${filenameCommon}${setScoreIdHeader(_scoreId)}.${filenameExtension}`);
 
 		const randTime = new Date().getTime();
-		loadScript(`${filename}?${randTime}`, _ => {
-			if (typeof externalDosInit === C_TYP_FUNCTION) {
-				if (document.querySelector(`#lblLoading`) !== null) {
-					divRoot.removeChild(document.querySelector(`#lblLoading`));
-				}
-
-				// 外部データを読込（ファイルが見つからなかった場合は譜面追記をスキップ）
-				externalDosInit();
-				if (g_loadObj[filename]) {
-					Object.assign(g_rootObj, dosConvert(g_externalDos));
-				}
+		await loadScript2(`${filename}?${randTime}`, false, charset);
+		if (typeof externalDosInit === C_TYP_FUNCTION) {
+			if (document.querySelector(`#lblLoading`) !== null) {
+				divRoot.removeChild(document.querySelector(`#lblLoading`));
+			}
 
-			} else {
-				makeWarningWindow(g_msgInfoObj.E_0022);
+			// 外部データを読込（ファイルが見つからなかった場合は譜面追記をスキップ）
+			externalDosInit();
+			if (g_loadObj[filename]) {
+				Object.assign(g_rootObj, dosConvert(g_externalDos));
 			}
-			_afterFunc();
-			if (_cyclicFlg) {
-				if (g_stateObj.dosDivideFlg && _scoreId > 0) {
-					// 初期矢印・フリーズアロー色の再定義
-					if (g_stateObj.scoreLockFlg) {
-						Object.assign(g_rootObj, copySetColor(g_rootObj, _scoreId));
-					}
-					Object.assign(g_headerObj, resetBaseColorList(g_headerObj, g_rootObj, { scoreId: _scoreId }));
 
-					// ライフ設定のカスタム部分再取得（譜面ヘッダー加味）
-					Object.assign(g_gaugeOptionObj, resetCustomGauge(g_rootObj, { scoreId: _scoreId }));
-					Object.keys(g_gaugeOptionObj.customFulls).forEach(gaugePtn => getGaugeSetting(g_rootObj, gaugePtn, g_headerObj.difLabels.length, { scoreId: _scoreId }));
+		} else {
+			makeWarningWindow(g_msgInfoObj.E_0022);
+		}
+		_afterFunc();
+		if (_cyclicFlg) {
+			if (g_stateObj.dosDivideFlg && _scoreId > 0) {
+				// 初期矢印・フリーズアロー色の再定義
+				if (g_stateObj.scoreLockFlg) {
+					Object.assign(g_rootObj, copySetColor(g_rootObj, _scoreId));
 				}
-				reloadDos(_scoreId);
+				Object.assign(g_headerObj, resetBaseColorList(g_headerObj, g_rootObj, { scoreId: _scoreId }));
+
+				// ライフ設定のカスタム部分再取得（譜面ヘッダー加味）
+				Object.assign(g_gaugeOptionObj, resetCustomGauge(g_rootObj, { scoreId: _scoreId }));
+				Object.keys(g_gaugeOptionObj.customFulls).forEach(gaugePtn => getGaugeSetting(g_rootObj, gaugePtn, g_headerObj.difLabels.length, { scoreId: _scoreId }));
 			}
-		}, false, charset);
+			reloadDos(_scoreId);
+		}
 	}
 }
 
@@ -1471,103 +1647,6 @@ function copySetColor(_baseObj, _scoreId) {
 	return obj;
 }
 
-/**
- * 初回読込後に画像プリロードを設定する処理
- */
-function initAfterDosLoaded() {
-
-	// クエリで譜面番号が指定されていればセット
-	g_stateObj.scoreId = setVal(getQueryParamVal(`scoreId`), 0, C_TYP_NUMBER);
-
-	// 譜面ヘッダーの読込
-	Object.assign(g_headerObj, preheaderConvert(g_rootObj));
-
-	// CSSファイル内のbackgroundを取得するために再描画
-	if (document.querySelector(`#layer0`) === null) {
-		divRoot.removeChild(document.querySelector(`#divBack`));
-		createEmptySprite(divRoot, `divBack`);
-	} else if (!g_headerObj.defaultSkinFlg && !g_headerObj.customBackUse) {
-		createEmptySprite(divRoot, `divBack`);
-	}
-
-	// CSSファイルの読み込み
-	const skinList = g_headerObj.jsData.filter(file => file[0].indexOf(`danoni_skin`) !== -1);
-	loadMultipleFiles(0, skinList, `css`, _ => initAfterCssLoaded());
-
-	/**
-	 * スキンCSSファイルを読み込んだ後の処理
-	 */
-	function initAfterCssLoaded() {
-
-		// 譜面ヘッダー、特殊キー情報の読込
-		Object.assign(g_headerObj, headerConvert(g_rootObj));
-		keysConvert(g_rootObj);
-
-		// キー数情報を初期化
-		g_keyObj.currentKey = g_headerObj.keyLabels[g_stateObj.scoreId];
-		g_keyObj.currentPtn = 0;
-
-		// 画像ファイルの読み込み
-		g_imgInitList.forEach(img => preloadFile(`image`, g_imgObj[img]));
-
-		// その他の画像ファイルの読み込み
-		g_headerObj.preloadImages.filter(image => hasVal(image)).forEach(preloadImage => {
-
-			// Pattern A: |preloadImages=file.png|
-			// Pattern B: |preloadImages=file*.png@10|  -> file01.png ~ file10.png
-			// Pattern C: |preloadImages=file*.png@2-9| -> file2.png  ~ file9.png
-			// Pattern D: |preloadImages=file*.png@003-018| -> file003.png  ~ file018.png
-
-			const tmpPreloadImages = preloadImage.split(`@`);
-			if (tmpPreloadImages.length === 1) {
-				// Pattern Aの場合
-				preloadFile(`image`, preloadImage);
-			} else {
-				const termRoopCnts = tmpPreloadImages[1].split(`-`);
-				let startCnt = 1;
-				let lastCnt;
-				let paddingLen;
-
-				if (termRoopCnts.length === 1) {
-					// Pattern Bの場合
-					lastCnt = setVal(tmpPreloadImages[1], 1, C_TYP_NUMBER);
-					paddingLen = String(setVal(tmpPreloadImages[1], 1, C_TYP_STRING)).length;
-				} else {
-					// Pattern C, Dの場合
-					startCnt = setVal(termRoopCnts[0], 1, C_TYP_NUMBER);
-					lastCnt = setVal(termRoopCnts[1], 1, C_TYP_NUMBER);
-					paddingLen = String(setVal(termRoopCnts[1], 1, C_TYP_STRING)).length;
-				}
-				for (let k = startCnt; k <= lastCnt; k++) {
-					preloadFile(`image`, tmpPreloadImages[0].replace(/\*/g, String(k).padStart(paddingLen, `0`)));
-				}
-			}
-		});
-
-		// ローカルファイル起動時に各種警告文を表示
-		if (g_isFile) {
-			makeWarningWindow(g_msgInfoObj.W_0011);
-			if (!listMatching(getMusicUrl(g_stateObj.scoreId), [`.js`, `.txt`], { suffix: `$` })) {
-				if (g_userAgent.indexOf(`firefox`) !== -1) {
-					makeWarningWindow(g_msgInfoObj.W_0001);
-				}
-				makeWarningWindow(g_msgInfoObj.W_0012);
-			}
-		}
-
-		if (g_loadObj.main) {
-			// customjsの読み込み後、譜面詳細情報取得のために譜面をロード
-			loadMultipleFiles(0, g_headerObj.jsData, `js`, _ => {
-				loadLegacyCustomFunc();
-				loadDos(_ => getScoreDetailData(0), 0, true);
-			});
-		} else {
-			getScoreDetailData(0);
-			reloadDos(0);
-		}
-	}
-}
-
 /**
  * MusicUrlの基本情報を取得
  * @param {number} _scoreId 
@@ -1575,7 +1654,7 @@ function initAfterDosLoaded() {
  */
 function getMusicUrl(_scoreId) {
 	return g_headerObj.musicUrls !== undefined ?
-		g_headerObj.musicUrls[g_headerObj.musicNos[_scoreId]] ||
+		g_headerObj.musicUrls[g_headerObj.musicNos[_scoreId]] ??
 		g_headerObj.musicUrls[0] : `nosound.mp3`;
 }
 
@@ -1607,6 +1686,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 +1705,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();
@@ -1810,7 +1926,8 @@ function calcLevel(_scoreObj) {
 }
 
 /**
- * jsファイルの連続読込
+ * js, cssファイルの連続読込 (callback)
+ * @deprecated v27以降非推奨予定
  * @param {number} _j 
  * @param {array} _fileData 
  * @param {string} _loadType
@@ -1837,6 +1954,28 @@ function loadMultipleFiles(_j, _fileData, _loadType, _afterFunc = _ => true) {
 	}
 }
 
+/**
+ * js, cssファイルの連続読込 (async function)
+ * @param {array} _fileData 
+ * @param {string} _loadType
+ */
+async function loadMultipleFiles2(_fileData, _loadType) {
+	await Promise.all(_fileData.map(async filePart => {
+		const filePath = `${filePart[1]}${filePart[0]}?${new Date().getTime()}`;
+		if (filePart[0].endsWith(`.css`)) {
+			_loadType = `css`;
+		}
+
+		// jsファイル、cssファイルにより呼び出す関数を切替
+		if (_loadType === `js`) {
+			await loadScript2(filePath, false);
+		} else if (_loadType === `css`) {
+			const cssPath = filePath.split(`.js`).join(`.css`);
+			await importCssFile2(cssPath);
+		}
+	}));
+}
+
 /**
  * 入力されたパスを、ディレクトリとそれ以外に分割
  * 返却値：[ファイルキーワード, ルートディレクトリ]
@@ -1865,26 +2004,6 @@ const getFilePath = (_fileName, _directory = ``) => {
 	}
 };
 
-/**
- * danoni_setting.jsの読込
- */
-function loadSettingJs() {
-
-	// 共通設定ファイルの指定
-	let [settingType, settingRoot] = getFilePath(g_rootObj.settingType || ``, C_DIR_JS);
-	if (settingType !== ``) {
-		settingType = `_${settingType}`;
-	}
-
-	const randTime = new Date().getTime();
-	loadScript(`${settingRoot}danoni_setting${settingType}.js?${randTime}`, _ => {
-		if (document.querySelector(`#lblLoading`) !== null) {
-			divRoot.removeChild(document.querySelector(`#lblLoading`));
-		}
-		initAfterDosLoaded();
-	}, false);
-}
-
 function loadMusic() {
 
 	clearWindow(true);
@@ -2284,7 +2403,7 @@ const createScText = (_obj, _settingLabel, { displayName = `option`, dfLabel = `
 	if (scKey.length > 0) {
 		multiAppend(_obj,
 			createDivCss2Label(`sc${_settingLabel}`,
-				g_scViewObj.format.split(`{0}`).join(dfLabel !== `` ? `${dfLabel}` : `${setVal(g_kCd[g_kCdN.findIndex(kCd => kCd === scKey[0])], ``, C_TYP_STRING)}`), {
+				g_scViewObj.format.split(`{0}`).join(dfLabel !== `` ? `${dfLabel}` : `${g_kCd[g_kCdN.findIndex(kCd => kCd === scKey[0])] ?? ''}`), {
 				x, y, w, siz, fontWeight: `bold`, opacity: 0.75, pointerEvents: C_DIS_NONE,
 			})
 		);
@@ -2300,8 +2419,8 @@ const createScTextCommon = _displayName => {
 		.forEach(target =>
 			createScText(document.getElementById(`btn${target}`), target, {
 				displayName: _displayName, targetLabel: `btn${target}`,
-				dfLabel: setVal(g_lblNameObj[`sc_${_displayName}${target}`], ``, C_TYP_STRING),
-				x: g_btnPatterns[_displayName][target]
+				dfLabel: g_lblNameObj[`sc_${_displayName}${target}`] ?? ``,
+				x: g_btnPatterns[_displayName][target],
 			}));
 }
 
@@ -2448,7 +2567,7 @@ function titleInit() {
 				-webkit-text-fill-color: rgba(255,255,255,0.0);
 				${txtAnimations[1]}
 			" class="${g_headerObj.titleAnimationClass[1]}">
-				${setVal(g_headerObj.musicTitleForView[1], ``, C_TYP_STRING)}
+				${g_headerObj.musicTitleForView[1] ?? ``}
 			</div>
 			`,
 			{
@@ -2562,15 +2681,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 +2706,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`);
 		}
 	}
 
@@ -2766,30 +2894,28 @@ function preheaderConvert(_dosObj) {
 	};
 
 	// 外部スキンファイルの指定
-	const tmpSkinType = _dosObj.skinType || (typeof g_presetSkinType === C_TYP_STRING ? g_presetSkinType : `default`);
+	const tmpSkinType = _dosObj.skinType ?? g_presetObj.skinType ?? `default`;
 	const tmpSkinTypes = tmpSkinType.split(`,`);
 	obj.defaultSkinFlg = tmpSkinTypes.includes(`default`);
 	setJsFiles(tmpSkinTypes, C_DIR_SKIN, `skin`);
 
 	// 外部jsファイルの指定
-	const tmpCustomjs = _dosObj.customjs || (typeof g_presetCustomJs === C_TYP_STRING ? g_presetCustomJs : C_JSF_CUSTOM);
+	const tmpCustomjs = _dosObj.customjs ?? g_presetObj.customJs ?? C_JSF_CUSTOM;
 	setJsFiles(tmpCustomjs.split(`,`), C_DIR_JS);
 
 	// 外部cssファイルの指定
-	const tmpCustomcss = _dosObj.customcss || (typeof g_presetCustomCss === C_TYP_STRING ? g_presetCustomCss : ``);
+	const tmpCustomcss = _dosObj.customcss ?? g_presetObj.customCss ?? ``;
 	setJsFiles(tmpCustomcss.split(`,`), C_DIR_CSS);
 
 	// デフォルト曲名表示、背景、Ready表示の利用有無
 	g_titleLists.init.forEach(objName => {
 		const objUpper = toCapitalize(objName);
-		obj[`custom${objUpper}Use`] = setVal(_dosObj[`custom${objUpper}Use`],
-			(typeof g_presetCustomDesignUse === C_TYP_OBJECT && (objName in g_presetCustomDesignUse) ?
-				setVal(g_presetCustomDesignUse[objName], false, C_TYP_BOOLEAN) : false), C_TYP_BOOLEAN);
+		obj[`custom${objUpper}Use`] =
+			setVal(_dosObj[`custom${objUpper}Use`] ?? g_presetObj.customDesignUse?.[objName], false, C_TYP_BOOLEAN);
 	});
 
 	// 背景・マスクモーションのパス指定方法を他の設定に合わせる設定
-	const tmpSyncBackPath = (typeof g_presetSyncBackPath === C_TYP_BOOLEAN ? g_presetSyncBackPath : false);
-	obj.syncBackPath = setVal(_dosObj.syncBackPath, tmpSyncBackPath, C_TYP_BOOLEAN);
+	obj.syncBackPath = setVal(_dosObj.syncBackPath ?? g_presetObj.syncBackPath, false, C_TYP_BOOLEAN);
 
 	return obj;
 }
@@ -2802,26 +2928,14 @@ function updateImgType(_imgType) {
 	resetImgs(_imgType.name, _imgType.extension);
 	reloadImgObj();
 	Object.keys(g_imgObj).forEach(key => g_imgObj[key] = `${g_rootPath}${g_imgObj[key]}`);
-	if (_imgType[1] === undefined && typeof g_presetOverrideExtension === C_TYP_STRING) {
-		Object.keys(g_imgObj).forEach(key => g_imgObj[key] = `${g_imgObj[key].slice(0, -3)}${g_presetOverrideExtension}`);
+	if (_imgType[1] === undefined && g_presetObj.overrideExtension !== undefined) {
+		Object.keys(g_imgObj).forEach(key => g_imgObj[key] = `${g_imgObj[key].slice(0, -3)}${g_presetObj.overrideExtension}`);
 	}
 	if (!g_isFile) {
 		g_imgInitList.forEach(img => preloadFile(`image`, g_imgObj[img]));
 	}
 }
 
-/**
- * 独自で設定したラベルテキスト、オンマウステキスト、確認メッセージ定義を上書き
- */
-function updateLocalDesc() {
-	if (typeof g_local_lblNameObj === C_TYP_OBJECT && g_local_lblNameObj[g_localeObj.val] !== undefined) {
-		Object.keys(g_local_lblNameObj[g_localeObj.val]).forEach(property => g_lblNameObj[property] = g_local_lblNameObj[g_localeObj.val][property]);
-	}
-	if (typeof g_local_msgObj === C_TYP_OBJECT && g_local_msgObj[g_localeObj.val] !== undefined) {
-		Object.keys(g_local_msgObj[g_localeObj.val]).forEach(property => g_msgObj[property] = g_local_msgObj[g_localeObj.val][property]);
-	}
-}
-
 /**
  * 譜面ヘッダーの分解（その他の設定）
  * @param {object} _dosObj 譜面データオブジェクト
@@ -2832,7 +2946,7 @@ function headerConvert(_dosObj) {
 	const obj = {};
 
 	// フォントの設定
-	obj.customFont = setVal(_dosObj.customFont, ``, C_TYP_STRING);
+	obj.customFont = _dosObj.customFont ?? ``;
 	g_headerObj.customFont = obj.customFont;
 
 	// 画像ルートパス、拡張子の設定 (サーバ上のみ)
@@ -2841,8 +2955,8 @@ function headerConvert(_dosObj) {
 		let tmpImgTypes = [];
 		if (hasVal(_dosObj.imgType)) {
 			tmpImgTypes = _dosObj.imgType.split(`$`);
-		} else if (typeof g_presetImageSets === C_TYP_OBJECT) {
-			tmpImgTypes = g_presetImageSets.concat();
+		} else if (g_presetObj.imageSets !== undefined) {
+			tmpImgTypes = g_presetObj.imageSets.concat();
 		}
 		if (tmpImgTypes.length > 0) {
 			tmpImgTypes.forEach((tmpImgType, j) => {
@@ -2873,9 +2987,8 @@ function headerConvert(_dosObj) {
 	}
 
 	// ラベルテキスト、オンマウステキスト、確認メッセージ定義の上書き設定
-	Object.keys(g_lang_lblNameObj[g_localeObj.val]).forEach(property => g_lblNameObj[property] = g_lang_lblNameObj[g_localeObj.val][property]);
-	Object.keys(g_lang_msgObj[g_localeObj.val]).forEach(property => g_msgObj[property] = g_lang_msgObj[g_localeObj.val][property]);
-	updateLocalDesc();
+	Object.assign(g_lblNameObj, g_lang_lblNameObj[g_localeObj.val], g_presetObj.lblName?.[g_localeObj.val]);
+	Object.assign(g_msgObj, g_lang_msgObj[g_localeObj.val], g_presetObj.msg?.[g_localeObj.val]);
 
 	// 曲名
 	obj.musicTitles = [];
@@ -2896,18 +3009,18 @@ function headerConvert(_dosObj) {
 			if (obj.musicNos.length >= j) {
 				obj.musicTitles[j] = escapeHtml(getMusicNameSimple(musics[0]));
 				obj.musicTitlesForView[j] = escapeHtmlForArray(getMusicNameMultiLine(musics[0]));
-				obj.artistNames[j] = escapeHtml(setVal(musics[1], ``, C_TYP_STRING));
+				obj.artistNames[j] = escapeHtml(musics[1] ?? ``);
 			}
 		}
 		const musics = musicData[0].split(`,`);
 		obj.musicTitle = obj.musicTitles[0];
 		obj.musicTitleForView = obj.musicTitlesForView[0];
-		obj.artistName = obj.artistNames[0] || ``;
+		obj.artistName = obj.artistNames[0] ?? ``;
 		if (obj.artistName === ``) {
 			makeWarningWindow(g_msgInfoObj.E_0011);
 			obj.artistName = `artistName`;
 		}
-		obj.artistUrl = musics[2] || ``;
+		obj.artistUrl = musics[2] ?? ``;
 		if (musics[3] !== undefined) {
 			obj.musicTitles[0] = escapeHtml(getMusicNameSimple(musics[3]));
 			obj.musicTitlesForView[0] = escapeHtmlForArray(getMusicNameMultiLine(musics[3]));
@@ -2943,10 +3056,10 @@ function headerConvert(_dosObj) {
 	if (hasVal(_dosObj.tuning)) {
 		const tunings = _dosObj.tuning.split(`,`);
 		obj.tuning = escapeHtmlForEnabledTag(tunings[0]);
-		obj.creatorUrl = (tunings.length > 1 ? tunings[1] : (typeof g_presetTuningUrl === C_TYP_STRING ? g_presetTuningUrl : ``));
+		obj.creatorUrl = (tunings.length > 1 ? tunings[1] : (g_presetObj.tuningUrl ?? ``));
 	} else {
-		obj.tuning = (typeof g_presetTuning === C_TYP_STRING ? escapeHtmlForEnabledTag(g_presetTuning) : `name`);
-		obj.creatorUrl = (typeof g_presetTuningUrl === C_TYP_STRING ? g_presetTuningUrl : ``);
+		obj.tuning = escapeHtmlForEnabledTag(g_presetObj.tuning ?? `name`);
+		obj.creatorUrl = g_presetObj.tuningUrl ?? ``;
 	}
 	obj.tuningInit = obj.tuning;
 
@@ -2954,7 +3067,7 @@ function headerConvert(_dosObj) {
 	if (hasVal(_dosObj.difData)) {
 		const difs = _dosObj.difData.split(`$`);
 		const difpos = {
-			key: 0, name: 1, speed: 2, border: 3, recovery: 4, damage: 5, init: 6,
+			Key: 0, Name: 1, Speed: 2, Border: 3, Recovery: 4, Damage: 5, Init: 6,
 		};
 		obj.keyLabels = [];
 		obj.difLabels = [];
@@ -2966,34 +3079,25 @@ function headerConvert(_dosObj) {
 		obj.creatorNames = [];
 		g_stateObj.scoreId = (g_stateObj.scoreId < difs.length ? g_stateObj.scoreId : 0);
 
-		const lifeData = (_name, _preData, _default) => {
-			const data = (_preData) ? _preData :
-				(typeof g_presetGauge === C_TYP_OBJECT && (_name in g_presetGauge) ?
-					g_presetGauge[_name] : _default);
-			return setVal(data, _default, C_TYP_FLOAT);
-		};
-
 		difs.forEach(dif => {
 			const difDetails = dif.split(`,`);
+			const lifeData = (_type, _default) =>
+				setVal(difDetails[difpos[_type]] || g_presetObj.gauge?.[_type], _default, C_TYP_FLOAT);
 
 			// ライフ：ノルマ、回復量、ダメージ量、初期値の設定
-			const border = (difDetails[difpos.border]) ? difDetails[difpos.border] :
-				(typeof g_presetGauge === C_TYP_OBJECT && (`Border` in g_presetGauge) ?
-					g_presetGauge.Border : `x`);
-
-			obj.lifeBorders.push(border === `x` ? `x` : setVal(border, 70, C_TYP_FLOAT));
-			obj.lifeRecoverys.push(lifeData(`Recovery`, difDetails[difpos.recovery], 6));
-			obj.lifeDamages.push(lifeData(`Damage`, difDetails[difpos.damage], 40));
-			obj.lifeInits.push(lifeData(`Init`, difDetails[difpos.init], 25));
+			obj.lifeBorders.push(lifeData(`Border`, `x`));
+			obj.lifeRecoverys.push(lifeData(`Recovery`, 6));
+			obj.lifeDamages.push(lifeData(`Damage`, 40));
+			obj.lifeInits.push(lifeData(`Init`, 25));
 
 			// キー数
-			const keyLabel = setVal(difDetails[difpos.key], `7`, C_TYP_STRING);
-			obj.keyLabels.push(g_keyObj.keyTransPattern[keyLabel] || keyLabel);
+			const keyLabel = difDetails[difpos.Key] ?? `7`;
+			obj.keyLabels.push(g_keyObj.keyTransPattern[keyLabel] ?? keyLabel);
 
 			// 譜面名、制作者名
-			if (hasVal(difDetails[difpos.name])) {
-				const difNameInfo = difDetails[difpos.name].split(`::`);
-				obj.difLabels.push(escapeHtml(setVal(difNameInfo[0], `Normal`, C_TYP_STRING)));
+			if (hasVal(difDetails[difpos.Name])) {
+				const difNameInfo = difDetails[difpos.Name].split(`::`);
+				obj.difLabels.push(escapeHtml(difNameInfo[0] ?? `Normal`));
 				obj.creatorNames.push(difNameInfo.length > 1 ? escapeHtml(difNameInfo[1]) : obj.tuning);
 			} else {
 				obj.difLabels.push(`Normal`);
@@ -3001,7 +3105,7 @@ function headerConvert(_dosObj) {
 			}
 
 			// 初期速度
-			obj.initSpeeds.push(setVal(difDetails[difpos.speed], 3.5, C_TYP_FLOAT));
+			obj.initSpeeds.push(setVal(difDetails[difpos.Speed], 3.5, C_TYP_FLOAT));
 		});
 	} else {
 		makeWarningWindow(g_msgInfoObj.E_0021);
@@ -3014,8 +3118,9 @@ function headerConvert(_dosObj) {
 		obj.lifeInits = [25];
 		obj.creatorNames = [obj.tuning];
 	}
-	const keyLists = obj.keyLabels.filter((x, j, self) => self.indexOf(x) === j);
+	const keyLists = makeDedupliArray(obj.keyLabels);
 	obj.keyLists = keyLists.sort((a, b) => parseInt(a) - parseInt(b));
+	obj.undefinedKeyLists = obj.keyLists.filter(key => g_keyObj[`chara${key}_0`] === undefined);
 
 	// 譜面変更セレクターの利用有無
 	obj.difSelectorUse = (setVal(_dosObj.difSelectorUse, obj.keyLabels.length > 5, C_TYP_BOOLEAN));
@@ -3034,7 +3139,7 @@ function headerConvert(_dosObj) {
 	if (hasVal(_dosObj.defaultColorgrd)) {
 		obj.defaultColorgrd = _dosObj.defaultColorgrd.split(`,`);
 		obj.defaultColorgrd[0] = setVal(obj.defaultColorgrd[0], false, C_TYP_BOOLEAN);
-		obj.defaultColorgrd[1] = setVal(obj.defaultColorgrd[1], intermediateColor, C_TYP_STRING);
+		obj.defaultColorgrd[1] = obj.defaultColorgrd[1] ?? intermediateColor;
 	}
 	g_rankObj.rankColorAllPerfect = intermediateColor;
 
@@ -3055,13 +3160,7 @@ function headerConvert(_dosObj) {
 	});
 
 	// フリーズアローのデフォルト色セットの利用有無 (true: 使用, false: 矢印色を優先してセット)
-	if (hasVal(_dosObj.defaultFrzColorUse)) {
-		obj.defaultFrzColorUse = setVal(_dosObj.defaultFrzColorUse, true, C_TYP_BOOLEAN);
-	} else if (typeof g_presetFrzColors === C_TYP_BOOLEAN) {
-		obj.defaultFrzColorUse = g_presetFrzColors;
-	} else {
-		obj.defaultFrzColorUse = true;
-	}
+	obj.defaultFrzColorUse = setVal(_dosObj.defaultFrzColorUse ?? g_presetObj.frzColors, true, C_TYP_BOOLEAN);
 
 	// 矢印色変化に対応してフリーズアロー色を追随する範囲の設定
 	// (defaultFrzColorUse=false時のみ)
@@ -3072,8 +3171,8 @@ function headerConvert(_dosObj) {
 
 		if (hasVal(_dosObj.frzScopeFromAC)) {
 			tmpFrzScope.push(..._dosObj.frzScopeFromAC.split(`,`));
-		} else if (typeof g_presetFrzScopeFromAC === C_TYP_OBJECT) {
-			tmpFrzScope.push(...g_presetFrzScopeFromAC);
+		} else if (g_presetObj.frzScopeFromAC !== undefined) {
+			tmpFrzScope.push(...g_presetObj.frzScopeFromAC);
 		}
 		tmpFrzScope.filter(type => [`Normal`, `Hit`].includes(type))
 			.forEach(data => obj.frzScopeFromArrowColors.push(data));
@@ -3097,10 +3196,10 @@ function headerConvert(_dosObj) {
 	addGaugeFulls(g_gaugeOptionObj.survival);
 	addGaugeFulls(g_gaugeOptionObj.border);
 
-	if (typeof g_presetGaugeList === C_TYP_OBJECT) {
-		Object.keys(g_presetGaugeList).forEach(key => {
+	if (g_presetObj.gaugeList !== undefined) {
+		Object.keys(g_presetObj.gaugeList).forEach(key => {
 			g_gaugeOptionObj.customDefault.push(key);
-			g_gaugeOptionObj.varCustomDefault.push((g_presetGaugeList[key] !== `V` ? C_FLG_OFF : C_FLG_ON));
+			g_gaugeOptionObj.varCustomDefault.push((g_presetObj.gaugeList[key] !== `V` ? C_FLG_OFF : C_FLG_ON));
 		});
 		g_gaugeOptionObj.custom = g_gaugeOptionObj.customDefault.concat();
 		g_gaugeOptionObj.varCustom = g_gaugeOptionObj.varCustomDefault.concat();
@@ -3173,7 +3272,7 @@ function headerConvert(_dosObj) {
 	g_diffObj.frzJdgY = (isNaN(parseFloat(_dosObj.frzJdgY)) ? 0 : parseFloat(_dosObj.frzJdgY));
 
 	// musicフォルダ設定
-	obj.musicFolder = setVal(_dosObj.musicFolder, (g_remoteFlg ? `(..)../music` : `music`), C_TYP_STRING);
+	obj.musicFolder = _dosObj.musicFolder ?? (g_remoteFlg ? `(..)../music` : `music`);
 
 	// 楽曲URL
 	if (hasVal(_dosObj.musicUrl)) {
@@ -3198,10 +3297,10 @@ function headerConvert(_dosObj) {
 	}
 
 	// 最終演出表示有無（noneで無効化）
-	obj.finishView = setVal(_dosObj.finishView, ``, C_TYP_STRING);
+	obj.finishView = _dosObj.finishView ?? ``;
 
 	// 更新日
-	obj.releaseDate = setVal(_dosObj.releaseDate, ``, C_TYP_STRING);
+	obj.releaseDate = _dosObj.releaseDate ?? ``;
 
 	// デフォルトReady/リザルト表示の遅延時間設定
 	[`ready`, `result`].forEach(objName => {
@@ -3212,16 +3311,16 @@ function headerConvert(_dosObj) {
 	obj.readyAnimationFrame = setVal(_dosObj.readyAnimationFrame, 150, C_TYP_NUMBER);
 
 	// デフォルトReady表示のアニメーション名
-	obj.readyAnimationName = setVal(_dosObj.readyAnimationName, `leftToRightFade`, C_TYP_STRING);
+	obj.readyAnimationName = _dosObj.readyAnimationName ?? `leftToRightFade`;
 
 	// デフォルトReady表示の先頭文字色
-	obj.readyColor = setVal(_dosObj.readyColor, ``, C_TYP_STRING);
+	obj.readyColor = _dosObj.readyColor ?? ``;
 
 	// デフォルトReady表示を上書きするテキスト
-	obj.readyHtml = setVal(_dosObj.readyHtml, ``, C_TYP_STRING);
+	obj.readyHtml = _dosObj.readyHtml ?? ``;
 
 	// デフォルト曲名表示のフォントサイズ
-	obj.titlesize = setVal(_dosObj.titlesize, ``, C_TYP_STRING);
+	obj.titlesize = _dosObj.titlesize ?? ``;
 
 	// デフォルト曲名表示のフォント名
 	// (使用例： |titlefont=Century,Meiryo UI|)
@@ -3241,7 +3340,7 @@ function headerConvert(_dosObj) {
 		if (hasVal(_dosObj[_name])) {
 			const tmpTitlegrd = _dosObj[_name].replace(/,/g, `:`);
 			obj[`${_name}s`] = tmpTitlegrd.split(`$`);
-			obj[`${_name}`] = setVal(obj[`${_name}s`][0], ``, C_TYP_STRING);
+			obj[`${_name}`] = obj[`${_name}s`][0] ?? ``;
 		}
 	});
 
@@ -3270,7 +3369,7 @@ function headerConvert(_dosObj) {
 	}
 	if (hasVal(_dosObj.titleanimationclass)) {
 		_dosObj.titleanimationclass.split(`$`).forEach((animationClass, j) => {
-			obj.titleAnimationClass[j] = setVal(animationClass, ``, C_TYP_STRING);
+			obj.titleAnimationClass[j] = animationClass ?? ``;
 		});
 	}
 	if (obj.titleAnimationName.length === 1) {
@@ -3286,8 +3385,7 @@ function headerConvert(_dosObj) {
 	obj.titlelineheight = setVal(_dosObj.titlelineheight, ``, C_TYP_NUMBER);
 
 	// フリーズアローの始点で通常矢印の判定を行うか(dotさんソース方式)
-	obj.frzStartjdgUse = setVal(_dosObj.frzStartjdgUse,
-		(typeof g_presetFrzStartjdgUse === C_TYP_STRING ? setVal(g_presetFrzStartjdgUse, false, C_TYP_BOOLEAN) : false), C_TYP_BOOLEAN);
+	obj.frzStartjdgUse = setVal(_dosObj.frzStartjdgUse ?? g_presetObj.frzStartjdgUse, false, C_TYP_BOOLEAN);
 
 	// 譜面名に制作者名を付加するかどうかのフラグ
 	obj.makerView = setVal(_dosObj.makerView, false, C_TYP_BOOLEAN);
@@ -3300,25 +3398,21 @@ function headerConvert(_dosObj) {
 
 	// オプション利用可否設定
 	g_canDisabledSettings.forEach(option => {
-		obj[`${option}Use`] = setVal(_dosObj[`${option}Use`],
-			(typeof g_presetSettingUse === C_TYP_OBJECT ?
-				setVal(g_presetSettingUse[option], true, C_TYP_BOOLEAN) : true), C_TYP_BOOLEAN);
+		obj[`${option}Use`] = setVal(_dosObj[`${option}Use`] ?? g_presetObj.settingUse?.[option], true, C_TYP_BOOLEAN);
 	});
 
 	let interlockingErrorFlg = false;
 	g_displays.forEach((option, j) => {
 
 		// Display使用可否設定を分解 |displayUse=false,ON|
-		const displayTempUse = setVal(_dosObj[`${option}Use`],
-			(typeof g_presetSettingUse === C_TYP_OBJECT ?
-				g_presetSettingUse[option] : `true`), C_TYP_STRING);
+		const displayTempUse = _dosObj[`${option}Use`] ?? g_presetObj.settingUse?.[option] ?? `true`;
 		const displayUse = (displayTempUse !== undefined ? displayTempUse.split(`,`) : [true, C_FLG_ON]);
 
 		// displayUse -> ボタンの有効/無効, displaySet -> ボタンの初期値(ON/OFF)
 		obj[`${option}Use`] = setVal(displayUse[0], true, C_TYP_BOOLEAN);
 		obj[`${option}Set`] = setVal(displayUse.length > 1 ? displayUse[1] :
 			(obj[`${option}Use`] ? C_FLG_ON : C_FLG_OFF), ``, C_TYP_SWITCH);
-		g_stateObj[`d_${option.toLowerCase()}`] = (obj[`${option}Set`] !== `` ? obj[`${option}Set`] : C_FLG_ON);
+		g_stateObj[`d_${option.toLowerCase()}`] = setVal(obj[`${option}Set`], C_FLG_ON, C_TYP_SWITCH);
 		obj[`${option}ChainOFF`] = (_dosObj[`${option}ChainOFF`] !== undefined ? _dosObj[`${option}ChainOFF`].split(`,`) : []);
 
 		// Displayのデフォルト設定で、双方向に設定されている場合は設定をブロック
@@ -3381,7 +3475,7 @@ function headerConvert(_dosObj) {
 	obj.maskresultButton = setVal(_dosObj.maskresultButton, false, C_TYP_BOOLEAN);
 
 	// color_dataの過去バージョン互換設定
-	obj.colorDataType = setVal(_dosObj.colorDataType, ``, C_TYP_STRING);
+	obj.colorDataType = _dosObj.colorDataType ?? ``;
 
 	// リザルトモーションをDisplay:BackgroundのON/OFFと連動させるかどうかの設定
 	obj.resultMotionSet = setVal(_dosObj.resultMotionSet, true, C_TYP_BOOLEAN);
@@ -3394,9 +3488,8 @@ 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));
+	const tmpComment = (_dosObj[`commentVal${g_localeObj.val}`] ?? _dosObj.commentVal ?? ``).split(`\r\n`).join(`\n`);
+	obj.commentVal = tmpComment.split(`\n`).join(newlineTag);
 
 	// クレジット表示
 	if (document.querySelector(`#webMusicTitle`) !== null) {
@@ -3409,8 +3502,7 @@ function headerConvert(_dosObj) {
 	obj.commentExternal = setVal(_dosObj.commentExternal, false, C_TYP_BOOLEAN);
 
 	// Reverse時の歌詞の自動反転制御
-	obj.wordAutoReverse = setVal(_dosObj.wordAutoReverse,
-		(typeof g_presetWordAutoReverse === C_TYP_STRING ? setVal(g_presetWordAutoReverse, `auto`, C_TYP_STRING) : `auto`), C_TYP_STRING);
+	obj.wordAutoReverse = _dosObj.wordAutoReverse ?? g_presetObj.wordAutoReverse ?? `auto`;
 
 	// プレイサイズ(X方向)
 	obj.playingWidth = setVal(_dosObj.playingWidth, g_sWidth, C_TYP_NUMBER);
@@ -3426,19 +3518,18 @@ function headerConvert(_dosObj) {
 
 	// リザルトデータのカスタマイズ
 	const resultFormatDefault = `【#danoni[hashTag]】[musicTitle]([keyLabel]) /[maker] /Rank:[rank]/Score:[score]/Playstyle:[playStyle]/[arrowJdg]/[frzJdg]/[maxCombo] [url]`;
-	obj.resultFormat = escapeHtmlForEnabledTag(setVal(_dosObj.resultFormat, (typeof g_presetResultFormat === C_TYP_STRING ?
-		setVal(g_presetResultFormat, resultFormatDefault, C_TYP_STRING) : resultFormatDefault), C_TYP_STRING));
+	obj.resultFormat = escapeHtmlForEnabledTag(_dosObj.resultFormat ?? g_presetObj.resultFormat ?? resultFormatDefault);
 
 	// フェードイン時にそれ以前のデータを蓄積しない種別(word, back, mask)を指定
-	obj.unStockCategories = setVal(_dosObj.unStockCategory, ``, C_TYP_STRING).split(`,`);
-	if (typeof g_presetUnStockCategories === C_TYP_OBJECT) {
-		obj.unStockCategories = makeDedupliArray(obj.unStockCategories, g_presetUnStockCategories);
+	obj.unStockCategories = (_dosObj.unStockCategory ?? ``).split(`,`);
+	if (g_presetObj.unStockCategories !== undefined) {
+		obj.unStockCategories = makeDedupliArray(obj.unStockCategories, g_presetObj.unStockCategories);
 	}
 	g_fadeinStockList = g_fadeinStockList.filter(cg => obj.unStockCategories.indexOf(cg) === -1);
 
 	// フェードイン時にそれ以前のデータを蓄積しないパターンを指定
-	if (typeof g_presetStockForceDelList === C_TYP_OBJECT) {
-		Object.assign(g_stockForceDelList, g_presetStockForceDelList);
+	if (g_presetObj.stockForceDelList !== undefined) {
+		Object.assign(g_stockForceDelList, g_presetObj.stockForceDelList);
 	}
 	g_fadeinStockList.forEach(type => {
 		if (hasVal(_dosObj[`${type}StockForceDel`])) {
@@ -3715,11 +3806,11 @@ function getGaugeSetting(_dosObj, _name, _difLength, { scoreId = 0 } = {}) {
 			}
 		}
 
-	} else if (typeof g_presetGaugeCustom === C_TYP_OBJECT && g_presetGaugeCustom[_name]) {
+	} else if (g_presetObj.gaugeCustom?.[_name] !== undefined) {
 
 		const gaugeDetails = [
-			g_presetGaugeCustom[_name].Border, g_presetGaugeCustom[_name].Recovery,
-			g_presetGaugeCustom[_name].Damage, g_presetGaugeCustom[_name].Init,
+			g_presetObj.gaugeCustom[_name].Border, g_presetObj.gaugeCustom[_name].Recovery,
+			g_presetObj.gaugeCustom[_name].Damage, g_presetObj.gaugeCustom[_name].Init,
 		]
 		if (gaugeUpdateFlg) {
 			gaugeCreateFlg = setGaugeDetails(scoreId, gaugeDetails);
@@ -3745,12 +3836,11 @@ const getKeyName = _key => hasVal(g_keyObj[`keyName${_key}`]) ? g_keyObj[`keyNam
  * 一時的な追加キーの設定
  * @param {object} _dosObj 
  */
-function keysConvert(_dosObj) {
+function keysConvert(_dosObj, { keyExtraList = _dosObj.keyExtraList.split(`,`) } = {}) {
 
-	if (_dosObj.keyExtraList === undefined) {
-		return;
+	if (keyExtraList === undefined) {
+		return [];
 	}
-	const keyExtraList = _dosObj.keyExtraList.split(`,`);
 
 	const existParam = (_data, _paramName) => !hasVal(_data) && g_keyObj[_paramName] !== undefined;
 	const toString = _str => _str;
@@ -3854,7 +3944,7 @@ function keysConvert(_dosObj) {
 		let tmpMinPatterns = 1;
 
 		// キーの名前 (keyNameX)
-		g_keyObj[`keyName${newKey}`] = setVal(_dosObj[`keyName${newKey}`], newKey, C_TYP_STRING);
+		g_keyObj[`keyName${newKey}`] = _dosObj[`keyName${newKey}`] ?? newKey;
 
 		// 矢印色パターン (colorX_Y)
 		tmpMinPatterns = newKeyMultiParam(newKey, `color`, toNumber, {
@@ -3943,6 +4033,8 @@ function keysConvert(_dosObj) {
 		// |assist(newKey)=Onigiri::0,0,0,0,0,1/AA::0,0,0,1,1,1$...|
 		newKeyPairParam(newKey, `assist`, `assistPos`);
 	});
+
+	return keyExtraList;
 }
 
 
@@ -4441,13 +4533,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);
@@ -4911,8 +5020,6 @@ function createOptionWindow(_sprite) {
 		// ---------------------------------------------------
 		// 1. キーコンフィグ設定 (KeyConfig)
 
-		// 特殊キーフラグ
-		g_stateObj.extraKeyFlg = false;
 
 		g_keyObj.currentKey = g_headerObj.keyLabels[g_stateObj.scoreId];
 		const isNotSameKey = (g_keyObj.prevKey !== g_keyObj.currentKey);
@@ -4920,15 +5027,8 @@ function createOptionWindow(_sprite) {
 		if (g_headerObj.dummyScoreNos !== undefined) {
 			g_stateObj.dummyId = setVal(g_headerObj.dummyScoreNos[g_stateObj.scoreId], ``, C_TYP_NUMBER);
 		}
-
-		if (g_rootObj.keyExtraList !== undefined) {
-			g_rootObj.keyExtraList.split(`,`).some(extraKey => {
-				if (g_keyObj.currentKey === extraKey) {
-					g_stateObj.extraKeyFlg = true;
-					return true;
-				}
-			});
-		}
+		// 特殊キーフラグ
+		g_stateObj.extraKeyFlg = g_headerObj.keyExtraList.includes(g_keyObj.currentKey);
 
 		// ---------------------------------------------------
 		// 2. 初期化設定
@@ -5166,8 +5266,8 @@ function createLblSetting(_settingName, _adjY = 0, _settingLabel = _settingName)
  * @param {string} _name 
  */
 function getStgDetailName(_name) {
-	return g_lblNameObj[`u_${_name}`] !== undefined && (typeof g_lblRenames !== C_TYP_OBJECT ||
-		(typeof g_lblRenames === C_TYP_OBJECT && g_lblRenames[g_currentPage])) ? g_lblNameObj[`u_${_name}`] : _name;
+	return g_lblNameObj[`u_${_name}`] !== undefined &&
+		(g_presetObj.lblRenames === undefined || g_presetObj.lblRenames[g_currentPage]) ? g_lblNameObj[`u_${_name}`] : _name;
 }
 
 /**
@@ -5221,7 +5321,7 @@ function makeDisabledLabel(_id, _heightPos, _defaultStr) {
  */
 function getKeyReverse(_localStorage, _extraKeyName = ``) {
 	if (_localStorage[`reverse${_extraKeyName}`] !== undefined) {
-		g_stateObj.reverse = setVal(_localStorage[`reverse${_extraKeyName}`], C_FLG_OFF, C_TYP_STRING);
+		g_stateObj.reverse = _localStorage[`reverse${_extraKeyName}`] ?? C_FLG_OFF;
 		g_settings.reverseNum = roundZero(g_settings.reverses.findIndex(reverse => reverse === g_stateObj.reverse));
 	} else {
 		g_stateObj.reverse = C_FLG_OFF;
@@ -6025,7 +6125,7 @@ function keyConfigInit(_kcType = g_kcType) {
 
 	// キーパターン表示
 	const lblTransKey = hasVal(g_keyObj[`transKey${keyCtrlPtn}`]) ?
-		'(' + setVal(g_keyObj[`transKey${keyCtrlPtn}`], ``, C_TYP_STRING) + ')' : ``;
+		`(${g_keyObj[`transKey${keyCtrlPtn}`] ?? ''})` : ``;
 
 	// パターン検索
 	const searchPattern = (_tempPtn, _sign, _transKeyUse = false, _keyCheck = `keyCtrl`) => {
@@ -6630,20 +6730,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 +6826,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();
 	}
 
@@ -6871,7 +6979,7 @@ function scoreConvert(_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 					break;
 				} else {
 					wordData[tmpWordData[k]][addFrame].push(tmpWordData[k + 1],
-						escapeHtmlForEnabledTag(setVal(tmpWordData[k + 2], ``, C_TYP_STRING)));
+						escapeHtmlForEnabledTag(tmpWordData[k + 2] ?? ``));
 				}
 			}
 		});
@@ -7312,10 +7420,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 +7436,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 +7677,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 +7700,7 @@ function pushColors(_header, _frame, _val, _colorCd, _allFlg) {
 		});
 
 	} else {
-		const baseHeader = `mkF${_header}Color`;
+		const baseHeader = `mk${_header}FColor`;
 		allUseTypes.push(`Frz`);
 
 		// フリーズアローの色変化
@@ -7856,6 +7967,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 +8462,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 +8998,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 +9033,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 +9252,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 +9275,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 +9736,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);
@@ -9922,9 +10065,9 @@ function resultInit() {
 		.split(`[maxCombo]`).join(tweetMaxCombo)
 		.split(`[url]`).join(`${twiturl.toString()}`.replace(/[\t\n]/g, ``));
 
-	if (typeof g_presetResultVals === C_TYP_OBJECT) {
-		Object.keys(g_presetResultVals).forEach(key => {
-			tweetResultTmp = tweetResultTmp.split(`[${key}]`).join(g_resultObj[g_presetResultVals[key]]);
+	if (g_presetObj.resultVals !== undefined) {
+		Object.keys(g_presetObj.resultVals).forEach(key => {
+			tweetResultTmp = tweetResultTmp.split(`[${key}]`).join(g_resultObj[g_presetObj.resultVals[key]]);
 		});
 	}
 	const resultText = `${unEscapeHtml(tweetResultTmp)}`;