danoniplus 34.4.2 → 34.5.1

package/css/danoni_main.css

@@ -4,7 +4,7 @@
   本体cssファイル
 
   Created : 2018/10/08
-  Revised : 2023/08/20 (v33.2.0)
+  Revised : 2023/11/05 (v34.5.0)
 
   https://github.com/cwtickle/danoniplus
 ------------------------------------------ */
@@ -475,6 +475,15 @@ input[type="color"] {
 	color: var(--settings-lifeVal-x, #ff9966);
 }
 
+/* 設定画面：レーンごとの矢印数 */
+.settings_maxArrowCnts {
+	color: var(--settings-maxArrowCnts-x, var(--common-uwan));
+}
+
+.settings_minArrowCnts {
+	color: var(--settings-maxArrowCnts-x, var(--common-ii));
+}
+
 /* キーコンフィグ */
 .keyconfig_warning {
 	color: var(--keyconfig-warning-x, #ffff99);

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2023/11/03
+ * Revised : 2023/11/05
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 34.4.2`;
-const g_revisedDate = `2023/11/03`;
+const g_version = `Ver 34.5.1`;
+const g_revisedDate = `2023/11/05`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -431,13 +431,12 @@ const padArray = (_array, _baseArray) => {
  * @param {number} _num
  */
 const getMaxValIdxs = (_array, _num = 1) => {
-	const getMaxVal = (_a, _b) => Math.max(_a, _b);
 	let baseArray = _array.concat();
 	const maxIdxs = [];
 
 	for (let j = 0; j < _num; j++) {
 		maxIdxs[j] = [];
-		const maxVal = baseArray.reduce((a, b) => getMaxVal(a, b));
+		const maxVal = baseArray.reduce((a, b) => Math.max(a, b));
 		_array.map((val, idx) => {
 			if (val === maxVal) {
 				maxIdxs[j].push(idx);
@@ -516,13 +515,14 @@ const nextPos = (_basePos, _num, _length) => (_basePos + _num + _length) % _leng
 
 /**
  * 特定キーコードを置換する処理
- * @param {string} _setCode 
+ * @param {object} _evt 
  */
-const transCode = _setCode => {
-	if ([`Control`, `Shift`, `Alt`].includes(_setCode.slice(0, -5))) {
-		return _setCode.replaceAll(`Right`, `Left`);
+const transCode = _evt => {
+	const evtCode = _evt.code;
+	if (evtCode === `` && _evt.key === `Shift`) {
+		return `ShiftRight`;
 	}
-	return _setCode;
+	return evtCode;
 };
 
 /**
@@ -536,21 +536,6 @@ const blockCode = _setCode => !C_BLOCK_KEYS.includes(_setCode);
 /* ショートカット制御                                          */
 /*-----------------------------------------------------------*/
 
-/**
- * キーを押した状態を格納
- * (KeyboardEvent.codeが空のときは、別キーとして扱う)
- * @param {object} _evt 
- * @param {boolean} _keyHitFlg 
- */
-const switchKeyHit = (_evt, _keyHitFlg = false) => {
-	if (_evt.code === ``) {
-		g_inputKeyBuffer[''] = false;
-		g_inputKeyBuffer[_evt.key === `Shift` ? g_kCdNameObj.shiftRKey : g_kCdNameObj.unknownKey] = _keyHitFlg;
-	} else {
-		g_inputKeyBuffer[_evt.code] = _keyHitFlg;
-	}
-}
-
 /**
  * キーを押したときの動作（汎用）
  * @param {object} _evt 
@@ -562,11 +547,11 @@ const commonKeyDown = (_evt, _displayName, _func = _code => { }, _dfEvtFlg) => {
 	if (!_dfEvtFlg) {
 		_evt.preventDefault();
 	}
-	const setCode = _evt.code;
+	const setCode = transCode(_evt);
 	if (_evt.repeat && (g_unrepeatObj.page.includes(_displayName) || g_unrepeatObj.key.includes(setCode))) {
 		return blockCode(setCode);
 	}
-	switchKeyHit(_evt, true);
+	g_inputKeyBuffer[setCode] = true;
 
 	// 対象ボタンを検索
 	const scLists = Object.keys(g_shortcutObj[_displayName])
@@ -574,7 +559,7 @@ const commonKeyDown = (_evt, _displayName, _func = _code => { }, _dfEvtFlg) => {
 	if (scLists.length > 0) {
 		// リンク先にジャンプする場合はonkeyUpイベントが動かないため、事前にキー状態をリセット
 		if (g_shortcutObj[_displayName][scLists[0]].reset) {
-			switchKeyHit(_evt);
+			g_inputKeyBuffer[setCode] = false;
 		}
 		// 対象ボタン処理を実行
 		const targetId = document.getElementById(g_shortcutObj[_displayName][scLists[0]].id);
@@ -583,7 +568,7 @@ const commonKeyDown = (_evt, _displayName, _func = _code => { }, _dfEvtFlg) => {
 		}
 		return blockCode(setCode);
 	}
-	_func(setCode, _evt.key);
+	_func(setCode);
 	return blockCode(setCode);
 };
 
@@ -594,7 +579,7 @@ const commonKeyDown = (_evt, _displayName, _func = _code => { }, _dfEvtFlg) => {
 const commonKeyUp = _evt => {
 	g_inputKeyBuffer[g_kCdNameObj.metaLKey] = false;
 	g_inputKeyBuffer[g_kCdNameObj.metaRKey] = false;
-	switchKeyHit(_evt);
+	g_inputKeyBuffer[transCode(_evt)] = false;
 };
 
 /**
@@ -1387,7 +1372,7 @@ const resetKeyControl = _ => {
 	document.onkeyup = _ => { };
 	document.onkeydown = evt => {
 		evt.preventDefault();
-		return blockCode(evt.code);
+		return blockCode(transCode(evt));
 	};
 	g_inputKeyBuffer = {};
 };
@@ -2588,7 +2573,7 @@ const calcLevel = _scoreObj => {
 		// 3つ押し数
 		push3cnt: push3Cnt,
 		// 3つ押しリスト
-		push3: push3List,
+		push3: makeDedupliArray(push3List),
 	};
 };
 
@@ -3050,8 +3035,11 @@ const headerConvert = _dosObj => {
 
 	// 初期表示する部分キーの設定
 	obj.keyGroupOrder = [];
-	_dosObj.keyGroupOrder?.split(`$`).filter(val => val !== ``)
-		.forEach((val, j) => obj.keyGroupOrder[j] = val.split(`,`));
+	_dosObj.keyGroupOrder?.split(`$`).forEach((val, j) => {
+		if (val !== ``) {
+			obj.keyGroupOrder[j] = val.split(`,`);
+		}
+	});
 
 	// 最終演出表示有無（noneで無効化）
 	obj.finishView = _dosObj.finishView ?? ``;
@@ -3890,18 +3878,6 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 		// キーコンフィグ (keyCtrlX_Y)
 		g_keyObj.minPatterns = newKeyMultiParam(newKey, `keyCtrl`, toKeyCtrlArray, {
 			errCd: `E_0104`, baseCopyFlg: true,
-			loopFunc: (k, keyheader) => {
-				const addShiftRKey = (_pattern = ``) => {
-					const keyCtrls = g_keyObj[`${keyheader}_${k + dfPtnNum}${_pattern}`];
-					for (let j = 0; j < keyCtrls.length; j++) {
-						if (keyCtrls[j].includes(g_kCdObj.shiftRkey) && !keyCtrls[j].includes(g_kCdObj.shiftRAltKey)) {
-							keyCtrls[j].push(g_kCdObj.shiftRAltKey);
-						}
-					}
-				};
-				addShiftRKey();
-				addShiftRKey(`d`);
-			},
 		});
 
 		// 読込変数の接頭辞 (charaX_Y)
@@ -4886,7 +4862,7 @@ const makeDifInfo = _scoreId => {
 
 	const arrowCnts = sumData(g_detailObj.arrowCnt[_scoreId]);
 	const frzCnts = sumData(g_detailObj.frzCnt[_scoreId]);
-	const push3CntStr = (g_detailObj.toolDif[_scoreId].push3.length === 0 ? `None` : `(${g_detailObj.toolDif[_scoreId].push3})`);
+	const push3CntStr = (g_detailObj.toolDif[_scoreId].push3.length === 0 ? `None` : `(${g_detailObj.toolDif[_scoreId].push3.join(', ')})`);
 
 	if (document.getElementById(`lblTooldif`) === null) {
 		makeDifInfoLabels(_scoreId);
@@ -4894,12 +4870,40 @@ const makeDifInfo = _scoreId => {
 	dataTooldif.textContent = g_detailObj.toolDif[_scoreId].tool;
 	dataDouji.textContent = g_detailObj.toolDif[_scoreId].douji;
 	dataTate.textContent = g_detailObj.toolDif[_scoreId].tate;
-	lblArrowInfo2.innerHTML = g_lblNameObj.s_linecnts.split(`{0}`).join(g_detailObj.toolDif[_scoreId].push3cnt);
+	lblArrowInfo2.innerHTML = g_lblNameObj.s_linecnts.split(`{0}`)
+		.join(`${makeDedupliArray(g_detailObj.toolDif[_scoreId].push3).length} /cnt:${g_detailObj.toolDif[_scoreId].push3cnt}`);
 	dataArrowInfo.innerHTML = `${arrowCnts + frzCnts * (g_headerObj.frzStartjdgUse ? 2 : 1)} 
 	<span style="font-size:${wUnit(g_limitObj.difSelectorSiz)};">(${arrowCnts} + ${frzCnts}${g_headerObj.frzStartjdgUse ? ' <span class="common_bold">x 2</span>' : ''})</span>`;
-	dataArrowInfo2.innerHTML = `<br>(${g_detailObj.arrowCnt[_scoreId]})<br><br>
-			(${g_detailObj.frzCnt[_scoreId]})<br><br>
-			${push3CntStr}`.split(`,`).join(`/`);
+
+	const makeArrowCntsView = (_cntlist) => {
+		const targetKey = g_headerObj.keyLabels[_scoreId];
+		const cntlist = [
+			_cntlist.filter((val, j) =>
+				g_keyObj[`pos${targetKey}_0`][j] < g_keyObj[`div${targetKey}_0`]),
+			_cntlist.filter((val, j) =>
+				g_keyObj[`pos${targetKey}_0`][j] >= g_keyObj[`div${targetKey}_0`])
+		];
+
+		let cntlistStr = ``;
+		cntlist.filter(array => array.length > 0).forEach(array => {
+			const maxVal = array.reduce((a, b) => Math.max(a, b));
+			const minVal = array.reduce((a, b) => Math.min(a, b));
+
+			cntlistStr += `[ `;
+			array.forEach((val, j) => {
+				if (maxVal !== minVal) {
+					array[j] = (val === minVal ? `<span class="settings_minArrowCnts">${val}</span>` :
+						(val === maxVal ? `<span class="settings_maxArrowCnts common_bold">${val}</span>` : val));
+				}
+			});
+			cntlistStr += array.join(`, `) + ` ]`;
+		});
+
+		return cntlistStr;
+	}
+
+	dataArrowInfo2.innerHTML = `<br>${makeArrowCntsView(g_detailObj.arrowCnt[_scoreId])}<br><br>
+			${makeArrowCntsView(g_detailObj.frzCnt[_scoreId])}<br><br>${push3CntStr}`;
 };
 
 /**
@@ -6722,15 +6726,10 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	);
 
 	// キーボード押下時処理
-	setShortcutEvent(g_currentPage, (kbCode, kbKey) => {
+	setShortcutEvent(g_currentPage, (kbCode) => {
 		const keyCdObj = document.getElementById(`keycon${g_currentj}_${g_currentk}`);
 		let setKey = g_kCdN.findIndex(kCd => kCd === kbCode);
 
-		// 右シフトキー対応
-		if (setKey === g_kCdObj.unknown && kbKey === `Shift`) {
-			setKey = g_kCdObj.shiftRAltKey;
-		}
-
 		// 全角切替、BackSpace、Deleteキー、Escキーは割り当て禁止
 		// また、直前と同じキーを押した場合(BackSpaceを除く)はキー操作を無効にする
 		const disabledKeys = [240, 242, 243, 244, 91, 29, 28, 27, 259, g_prevKey];
@@ -8472,13 +8471,6 @@ const getArrowSettings = _ => {
 	for (let j = 0; j < g_workObj.keyCtrl.length; j++) {
 		for (let k = 0; k < g_workObj.keyCtrl[j].length; k++) {
 			g_workObj.keyCtrlN[j][k] = g_kCdN[g_workObj.keyCtrl[j][k]];
-
-			// 内部のキーコードにより、KeyboardEvent.codeの値を切り替え
-			if (g_workObj.keyCtrl[j][k] === g_kCdObj.unknown) {
-				g_workObj.keyCtrlN[j][k] = g_kCdNameObj.unknownKey;
-			} else if (g_workObj.keyCtrl[j][k] === g_kCdObj.shiftRAltKey) {
-				g_workObj.keyCtrlN[j][k] = g_kCdNameObj.shiftRKey;
-			}
 			g_workObj.keyHitFlg[j][k] = false;
 		}
 	}
@@ -9064,12 +9056,11 @@ const mainInit = _ => {
 	 */
 	const mainKeyDownActFunc = {
 
-		OFF: (_code, _key) => {
-			const convCode = _code || (_key === `Shift` ? g_kCdNameObj.shiftRKey : g_kCdNameObj.unknownKey);
+		OFF: (_code) => {
 			const matchKeys = g_workObj.keyCtrlN;
 
 			for (let j = 0; j < keyNum; j++) {
-				matchKeys[j].filter((key, k) => convCode === key && !g_workObj.keyHitFlg[j][k] && !g_judgObj.lockFlgs[j])
+				matchKeys[j].filter((key, k) => _code === key && !g_workObj.keyHitFlg[j][k] && !g_judgObj.lockFlgs[j])
 					.forEach(() => {
 						g_judgObj.lockFlgs[j] = true;
 						judgeArrow(j);
@@ -9078,19 +9069,19 @@ const mainInit = _ => {
 			}
 		},
 
-		ON: (_keyCode) => { },
+		ON: (_code) => { },
 	};
 
 	// キー操作イベント
 	document.onkeydown = evt => {
 		evt.preventDefault();
-		const setCode = evt.code;
+		const setCode = transCode(evt);
 
 		if (evt.repeat && !g_mainRepeatObj.key.includes(setCode)) {
 			return blockCode(setCode);
 		}
-		switchKeyHit(evt, true);
-		mainKeyDownActFunc[g_stateObj.autoAll](setCode, evt.key);
+		g_inputKeyBuffer[setCode] = true;
+		mainKeyDownActFunc[g_stateObj.autoAll](setCode);
 
 		// 曲中リトライ、タイトルバック
 		if (setCode === g_kCdN[g_headerObj.keyRetry]) {
@@ -9151,7 +9142,7 @@ const mainInit = _ => {
 	};
 
 	document.onkeyup = evt => {
-		switchKeyHit(evt);
+		g_inputKeyBuffer[transCode(evt)] = false;
 		mainKeyUpActFunc[g_stateObj.autoAll]();
 	};
 

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2023/10/31 (v34.4.1)
+ * Revised : 2023/11/05 (v34.5.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -176,9 +176,6 @@ const g_windowObj = {
     divRoot: { margin: `auto`, letterSpacing: `normal` },
     divBack: { background: `linear-gradient(#000000, #222222)` },
 
-    scoreDetail: { x: 20, y: 85, w: 420, h: 236, visibility: `hidden` },
-    detailObj: { w: 420, h: 230, visibility: `hidden` },
-
     colorPickSprite: { x: 0, y: 90, w: 50, h: 280 },
 };
 
@@ -191,6 +188,8 @@ const updateWindowSiz = _ => {
         difList: { x: 165, y: 60, w: 280, h: 261 + g_sHeight - 500, overflow: `auto` },
         difCover: { x: 25, y: 60, w: 140, h: 261 + g_sHeight - 500, overflow: `auto`, opacity: 0.95 },
         displaySprite: { x: 25, y: 30, w: (g_sWidth - 450) / 2, h: g_limitObj.setLblHeight * 5 },
+        scoreDetail: { x: 20, y: 85, w: (g_sWidth - 500) / 2 + 420, h: 236, visibility: `hidden` },
+        detailObj: { w: (g_sWidth - 500) / 2 + 420, h: 230, visibility: `hidden` },
         keyconSprite: { y: 88, h: g_sHeight, overflow: `auto` },
         loader: { y: g_sHeight - 10, h: 10, backgroundColor: `#333333` },
         playDataWindow: { x: g_sWidth / 2 - 225, y: 70, w: 450, h: 110 },
@@ -293,7 +292,7 @@ const updateWindowSiz = _ => {
             x: 130, y: 70, w: 200, h: 90,
         },
         dataArrowInfo2: {
-            x: 140, y: 70, w: 275, h: 150, overflow: `auto`,
+            x: 140, y: 70, w: (g_sWidth - 500) / 2 + 275, h: 150, overflow: `auto`,
         },
         lnkDifInfo: {
             w: g_limitObj.difCoverWidth, borderStyle: `solid`,

package/package.json

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