danoniplus 27.7.0 → 28.0.0

package/README.md

@@ -90,16 +90,26 @@ If you would like to cooperate with the development, please see below. Even if y
 ## Community / コミュニティ
 - [Dancing☆Onigiri Discordサーバー](https://discord.gg/TegbHFY7zg)
 - [得点報告用Gitter](https://gitter.im/danonicw/freeboard)
-- [Twitter #danoni](https://twitter.com/search?q=%23danoni%20OR%20%22%E3%83%80%E3%83%B3%E3%81%8A%E3%81%AB%E3%81%A3%E3%81%9F%E3%83%BC%22&src=typed_query&f=live)
+- [Twitter #danoni](https://twitter.com/search?q=%23danoni&src=typed_query&f=live)
 
-## Related Tools Repository / 関連ツール
+## Related Tools Repository / 関連リポジトリ・ツール
+### Dancing☆Onigiri
 - [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
-- [Dancing☆Onigiri Chart Reverser](https://github.com/cwtickle/danoniplus-reverser)
-- [Dancing☆Onigiri Chart Converter](https://github.com/cwtickle/danoniplus-converter)
+- [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
+
+### キリズマ
 - [キリズマ譜面データ変換機](https://github.com/suzme/kirizma-converter) @suzme
+- [キリズマ歌詞表示作成ツール](https://github.com/prlg25/kirizma_lyric) @prlg25
+- [キリズマ難易度表](https://github.com/suzme/kirizma) @suzme
+
+### Punching◇Panels
+- [Punching◇Panels](https://github.com/cwtickle/punching-panels) @cwtickle
+- [Punching◇Panels エディター](https://github.com/suzme/punpane-editor) @suzme
+- [Punching◇Panels 難易度表](https://github.com/suzme/punpane) @suzme
 
 ## License / ライセンス
 This software is released under the MIT License, see LICENSE.  

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2022/07/01
+ * Revised : 2022/08/21
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 27.7.0`;
-const g_revisedDate = `2022/07/01`;
+const g_version = `Ver 28.0.0`;
+const g_revisedDate = `2022/08/21`;
 const g_alphaVersion = ``;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -365,7 +365,7 @@ const makeDedupliArray = (_array1, ..._arrays) =>
  * @param {array2} _array2d 
  * @returns 
  */
-const copyArray2d = _array2d => JSON.parse(JSON.stringify(_array2d));
+const copyArray2d = _array2d => structuredClone(_array2d);
 
 /**
  * 配列データを合計
@@ -4224,7 +4224,7 @@ const createOptionWindow = _sprite => {
 	// 速度(Speed)
 	// 縦位置: 2  短縮ショートカットあり
 	createGeneralSetting(spriteList.speed, `speed`, {
-		skipTerms: [20, 5, 1], hiddenBtn: true, scLabel: g_lblNameObj.sc_speed, roundNum: 5,
+		skipTerms: g_settings.speedTerms, hiddenBtn: true, scLabel: g_lblNameObj.sc_speed, roundNum: 5,
 		unitName: ` ${g_lblNameObj.multi}`,
 	});
 
@@ -4259,45 +4259,59 @@ const createOptionWindow = _sprite => {
 	if (g_headerObj.scoreDetailUse) {
 		spriteList.speed.appendChild(
 			createCss2Button(`btnGraph`, `i`, _ => true, {
-				x: 415, y: 0, w: 23, h: 23, siz: C_SIZ_JDGCNTS, title: g_msgObj.graph,
+				x: -25, y: -60, w: 30, h: 30, siz: C_SIZ_JDGCHARA, title: g_msgObj.graph,
 				resetFunc: _ => setScoreDetail(), cxtFunc: _ => setScoreDetail(),
 			}, g_cssObj.button_Mini)
 		);
 		g_stateObj.scoreDetailViewFlg = false;
 		const scoreDetail = createEmptySprite(optionsprite, `scoreDetail`, g_windowObj.scoreDetail, g_cssObj.settings_DifSelector);
-		const viewScText = _ => createScText(lnkScoreDetail, `ScoreDetail`, { targetLabel: `lnkScoreDetail`, x: -10 });
 
 		/**
 		 * 譜面明細表示の切替
 		 * @param {number} _val 
 		 */
-		const changeScoreDetail = (_val = 1) => {
+		const changeScoreDetail = (_val = 0) => {
+			if (g_currentPage === `difSelector`) {
+				resetDifWindow();
+			}
 			g_stateObj.scoreDetailViewFlg = true;
 			scoreDetail.style.visibility = `visible`;
+
+			// 表示内容を非表示化、ボタン色をデフォルトに戻す
 			$id(`detail${g_stateObj.scoreDetail}`).visibility = `hidden`;
-			setSetting(_val, `scoreDetail`);
-			viewScText();
+			document.getElementById(`lnk${g_stateObj.scoreDetail}G`).classList.replace(g_cssObj.button_Setting, g_cssObj.button_Default);
+
+			// 選択先を表示、ボタン色を選択中に変更
+			// Qキーを押したときのリンク先を次の明細へ変更
+			g_stateObj.scoreDetail = g_settings.scoreDetails[_val];
+			[`option`, `difSelector`].forEach(page => g_shortcutObj[page].KeyQ.id = g_settings.scoreDetailCursors[(_val + 1) % g_settings.scoreDetailCursors.length]);
+
 			$id(`detail${g_stateObj.scoreDetail}`).visibility = `visible`;
+			document.getElementById(`lnk${g_stateObj.scoreDetail}G`).classList.replace(g_cssObj.button_Default, g_cssObj.button_Setting);
 		};
 
 		multiAppend(scoreDetail,
 			createScoreDetail(`Speed`),
 			createScoreDetail(`Density`),
 			createScoreDetail(`ToolDif`, false),
-			makeSettingLblCssButton(`lnkScoreDetailB`, `- - -`, 0, _ => changeScoreDetail(-1),
-				g_lblPosObj.lnkScoreDetailB, g_cssObj.button_RevON),
-			makeSettingLblCssButton(`lnkScoreDetail`, `${getStgDetailName(g_stateObj.scoreDetail)}`, 0, _ => changeScoreDetail(),
-				Object.assign(g_lblPosObj.lnkScoreDetail, {
-					cxtFunc: _ => changeScoreDetail(-1),
-				}), g_cssObj.button_RevON),
 		);
-		viewScText();
+		g_settings.scoreDetails.forEach((sd, j) => {
+			scoreDetail.appendChild(
+				makeDifLblCssButton(`lnk${sd}G`, getStgDetailName(sd), j, _ => changeScoreDetail(j), { w: C_LEN_DIFCOVER_WIDTH, btnStyle: (g_stateObj.scoreDetail === sd ? `Setting` : `Default`) })
+			);
+			createScText(document.getElementById(`lnk${sd}G`), `${sd}G`, { targetLabel: `lnk${sd}G`, x: -10 });
+		});
 	}
 
 	/**
 	 * 譜面明細表示／非表示ボタンの処理
 	 */
 	const setScoreDetail = _ => {
+		if (g_currentPage === `difSelector`) {
+			resetDifWindow();
+			g_stateObj.scoreDetailViewFlg = false;
+			g_shortcutObj.difSelector.KeyQ.id = g_settings.scoreDetailCursors[0];
+		}
 		const scoreDetail = document.querySelector(`#scoreDetail`);
 		const detailObj = document.querySelector(`#detail${g_stateObj.scoreDetail}`);
 		const visibles = [`hidden`, `visible`];
@@ -4305,6 +4319,9 @@ const createOptionWindow = _sprite => {
 		g_stateObj.scoreDetailViewFlg = !g_stateObj.scoreDetailViewFlg;
 		scoreDetail.style.visibility = visibles[Number(g_stateObj.scoreDetailViewFlg)];
 		detailObj.style.visibility = visibles[Number(g_stateObj.scoreDetailViewFlg)];
+
+		// Qキーを押したときのカーソル位置を先頭に初期化
+		g_shortcutObj.option.KeyQ.id = g_settings.scoreDetailCursors[0];
 	};
 
 	/**
@@ -4381,7 +4398,7 @@ const createOptionWindow = _sprite => {
 			context.font = `${C_SIZ_DIFSELECTOR}px ${getBasicFont()}`;
 			context.fillText(speedType, lineX + 35, 218);
 
-			updateScoreDetailLabel(`Speed`, g_lblNameObj[`s_${speedType}`], speedObj[speedType].cnt, j);
+			updateScoreDetailLabel(`Speed`, `${speedType}S`, speedObj[speedType].cnt, j, g_lblNameObj[`s_${speedType}`]);
 		});
 	};
 
@@ -4421,10 +4438,10 @@ const createOptionWindow = _sprite => {
 		});
 
 		const obj = getScoreBaseData(_scoreId);
-		updateScoreDetailLabel(`Density`, g_lblNameObj.s_apm, obj.apm, 0);
-		updateScoreDetailLabel(`Density`, g_lblNameObj.s_time, obj.playingTime, 1);
-		updateScoreDetailLabel(`Density`, g_lblNameObj.s_arrow, obj.arrowCnts, 3);
-		updateScoreDetailLabel(`Density`, g_lblNameObj.s_frz, obj.frzCnts, 4);
+		updateScoreDetailLabel(`Density`, `APM`, obj.apm, 0, g_lblNameObj.s_apm);
+		updateScoreDetailLabel(`Density`, `Time`, obj.playingTime, 1, g_lblNameObj.s_time);
+		updateScoreDetailLabel(`Density`, `Arrow`, obj.arrowCnts, 3, g_lblNameObj.s_arrow);
+		updateScoreDetailLabel(`Density`, `Frz`, obj.frzCnts, 4, g_lblNameObj.s_frz);
 	};
 
 	/**
@@ -4439,7 +4456,7 @@ const createOptionWindow = _sprite => {
 		const baseLabel = (_bLabel, _bLabelname, _bAlign) =>
 			document.querySelector(`#detail${_name}`).appendChild(
 				createDivCss2Label(`${_bLabel}`, `${_bLabelname}`, {
-					x: 10, y: 65 + _pos * 20, w: 100, h: 20, siz: C_SIZ_DIFSELECTOR, align: _bAlign,
+					x: 10, y: 105 + _pos * 20, w: 100, h: 20, siz: C_SIZ_DIFSELECTOR, align: _bAlign,
 				})
 			);
 		if (document.querySelector(`#data${_label}`) === null) {
@@ -4544,7 +4561,7 @@ const createOptionWindow = _sprite => {
 			makeDifInfoLabel(`dataArrowInfo`, ``, g_lblPosObj.dataArrowInfo),
 			makeDifInfoLabel(`lblArrowInfo2`, ``, g_lblPosObj.lblArrowInfo2),
 			makeDifInfoLabel(`dataArrowInfo2`, ``, g_lblPosObj.dataArrowInfo2),
-			makeSettingLblCssButton(`lnkDifInfo`, g_lblNameObj.s_print, 0, _ => {
+			makeDifLblCssButton(`lnkDifInfo`, g_lblNameObj.s_print, 8, _ => {
 				copyTextToClipboard(
 					`****** ${g_lblNameObj.s_printTitle} [${g_version}] ******\r\n\r\n`
 					+ `\t${g_lblNameObj.s_printHeader}\r\n\r\n${printData}`, g_msgInfoObj.I_0003
@@ -4814,7 +4831,7 @@ const createOptionWindow = _sprite => {
 	// タイミング調整 (Adjustment)
 	// 縦位置: 10  短縮ショートカットあり
 	createGeneralSetting(spriteList.adjustment, `adjustment`, {
-		skipTerms: [50, 10, 5], hiddenBtn: true, scLabel: g_lblNameObj.sc_adjustment, roundNum: 5,
+		skipTerms: g_settings.adjustmentTerms, hiddenBtn: true, scLabel: g_lblNameObj.sc_adjustment, roundNum: 5,
 		unitName: g_lblNameObj.frame,
 	});
 

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2022/07/01 (v27.7.0)
+ * Revised : 2022/08/21 (v28.0.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -171,13 +171,6 @@ const updateWindowSiz = _ => {
         },
 
         /** 設定: 譜面明細子画面 */
-        lnkScoreDetailB: {
-            x: 10, w: 100, visibility: `hidden`,
-        },
-        lnkScoreDetail: {
-            x: 10, w: 100, borderStyle: `solid`,
-        },
-
         lblTooldif: {
             y: 5, w: 250, siz: C_SIZ_JDGCNTS,
         },
@@ -207,7 +200,7 @@ const updateWindowSiz = _ => {
             x: 140, y: 70, w: 275, h: 150, overflow: `auto`,
         },
         lnkDifInfo: {
-            x: 10, y: 30, w: 100, borderStyle: `solid`,
+            w: C_LEN_DIFCOVER_WIDTH, borderStyle: `solid`,
         },
 
         /** ディスプレイ画面 */
@@ -750,6 +743,7 @@ let g_appearanceRanges = [`Hidden+`, `Sudden+`, `Hid&Sud+`];
 const g_settings = {
     speeds: [...Array((C_MAX_SPEED - C_MIN_SPEED) * 20 + 1).keys()].map(i => C_MIN_SPEED + i / 20),
     speedNum: 0,
+    speedTerms: [20, 5, 1],
 
     motions: [C_FLG_OFF, `Boost`, `Brake`],
     motionNum: 0,
@@ -771,6 +765,7 @@ const g_settings = {
 
     adjustments: [...Array(C_MAX_ADJUSTMENT * 20 + 1).keys()].map(i => (i - C_MAX_ADJUSTMENT * 10) / 10),
     adjustmentNum: C_MAX_ADJUSTMENT * 10,
+    adjustmentTerms: (g_isFile ? [50, 10, 1] : [50, 10, 5]),
 
     volumes: [0, 0.5, 1, 2, 5, 10, 25, 50, 75, 100],
 
@@ -783,11 +778,13 @@ const g_settings = {
     opacitys: [10, 25, 50, 75, 100],
 
     scoreDetails: [`Speed`, `Density`, `ToolDif`],
-    scoreDetailNum: 0,
+    scoreDetailCursors: [],
 };
 
 g_settings.volumeNum = g_settings.volumes.length - 1;
 g_settings.opacityNum = g_settings.opacitys.length - 1;
+g_settings.scoreDetailCursors = g_settings.scoreDetails.map(val => `lnk${val}G`);
+g_settings.scoreDetailCursors.push(`btnGraph`);
 
 /**
  * 設定画面間移動
@@ -1192,8 +1189,13 @@ const g_shortcutObj = {
         KeyV: { id: `lnkVolumeR` },
 
         KeyI: { id: `btnGraph` },
-        ShiftLeft_KeyQ: { id: `lnkScoreDetailB` },
-        KeyQ: { id: `lnkScoreDetail` },
+        Digit1: { id: `lnkSpeedG` },
+        Digit2: { id: `lnkDensityG` },
+        Digit3: { id: `lnkToolDifG` },
+        Numpad1: { id: `lnkSpeedG` },
+        Numpad2: { id: `lnkDensityG` },
+        Numpad3: { id: `lnkToolDifG` },
+        KeyQ: { id: `lnkSpeedG` },
         KeyP: { id: `lnkDifInfo` },
         KeyZ: { id: `btnSave` },
 
@@ -1212,6 +1214,16 @@ const g_shortcutObj = {
         ArrowDown: { id: `btnDifD` },
         ArrowUp: { id: `btnDifU` },
 
+        KeyI: { id: `btnGraph` },
+        Digit1: { id: `lnkSpeedG` },
+        Digit2: { id: `lnkDensityG` },
+        Digit3: { id: `lnkToolDifG` },
+        Numpad1: { id: `lnkSpeedG` },
+        Numpad2: { id: `lnkDensityG` },
+        Numpad3: { id: `lnkToolDifG` },
+        KeyQ: { id: `lnkSpeedG` },
+        KeyP: { id: `lnkDifInfo` },
+
         Escape: { id: `btnBack` },
         Space: { id: `btnKeyConfig` },
         Enter: { id: `lnkDifficulty` },

package/package.json

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