danoniplus 34.3.2 → 34.4.1

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2023/10/21
+ * Revised : 2023/10/31
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 34.3.2`;
-const g_revisedDate = `2023/10/21`;
+const g_version = `Ver 34.4.1`;
+const g_revisedDate = `2023/10/31`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -536,6 +536,21 @@ 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 
@@ -551,7 +566,7 @@ const commonKeyDown = (_evt, _displayName, _func = _code => { }, _dfEvtFlg) => {
 	if (_evt.repeat && (g_unrepeatObj.page.includes(_displayName) || g_unrepeatObj.key.includes(setCode))) {
 		return blockCode(setCode);
 	}
-	g_inputKeyBuffer[setCode] = true;
+	switchKeyHit(_evt, true);
 
 	// 対象ボタンを検索
 	const scLists = Object.keys(g_shortcutObj[_displayName]).filter(keys => {
@@ -562,7 +577,7 @@ const commonKeyDown = (_evt, _displayName, _func = _code => { }, _dfEvtFlg) => {
 	if (scLists.length > 0) {
 		// リンク先にジャンプする場合はonkeyUpイベントが動かないため、事前にキー状態をリセット
 		if (g_shortcutObj[_displayName][scLists[0]].reset) {
-			g_inputKeyBuffer[setCode] = false;
+			switchKeyHit(_evt);
 		}
 		// 対象ボタン処理を実行
 		const targetId = document.getElementById(g_shortcutObj[_displayName][scLists[0]].id);
@@ -571,7 +586,7 @@ const commonKeyDown = (_evt, _displayName, _func = _code => { }, _dfEvtFlg) => {
 		}
 		return blockCode(setCode);
 	}
-	_func(setCode);
+	_func(setCode, _evt.key);
 	return blockCode(setCode);
 };
 
@@ -3890,7 +3905,21 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
 		g_keyObj[`minWidth${newKey}`] = _dosObj[`minWidth${newKey}`] ?? g_keyObj[`minWidth${newKey}`] ?? g_keyObj.minWidthDefault;
 
 		// キーコンフィグ (keyCtrlX_Y)
-		g_keyObj.minPatterns = newKeyMultiParam(newKey, `keyCtrl`, toKeyCtrlArray, { errCd: `E_0104`, baseCopyFlg: true });
+		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)
 		newKeyMultiParam(newKey, `chara`, toString);
@@ -6216,8 +6245,8 @@ const keyConfigInit = (_kcType = g_kcType) => {
 					g_keycons.cursorNum = g_keycons.cursorNumList.findIndex(val => val === g_currentj);
 					setKeyConfigCursor();
 				}, {
-					x: keyconX, y: 50 + C_KYC_REPHEIGHT * k + keyconY,
-					w: C_ARW_WIDTH, h: C_KYC_REPHEIGHT, siz: g_limitObj.keySetSiz,
+					x: keyconX - 5, y: 50 + C_KYC_REPHEIGHT * k + keyconY,
+					w: C_ARW_WIDTH + 10, h: C_KYC_REPHEIGHT, siz: g_limitObj.keySetSiz,
 				}, g_cssObj.button_Default_NoColor, g_cssObj.title_base)
 			);
 
@@ -6726,9 +6755,14 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	);
 
 	// キーボード押下時処理
-	setShortcutEvent(g_currentPage, setCode => {
+	setShortcutEvent(g_currentPage, (kbCode, kbKey) => {
 		const keyCdObj = document.querySelector(`#keycon${g_currentj}_${g_currentk}`);
-		let setKey = g_kCdN.findIndex(kCd => kCd === setCode);
+		let setKey = g_kCdN.findIndex(kCd => kCd === kbCode);
+
+		// 右シフトキー対応
+		if (setKey === g_kCdObj.unknown && kbKey === `Shift`) {
+			setKey = g_kCdObj.shiftRAltKey;
+		}
 
 		// 全角切替、BackSpace、Deleteキー、Escキーは割り当て禁止
 		// また、直前と同じキーを押した場合(BackSpaceを除く)はキー操作を無効にする
