danoniplus 34.0.0 → 34.2.0

package/danoni/danoni3.html

@@ -105,8 +105,8 @@ a:hover  { color:#FF9900; text-decoration: underline; }
 　キーコンフィグ(KeyConfig)にてキーの変更が可能です。<br>
 <br>
 推奨ブラウザ：<br>
-　Google Chrome, Opera, Vivaldi などWebkit系ブラウザ<br>
-　(Microsoft Edge, IE, Firefoxは動作保証外です。将来的にはMicrosoft Edgeに対応予定)<br>
+　Google Chrome, Opera, Vivaldi, Microsoft Edge, Safari などWebkit系ブラウザ<br>
+　(IE及び、Firefoxのローカル起動は動作保証外です。)<br>
 <br>
 GitHub：<br>
 <a href="https://github.com/cwtickle/danoniplus">https://github.com/cwtickle/danoniplus</a><br>

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2023/09/24
+ * Revised : 2023/10/01
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 34.0.0`;
-const g_revisedDate = `2023/09/24`;
+const g_version = `Ver 34.2.0`;
+const g_revisedDate = `2023/10/01`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -368,6 +368,13 @@ const splitLF = _str => _str?.split(`\r`).join(`\n`).split(`\n`);
  */
 const splitLF2 = (_str, _delim = `$`) => splitLF(_str)?.filter(val => val !== ``).join(_delim).split(_delim);
 
+/**
+ * カンマ区切り処理
+ * （ただし、カンマ+半角スペースの組の場合は区切り文字と見做さない）
+ * @param {string} _str 
+ */
+const splitComma = _str => _str?.split(`, `).join(`*comma* `).split(`,`);
+
 /**
  * 重複を排除した配列の生成
  * @param {array} _array1 
@@ -2167,6 +2174,7 @@ const loadLocalStorage = _ => {
 		g_localeObj.num = g_localeObj.list.findIndex(val => val === g_localeObj.val);
 	}
 	Object.assign(g_msgInfoObj, g_lang_msgInfoObj[g_localeObj.val]);
+	Object.assign(g_kCd, g_lang_kCd[g_localeObj.val]);
 
 	// 作品別ローカルストレージの読込
 	const checkStorage = localStorage.getItem(g_localStorageUrl);
@@ -2743,7 +2751,7 @@ const headerConvert = _dosObj => {
 		}
 
 		for (let j = 0; j < musicData.length; j++) {
-			const musics = musicData[j].split(`,`);
+			const musics = splitComma(musicData[j]);
 
 			if (obj.musicNos.length >= j) {
 				obj.musicTitles[j] = escapeHtml(getMusicNameSimple(musics[0]));
@@ -2751,7 +2759,7 @@ const headerConvert = _dosObj => {
 				obj.artistNames[j] = escapeHtml(musics[1] ?? ``);
 			}
 		}
-		const musics = musicData[0].split(`,`);
+		const musics = splitComma(musicData[0]);
 		obj.musicTitle = obj.musicTitles[0];
 		obj.musicTitleForView = obj.musicTitlesForView[0];
 		obj.artistName = obj.artistNames[0] ?? ``;
@@ -6717,7 +6725,10 @@ const keyConfigInit = (_kcType = g_kcType) => {
 
 		// 全角切替、BackSpace、Deleteキー、Escキーは割り当て禁止
 		// また、直前と同じキーを押した場合(BackSpaceを除く)はキー操作を無効にする
-		const disabledKeys = [229, 240, 242, 243, 244, 91, 29, 28, 27, 259, g_prevKey];
+		const disabledKeys = [240, 242, 243, 244, 91, 29, 28, 27, 259, g_prevKey];
+		if (g_localeObj.val === `Ja`) {
+			disabledKeys.unshift(229);
+		}
 		if (disabledKeys.includes(setKey) || g_kCdN[setKey] === undefined) {
 			makeInfoWindow(g_msgInfoObj.I_0002, `fadeOut0`);
 			return;
@@ -7623,6 +7634,14 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 					wordMaxDepth = tmpWordData[k + 1];
 				}
 
+				// 同一行数で数字が取得できるまでは歌詞表示と見做して結合
+				let m = 3;
+				while (hasVal(tmpWordData[m]) && isNaN(parseInt(tmpWordData[m])) && m < tmpWordData.length) {
+					tmpWordData[k + 2] += `,${tmpWordData[k + m]}`;
+					tmpWordData.splice(k + m, 1);
+				}
+
+				// 歌詞表示データの格納
 				let dataCnts = 0;
 				[wordData[tmpWordData[k]], dataCnts] =
 					checkDuplicatedObjects(wordData[tmpWordData[k]]);

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2023/09/24 (v34.0.0)
+ * Revised : 2023/10/01 (v34.2.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1081,13 +1081,66 @@ let g_currentk = 0;
 let g_prevKey = -1;
 
 // キーコード
-const g_kCd = [];
+const g_kCd = {};
 const g_kCdN = [];
 for (let j = 0; j < 260; j++) {
     g_kCd[j] = ``;
     g_kCdN[j] = ``;
 }
 
+const g_lang_kCd = {
+    Ja: {
+        48: `0`,
+        49: `1`,
+        50: `2`,
+        51: `3`,
+        52: `4`,
+        53: `5`,
+        54: `6`,
+        55: `7`,
+        56: `8`,
+        57: `9`,
+        186: `： *`,
+        187: `; +`,
+        188: `, <`,
+        189: `- =`,
+        190: `. >`,
+        191: `/ ?`,
+        192: "@ `",
+        219: `[ {`,
+        220: `\\ |`,
+        221: `] }`,
+        222: `^ ~`,
+        226: `\\ _`,
+        229: `IME`,
+    },
+    En: {
+        48: `0 )`,
+        49: `1 !`,
+        50: `2 @`,
+        51: `3 #`,
+        52: `4 $`,
+        53: `5 %`,
+        54: `6 ^`,
+        55: `7 &`,
+        56: `8 *`,
+        57: `9 (`,
+        186: `' "`,
+        187: `; :`,
+        188: `, <`,
+        189: `- _`,
+        190: `. >`,
+        191: `/ ?`,
+        192: `[ {`,
+        219: `] }`,
+        220: `IntlYen`,
+        221: `\\ |`,
+        222: `= +`,
+        226: `IntlRo`,
+        229: "` ~",
+    },
+};
+
 // キー表示用
 g_kCd[0] = `- - -`;
 g_kCd[1] = `Unknown`;
