danoniplus 32.0.0 → 32.1.0
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 +15 -4
- package/package.json +1 -1
package/js/danoni_main.js
CHANGED
|
@@ -8,8 +8,8 @@
|
|
|
8
8
|
*
|
|
9
9
|
* https://github.com/cwtickle/danoniplus
|
|
10
10
|
*/
|
|
11
|
-
const g_version = `Ver 32.
|
|
12
|
-
const g_revisedDate = `2023/05/
|
|
11
|
+
const g_version = `Ver 32.1.0`;
|
|
12
|
+
const g_revisedDate = `2023/05/13`;
|
|
13
13
|
|
|
14
14
|
// カスタム用バージョン (danoni_custom.js 等で指定可)
|
|
15
15
|
let g_localVersion = ``;
|
|
@@ -120,6 +120,10 @@ const g_presetObj = {
|
|
|
120
120
|
let g_headerObj = {};
|
|
121
121
|
let g_scoreObj = {};
|
|
122
122
|
let g_attrObj = {};
|
|
123
|
+
|
|
124
|
+
const g_btnFunc = {
|
|
125
|
+
base: {}, reset: {}, cxt: {},
|
|
126
|
+
};
|
|
123
127
|
let g_btnAddFunc = {};
|
|
124
128
|
let g_btnDeleteFlg = {};
|
|
125
129
|
let g_cxtAddFunc = {};
|
|
@@ -1268,6 +1272,8 @@ const createCss2Button = (_id, _text, _func = _ => true, { x = 0, y = g_sHeight
|
|
|
1268
1272
|
resetFunc(evt);
|
|
1269
1273
|
}
|
|
1270
1274
|
});
|
|
1275
|
+
g_btnFunc.base[_id] = _func;
|
|
1276
|
+
g_btnFunc.reset[_id] = resetFunc;
|
|
1271
1277
|
|
|
1272
1278
|
// 右クリック時の処理
|
|
1273
1279
|
div.oncontextmenu = evt => {
|
|
@@ -1278,6 +1284,8 @@ const createCss2Button = (_id, _text, _func = _ => true, { x = 0, y = g_sHeight
|
|
|
1278
1284
|
if (typeof g_cxtAddFunc[_id] === C_TYP_FUNCTION) {
|
|
1279
1285
|
g_cxtAddFunc[_id](evt, cxtFunc);
|
|
1280
1286
|
}
|
|
1287
|
+
g_btnFunc.cxt[_id] = cxtFunc;
|
|
1288
|
+
|
|
1281
1289
|
} else if (typeof g_cxtAddFunc[_id] === C_TYP_FUNCTION) {
|
|
1282
1290
|
g_cxtAddFunc[_id](evt);
|
|
1283
1291
|
}
|
|
@@ -2848,10 +2856,12 @@ const headerConvert = _dosObj => {
|
|
|
2848
2856
|
// 無音のフレーム数
|
|
2849
2857
|
obj.blankFrame = 200;
|
|
2850
2858
|
obj.blankFrameDef = 200;
|
|
2859
|
+
obj.blankFrameDefs = [];
|
|
2851
2860
|
if (isNaN(parseFloat(_dosObj.blankFrame))) {
|
|
2852
2861
|
} else {
|
|
2853
|
-
obj.
|
|
2854
|
-
obj.
|
|
2862
|
+
obj.blankFrameDefs = _dosObj.blankFrame.split(`$`).map(val => parseInt(val));
|
|
2863
|
+
obj.blankFrame = obj.blankFrameDefs[0];
|
|
2864
|
+
obj.blankFrameDef = obj.blankFrameDefs[0];
|
|
2855
2865
|
}
|
|
2856
2866
|
|
|
2857
2867
|
// 開始フレーム数（0以外の場合はフェードインスタート）、終了フレーム数
|
|
@@ -6862,6 +6872,7 @@ const loadingScoreInit = async () => {
|
|
|
6862
6872
|
await loadChartFile();
|
|
6863
6873
|
const tkObj = getKeyInfo();
|
|
6864
6874
|
const [keyCtrlPtn, keyNum] = [tkObj.keyCtrlPtn, tkObj.keyNum];
|
|
6875
|
+
g_headerObj.blankFrameDef = setVal(g_headerObj.blankFrameDefs[g_stateObj.scoreId], g_headerObj.blankFrameDefs[0]);
|
|
6865
6876
|
g_headerObj.blankFrame = g_headerObj.blankFrameDef;
|
|
6866
6877
|
|
|
6867
6878
|
// ユーザカスタムイベント
|