Merge pull request #1412 from cwtickle/develop

[ver30.2.2] キーグループ未指定のときにkeych_dataが使えない問題を修正　他
cwtickle · Feb 20, 2023 · 0b4268f · 0b4268f
2 parents f32a83f + d748505
commit 0b4268f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/SECURITY.md b/SECURITY.md
@@ -16,7 +16,7 @@ v28の対応終了時期はv31リリース開始時を予定しています。
 
 | Version | Supported          | Latest Version | Logs | First Release | End of Support |
 | ------- | ------------------ |----------------|------|---------------|----------------|
-| v30     | :heavy_check_mark: |[v30.2.1](https://github.com/cwtickle/danoniplus/releases/tag/v30.2.1)          |[:memo:](https://github.com/cwtickle/danoniplus/wiki/Changelog-latest)|2023-02-10|-|
+| v30     | :heavy_check_mark: |[v30.2.2](https://github.com/cwtickle/danoniplus/releases/tag/v30.2.2)          |[:memo:](https://github.com/cwtickle/danoniplus/wiki/Changelog-latest)|2023-02-10|-|
 | v29     | :heavy_check_mark: |[v29.4.1](https://github.com/cwtickle/danoniplus/releases/tag/v29.4.1)          |[:memo:](https://github.com/cwtickle/danoniplus/wiki/Changelog-v29)|2022-11-05|(At Release v38)|
 | v28     | :warning:          |[v28.6.5](https://github.com/cwtickle/danoniplus/releases/tag/v28.6.5)          |[:memo:](https://github.com/cwtickle/danoniplus/wiki/Changelog-v28)|2022-08-21|(At Release v31)|
 | v27     | :x:                |[v27.8.7 (final)](https://github.com/cwtickle/danoniplus/releases/tag/v27.8.7)          |[:memo:](https://github.com/cwtickle/danoniplus/wiki/Changelog-v27)|2022-03-18|2023-02-10|

diff --git a/danoni/danoni5.html b/danoni/danoni5.html
@@ -81,7 +81,7 @@
 5,5,5,5,5,7i,7i,7i,7i,7i,7i,7i,7i,7i,11,11,11,11,11L,11L,11L,11L,11W,11W,11W,11W,12,12,12,12,12,12,12,12,12,12,12,12,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W,11/11L/11W
 |
 
-|divTr=7$7$7$12,19|
+|divTr=7$7$7$12|
 |keyCtrlTr=
 37/0,40/0,38/0,39/0,32/0,90/0,88/0,67/0,37/0,40/0,38/0,39/0,37/0,40/0,38/0,39/0,87/0,69/0,51/52,82/0,49/50,84/0,89/0,48/189,85/0,73/0,56/57/0,79/0,83/0,68/0,70/0,32/0,74/0,75/0,76/0,32/0,78/0,74/0,77/0,75/0,188/0,76/0,190/0
 32/0,37/0,40/0,38/0,39/0,90/0,88/0,67/0,37/0,40/0,38/0,39/0,37/0,40/0,38/0,39/0,87/0,69/0,51/52,82/0,49/50,84/0,89/0,48/189,85/0,73/0,56/57/0,79/0,83/0,68/0,70/0,32/0,74/0,75/0,76/0,32/0,78/0,74/0,77/0,75/0,188/0,76/0,190/0

diff --git a/js/danoni_main.js b/js/danoni_main.js
@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2023/02/18
+ * Revised : 2023/02/20
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 30.2.1`;
-const g_revisedDate = `2023/02/18`;
+const g_version = `Ver 30.2.2`;
+const g_revisedDate = `2023/02/20`;
 const g_alphaVersion = ``;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -6422,9 +6422,9 @@ const getKeyInfo = _ => {
 	const keyCtrlPtn = `${g_keyObj.currentKey}_${g_keyObj.currentPtn}`;
 	const keyNum = g_keyObj[`chara${keyCtrlPtn}`].length;
 	const posMax = (g_keyObj[`divMax${keyCtrlPtn}`] !== undefined ?
-		g_keyObj[`divMax${keyCtrlPtn}`] : g_keyObj[`pos${keyCtrlPtn}`][keyNum - 1] + 1);
+		g_keyObj[`divMax${keyCtrlPtn}`] : Math.max(...g_keyObj[`pos${keyCtrlPtn}`]) + 1);
 	const divideCnt = g_keyObj[`div${keyCtrlPtn}`] - 1;
-	const keyGroupMaps = setVal(g_keyObj[`keyGroup${keyCtrlPtn}`], [...Array(keyNum)].fill([0]), C_TYP_STRING);
+	const keyGroupMaps = setVal(g_keyObj[`keyGroup${keyCtrlPtn}`], [...Array(keyNum)].fill([`0`]), C_TYP_STRING);
 	const keyGroupList = makeDedupliArray(keyGroupMaps.flat()).sort((a, b) => parseInt(a) - parseInt(b));
 
 	return {
@@ -7393,14 +7393,12 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 	}
 
 	// キー変化定義
-	obj.keychFrames = [];
+	obj.keychFrames = [0];
+	obj.keychTarget = [`0`];
 	if (hasVal(_dosObj[`keych${setScoreIdHeader(g_stateObj.scoreId, g_stateObj.scoreLockFlg)}_data`])) {
 		const keychdata = splitLF2(_dosObj[`keych${setScoreIdHeader(g_stateObj.scoreId, g_stateObj.scoreLockFlg)}_data`], `,`);
-		obj.keychFrames = keychdata.filter((val, j) => j % 2 === 0);
-		obj.keychTarget = keychdata.filter((val, j) => j % 2 === 1);
-	} else {
-		obj.keychFrames = [0];
-		obj.keychTarget = [0];
+		obj.keychFrames.push(...keychdata.filter((val, j) => j % 2 === 0));
+		obj.keychTarget.push(...keychdata.filter((val, j) => j % 2 === 1));
 	}
 
 	return obj;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "danoniplus",
-  "version": "30.2.1",
+  "version": "30.2.2",
   "description": "Dancing☆Onigiri (CW Edition) - Web-based Rhythm Game",
   "main": "index.js",
   "scripts": {