danoniplus 33.7.2 → 33.7.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/js/danoni_main.js +12 -8
- package/package.json +1 -1
package/js/danoni_main.js
CHANGED
|
@@ -4,12 +4,12 @@
|
|
|
4
4
|
*
|
|
5
5
|
* Source by tickle
|
|
6
6
|
* Created : 2018/10/08
|
|
7
|
-
* Revised : 2023/
|
|
7
|
+
* Revised : 2023/11/05
|
|
8
8
|
*
|
|
9
9
|
* https://github.com/cwtickle/danoniplus
|
|
10
10
|
*/
|
|
11
|
-
const g_version = `Ver 33.7.
|
|
12
|
-
const g_revisedDate = `2023/
|
|
11
|
+
const g_version = `Ver 33.7.4`;
|
|
12
|
+
const g_revisedDate = `2023/11/05`;
|
|
13
13
|
|
|
14
14
|
// カスタム用バージョン (danoni_custom.js 等で指定可)
|
|
15
15
|
let g_localVersion = ``;
|
|
@@ -3031,8 +3031,11 @@ const headerConvert = _dosObj => {
|
|
|
3031
3031
|
|
|
3032
3032
|
// 初期表示する部分キーの設定
|
|
3033
3033
|
obj.keyGroupOrder = [];
|
|
3034
|
-
_dosObj.keyGroupOrder?.split(`$`).
|
|
3035
|
-
|
|
3034
|
+
_dosObj.keyGroupOrder?.split(`$`).forEach((val, j) => {
|
|
3035
|
+
if (val !== ``) {
|
|
3036
|
+
obj.keyGroupOrder[j] = val.split(`,`);
|
|
3037
|
+
}
|
|
3038
|
+
});
|
|
3036
3039
|
|
|
3037
3040
|
// 最終演出表示有無(noneで無効化)
|
|
3038
3041
|
obj.finishView = _dosObj.finishView ?? ``;
|
|
@@ -8389,11 +8392,12 @@ const pushColors = (_header, _frame, _val, _colorCd, _allFlg) => {
|
|
|
8389
8392
|
const ctype = (targetj >= 10 ? `Hit` : `Normal`) + (targetj % 2 === 0 ? `` : `Bar`);
|
|
8390
8393
|
const colorPos = Math.ceil((targetj % 10 - 1) / 2);
|
|
8391
8394
|
|
|
8392
|
-
g_keyObj[`color${tkObj.keyCtrlPtn}`].
|
|
8393
|
-
|
|
8395
|
+
g_keyObj[`color${tkObj.keyCtrlPtn}`].forEach((cpattern, k) => {
|
|
8396
|
+
if (colorPos === cpattern) {
|
|
8394
8397
|
initialize(baseHeader + ctype);
|
|
8395
8398
|
pushColor(baseHeader + ctype, k + addAll);
|
|
8396
|
-
}
|
|
8399
|
+
}
|
|
8400
|
+
});
|
|
8397
8401
|
});
|
|
8398
8402
|
}
|
|
8399
8403
|
|