@@ -1115,16 +1168,6 @@ g_kCd[44] = `PS`;
 g_kCd[45] = `Insert`;
 g_kCd[46] = `Delete`;
 g_kCd[47] = `Help`;
-g_kCd[48] = `0`;
-g_kCd[49] = `1`;
-g_kCd[50] = `2`;
-g_kCd[51] = `3`;
-g_kCd[52] = `4`;
-g_kCd[53] = `5`;
-g_kCd[54] = `6`;
-g_kCd[55] = `7`;
-g_kCd[56] = `8`;
-g_kCd[57] = `9`;
 g_kCd[65] = `A`;
 g_kCd[66] = `B`;
 g_kCd[67] = `C`;
@@ -1187,19 +1230,6 @@ g_kCd[126] = `F15`;
 g_kCd[134] = `FN`;
 g_kCd[144] = `NumLk`;
 g_kCd[145] = `SL`;
-g_kCd[186] = `： *`;
-g_kCd[187] = `; +`;
-g_kCd[188] = `, <`;
-g_kCd[189] = `- =`;
-g_kCd[190] = `. >`;
-g_kCd[191] = `/ ?`;
-g_kCd[192] = "@ `";
-g_kCd[219] = `[ {`;
-g_kCd[220] = `\\ |`;
-g_kCd[221] = `] }`;
-g_kCd[222] = `^ ~`;
-g_kCd[226] = `\\ _`;
-g_kCd[229] = `IME`;
 g_kCd[240] = `CapsLk`;
 g_kCd[256] = `R)Shift`;
 g_kCd[257] = `R)Ctrl`;

package/package.json

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