@@ -8381,11 +8415,12 @@ const pushColors = (_header, _frame, _val, _colorCd, _allFlg) => {
 			const ctype = (targetj >= 10 ? `Hit` : `Normal`) + (targetj % 2 === 0 ? `` : `Bar`);
 			const colorPos = Math.ceil((targetj % 10 - 1) / 2);
 
-			g_keyObj[`color${tkObj.keyCtrlPtn}`].filter(cpattern => colorPos === cpattern)
-				.forEach((cpattern, k) => {
+			g_keyObj[`color${tkObj.keyCtrlPtn}`].forEach((cpattern, k) => {
+				if (colorPos === cpattern) {
 					initialize(baseHeader + ctype);
 					pushColor(baseHeader + ctype, k + addAll);
-				});
+				}
+			});
 		});
 	}
 
@@ -8501,6 +8536,13 @@ 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;
 		}
 	}
@@ -9091,11 +9133,12 @@ const mainInit = _ => {
 	 */
 	const mainKeyDownActFunc = {
 
-		OFF: (_keyCode) => {
+		OFF: (_code, _key) => {
+			const convCode = (_code === `` ? (_key === `Shift` ? g_kCdNameObj.shiftRKey : g_kCdNameObj.unknownKey) : _code);
 			const matchKeys = g_workObj.keyCtrlN;
 
 			for (let j = 0; j < keyNum; j++) {
-				matchKeys[j].filter((key, k) => _keyCode === key && !g_workObj.keyHitFlg[j][k] && !g_judgObj.lockFlgs[j])
+				matchKeys[j].filter((key, k) => convCode === key && !g_workObj.keyHitFlg[j][k] && !g_judgObj.lockFlgs[j])
 					.forEach(() => {
 						g_judgObj.lockFlgs[j] = true;
 						judgeArrow(j);
@@ -9115,9 +9158,8 @@ const mainInit = _ => {
 		if (evt.repeat && !g_mainRepeatObj.key.includes(setCode)) {
 			return blockCode(setCode);
 		}
-
-		g_inputKeyBuffer[setCode] = true;
-		mainKeyDownActFunc[g_stateObj.autoAll](setCode);
+		switchKeyHit(evt, true);
+		mainKeyDownActFunc[g_stateObj.autoAll](setCode, evt.key);
 
 		// 曲中リトライ、タイトルバック
 		if (setCode === g_kCdN[g_headerObj.keyRetry]) {
@@ -9178,8 +9220,7 @@ const mainInit = _ => {
 	};
 
 	document.onkeyup = evt => {
-		const setCode = evt.code;
-		g_inputKeyBuffer[setCode] = false;
+		switchKeyHit(evt);
 		mainKeyUpActFunc[g_stateObj.autoAll]();
 	};
 

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2023/10/01 (v34.2.0)
+ * Revised : 2023/10/31 (v34.4.1)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -112,7 +112,7 @@ const g_limitObj = {
     titleSiz: 32,
     mainSiz: 14,
     musicTitleSiz: 13,
-    keySetSiz: 16,
+    keySetSiz: 15,
 };
 
 /** 設定項目の位置 */
@@ -1234,6 +1234,8 @@ g_kCd[240] = `CapsLk`;
 g_kCd[256] = `R)Shift`;
 g_kCd[257] = `R)Ctrl`;
 g_kCd[258] = `R)Alt`;
+g_kCd[259] = `Window`;
+g_kCd[260] = `R-Shift`;
 
 // 従来のキーコードとの変換用
 g_kCdN[0] = `- - -`; // 無効値
@@ -1352,12 +1354,20 @@ g_kCdN[256] = `ShiftRight`;
 g_kCdN[257] = `ControlRight`;
 g_kCdN[258] = `AltRight`;
 g_kCdN[259] = `MetaRight`;
+g_kCdN[260] = ``;
 
 const g_kCdNameObj = {
     shiftLKey: `ShiftLeft`,
     shiftRKey: `ShiftRight`,
     metaLKey: `MetaLeft`,
     metaRKey: `MetaRight`,
+    unknownKey: `Unknown`,
+};
+
+const g_kCdObj = {
+    unknown: 1,
+    shiftRkey: 256,
+    shiftRAltKey: 260,
 };
 
 // 画面別ショートカット

package/package.json

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