danoniplus 44.3.0 → 44.4.0

package/README.md

@@ -121,9 +121,13 @@ If you would like to cooperate with the development, please see below. Even if y
 - [Dancing☆Onigiri エディター(CW Edition 対応)](https://github.com/superkuppabros/danoni-editor) @superkuppabros
 - [ダンおに曲データjs化ツール](https://github.com/suzme/danoni-base64) @suzme
 - [ダンおに矢印色ツール](https://github.com/suzme/danoni-colorpicker) @suzme
+- [ダンおにゲージ計算機 (Gauge Calculator)](http://www.omission0.com/other/gauge_calculator/) @goe0
+- [ダンおに波形解析ツール](https://github.com/suzme/danoni-waveform) @suzme
+
+#### Conversion Tool from Legacy Flash Environments / 旧Flashからの変換ツール
+
 - [Dancing☆Onigiri Chart Reverser](https://github.com/cwtickle/danoniplus-reverser) @cwtickle
 - [Dancing☆Onigiri Chart Converter](https://github.com/cwtickle/danoniplus-converter) @cwtickle
-- [ダンおにゲージ計算機 (Gauge Calculator)](http://www.omission0.com/other/gauge_calculator/) @goe0
 
 ### Kirizma / キリズマ
 

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/02/20
+ * Revised : 2026/02/21
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 44.3.0`;
-const g_revisedDate = `2026/02/20`;
+const g_version = `Ver 44.4.0`;
+const g_revisedDate = `2026/02/21`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -65,10 +65,26 @@ const g_referenceDomains = [
 ];
 Object.freeze(g_referenceDomains);
 
+// ドメイン管理リスト
+const g_domainList = [
+	{ label: `jsdelivr`, hosts: [`cdn.jsdelivr.net`] },
+	{ label: `unpkg`, hosts: [`unpkg.com`, `www.unpkg.com`] },
+];
+Object.freeze(g_domainList);
+
 const g_rootPath = current().match(/(^.*\/)/)[0];
 let g_workPath;
 const hasRemoteDomain = _path => g_referenceDomains.some(domain => _path.match(`^https://${domain}/`) !== null);
+const detectDomain = _url => {
+	try {
+		const host = new URL(_url).hostname; // 例: "cdn.jsdelivr.net"
+		return g_domainList.find(({ hosts }) => hosts.some(h => host === h || host.endsWith(`.${h}`)))?.label ?? null;
+	} catch {
+		return null;
+	}
+}
 const g_remoteFlg = hasRemoteDomain(g_rootPath);
+const g_remoteDomain = detectDomain(g_rootPath);
 
 const g_randTime = Date.now();
 const g_versionForUrl = g_version.slice(4);    // URL用に先頭の"Ver "を削除
@@ -5333,7 +5349,8 @@ const titleInit = (_initFlg = false) => {
 		customVersion += ` / ${g_localVersion2}`;
 	}
 	const releaseDate = (g_headerObj.releaseDate !== `` ? ` @${g_headerObj.releaseDate}` : ``);
-	const versionName = `© 2018-${g_revisedDate.slice(0, 4)} ティックル, CW ${g_version}${customVersion}${releaseDate}`;
+	const remoteDomainInfo = g_remoteDomain !== null ? ` (${g_remoteDomain})` : ``;
+	const versionName = `© 2018-${g_revisedDate.slice(0, 4)} ティックル, CW ${g_version}${remoteDomainInfo}${customVersion}${releaseDate}`;
 	const getLinkSiz = _name => getFontSize2(_name, g_sWidth / 2 - 20, { maxSiz: g_limitObj.lnkSiz, minSiz: 12 });
 
 	/**
@@ -12087,8 +12104,8 @@ const mainInit = () => {
 	g_effectFunc.get(g_stateObj.effect)();
 
 	// Appearanceのオプション適用時は一部描画を隠す
-	changeAppearanceFilter(g_appearanceRanges.includes(g_stateObj.appearance) ?
-		g_hidSudObj.filterPos : g_hidSudObj.filterPosDefault[g_stateObj.appearance], true);
+	changeAppearanceBar(g_appearanceRanges.includes(g_stateObj.appearance)
+		? g_hidSudObj.filterPos : g_hidSudObj.filterPosDefault[g_stateObj.appearance], 0);
 
 	// Shaking初期化
 	if (g_stateObj.shaking !== C_FLG_OFF) {
@@ -12416,10 +12433,15 @@ const mainInit = () => {
 		} else if (g_appearanceRanges.includes(g_stateObj.appearance) && g_stateObj.filterLock === C_FLG_OFF) {
 			const MAX_FILTER_POS = 100;
 			const MIN_FILTER_POS = 0;
+
 			if (setCode === g_hidSudObj.pgDown[g_stateObj.appearance][g_stateObj.reverse]) {
-				changeAppearanceFilter(Math.min(g_hidSudObj.filterPos + 1, MAX_FILTER_POS));
+				keyIsShift()
+					? changeAppearanceBar(g_hidSudObj.filterPos, 2)
+					: changeAppearanceFilter(Math.min(g_hidSudObj.filterPos + 1, MAX_FILTER_POS));
 			} else if (setCode === g_hidSudObj.pgUp[g_stateObj.appearance][g_stateObj.reverse]) {
-				changeAppearanceFilter(Math.max(g_hidSudObj.filterPos - 1, MIN_FILTER_POS));
+				keyIsShift()
+					? changeAppearanceBar(g_hidSudObj.filterPos, -2)
+					: changeAppearanceFilter(Math.max(g_hidSudObj.filterPos - 1, MIN_FILTER_POS));
 			}
 		}
 		return blockCode(setCode);
@@ -13374,12 +13396,61 @@ const makeStepZone = (_j, _keyCtrlPtn) => {
 	}
 };
 
+/**
+ * フィルターバーの対象表示変更
+ * @param {number} _num 
+ * @param {number} _dirPlus 
+ */
+const changeAppearanceBar = (_num = 10, _dirPlus = 2) => {
+	if (_dirPlus !== 0) {
+		const step = Math.trunc(_dirPlus / 2) * 2;
+		g_workObj.aprFilterCnt = nextPos(g_workObj.aprFilterCnt, step, g_stateObj.layerNum);
+	}
+	changeAppearanceFilter(_num);
+
+	// フィルターバーを使用するオプションのみ以下を適用
+	if (g_appearanceRanges.includes(g_stateObj.appearance) && g_stateObj.d_filterline === C_FLG_ON) {
+
+		// 階層が多い場合はShift+pgUp/pgDownで表示する階層グループを切り替え
+		const topNum = g_hidSudObj[g_stateObj.appearance];
+		const bottomNum = (g_hidSudObj[g_stateObj.appearance] + 1) % 2;
+
+		for (let j = 0; j < g_stateObj.layerNum; j += 2) {
+			[`${topNum + j}`, `${bottomNum + j}`].forEach(type => {
+				const displayState = (j === g_workObj.aprFilterCnt ? C_DIS_INHERIT : C_DIS_NONE);
+				$id(`filterBar${type}`).display = displayState;
+
+				if (![`Default`, `Halfway`].includes(g_stateObj.stepArea)) {
+					$id(`filterBar${type}_HS`).display = displayState;
+				}
+			});
+		}
+
+		// スクロールが1種類でHidden+/Sudden+の場合、対面のフィルターバーは不要なため非表示にする
+		const baseLayer = g_workObj.aprFilterCnt;
+		const dividePosPart = g_workObj.dividePos.filter(v => Math.floor(v / 2) === g_workObj.aprFilterCnt / 2);
+		const currentBarNum = g_hidSudObj.std[g_stateObj.appearance][
+			dividePosPart.length > 0
+				? dividePosPart[0] % 2 === 0 ? C_FLG_OFF : C_FLG_ON
+				: g_stateObj.reverse
+		];
+
+		if (g_stateObj.appearance !== `Hid&Sud+`
+			&& dividePosPart.length > 0
+			&& dividePosPart.every(v => v % 2 === dividePosPart[0] % 2)) {
+			$id(`filterBar${(currentBarNum + 1) % 2 + baseLayer}`).display = C_DIS_NONE;
+			if (![`Default`, `Halfway`].includes(g_stateObj.stepArea)) {
+				$id(`filterBar${(currentBarNum + 1) % 2 + baseLayer}_HS`).display = C_DIS_NONE;
+			}
+		}
+	}
+}
+
 /**
  * アルファマスクの再描画 (Appearance: Hidden+, Sudden+ 用)
  * @param {number} _num 
- * @param {boolean} _shiftFlg シフトキーを押したかどうかのフラグ
  */
-const changeAppearanceFilter = (_num = 10, _shiftFlg = keyIsShift()) => {
+const changeAppearanceFilter = (_num = 10) => {
 	const MAX_FILTER_POS = 100;
 	const topNum = g_hidSudObj[g_stateObj.appearance];
 	const bottomNum = (g_hidSudObj[g_stateObj.appearance] + 1) % 2;
@@ -13408,35 +13479,18 @@ const changeAppearanceFilter = (_num = 10, _shiftFlg = keyIsShift()) => {
 			$id(`filterBar${bottomNum + j}_HS`).top = wUnit(parseFloat($id(`arrowSprite${j}`).top) + bottomDist);
 			$id(`filterBar${topNum + j}_HS`).top = wUnit(parseFloat($id(`arrowSprite${j + 1}`).top) + topDist);
 		}
-
-		// 階層が多い場合はShift+pgUp/pgDownで表示する階層グループを切り替え
-		if (_shiftFlg && g_stateObj.d_filterline === C_FLG_ON) {
-			[`${topNum + j}`, `${bottomNum + j}`].forEach(type => {
-				const displayState = (j === g_workObj.aprFilterCnt ? C_DIS_INHERIT : C_DIS_NONE);
-				$id(`filterBar${type}`).display = displayState;
-
-				if (![`Default`, `Halfway`].includes(g_stateObj.stepArea)) {
-					$id(`filterBar${type}_HS`).display = displayState;
-				}
-			});
-		}
-	}
-
-	if (_shiftFlg) {
-		g_workObj.aprFilterCnt = nextPos(g_workObj.aprFilterCnt, 2, g_stateObj.layerNum);
 	}
 
+	// フィルターバーのパーセント表示（フィルターバーが複数表示されるなど複雑なため、最初の階層グループの位置に追従）
 	if (g_appearanceRanges.includes(g_stateObj.appearance)) {
-		$id(`filterView`).top =
-			$id(`filterBar${(g_hidSudObj.std[g_stateObj.appearance][g_stateObj.reverse]) % 2}`).top;
+		const currentBarNum = g_hidSudObj.std[g_stateObj.appearance][g_stateObj.reverse];
+		$id(`filterView`).top = $id(`filterBar${currentBarNum % 2}`).top;
 		filterView.textContent = `${_num}%`;
-
-		// スクロールが1種類でHidden+/Sudden+の場合、対面のフィルターバーは不要なため非表示にする
-		if (g_stateObj.appearance !== `Hid&Sud+` && g_workObj.dividePos.every(v => v === g_workObj.dividePos[0])) {
-			$id(`filterBar${(g_hidSudObj.std[g_stateObj.appearance][g_stateObj.reverse] + 1) % 2}`).display = C_DIS_NONE;
-		}
 		g_hidSudObj.filterPos = _num;
 	}
+
+	// ユーザカスタムイベント(アルファマスクの再描画)
+	g_customJsObj.appearanceFilter.forEach(func => func(topNum, bottomNum));
 };
 
 /**

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/02/18 (v44.2.0)
+ * Revised : 2026/02/21 (v44.4.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -4577,6 +4577,8 @@ const g_customJsObj = {
     dummyArrow: [],
     dummyFrz: [],
 
+    appearanceFilter: [],
+
     judg_ii: [],
     judg_shakin: [],
     judg_matari: [],

package/package.json

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