danoniplus 30.2.0 → 30.2.1
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 +9 -7
- 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/02/
|
|
7
|
+
* Revised : 2023/02/18
|
|
8
8
|
*
|
|
9
9
|
* https://github.com/cwtickle/danoniplus
|
|
10
10
|
*/
|
|
11
|
-
const g_version = `Ver 30.2.
|
|
12
|
-
const g_revisedDate = `2023/02/
|
|
11
|
+
const g_version = `Ver 30.2.1`;
|
|
12
|
+
const g_revisedDate = `2023/02/18`;
|
|
13
13
|
const g_alphaVersion = ``;
|
|
14
14
|
|
|
15
15
|
// カスタム用バージョン (danoni_custom.js 等で指定可)
|
|
@@ -7152,7 +7152,7 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
|
|
|
7152
7152
|
const arrowNum = parseFloat(tmpScrollchData[1]);
|
|
7153
7153
|
const scrollDir = parseFloat(tmpScrollchData[2] ?? `1`);
|
|
7154
7154
|
|
|
7155
|
-
scrollchData.push([frame,
|
|
7155
|
+
scrollchData.push([frame, arrowNum, frame, scrollDir]);
|
|
7156
7156
|
});
|
|
7157
7157
|
return scrollchData.sort((_a, _b) => _a[0] - _b[0]).flat();
|
|
7158
7158
|
}
|
|
@@ -7738,7 +7738,8 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
|
|
|
7738
7738
|
g_workObj.boostData = getTimingData(_dataObj.boostData);
|
|
7739
7739
|
|
|
7740
7740
|
/**
|
|
7741
|
-
*
|
|
7741
|
+
* 色変化・モーションデータ・スクロール反転データのタイミング更新
|
|
7742
|
+
* - この関数を使用する場合、配列グループの先頭2つが「フレーム数、矢印番号」となっていないと動作しない
|
|
7742
7743
|
* @param {string} _type
|
|
7743
7744
|
* @param {string} _header
|
|
7744
7745
|
* @param {function} _setFunc
|
|
@@ -7759,6 +7760,7 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
|
|
|
7759
7760
|
const calcFrameFlg = (_colorFlg && !isFrzHitColor(baseData[k + 1]) && !baseData[k + 3]) || _calcFrameFlg;
|
|
7760
7761
|
|
|
7761
7762
|
if (baseData[k] < g_scoreObj.frameNum) {
|
|
7763
|
+
// フェードイン直前にある色変化・モーションデータ・スクロール反転データを取得して格納
|
|
7762
7764
|
if (!hasValInArray(baseData[k + 1], frontData)) {
|
|
7763
7765
|
frontData.unshift(baseData.slice(k + 1, k + _term));
|
|
7764
7766
|
}
|
|
@@ -7844,7 +7846,7 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
|
|
|
7844
7846
|
return _data;
|
|
7845
7847
|
};
|
|
7846
7848
|
|
|
7847
|
-
//
|
|
7849
|
+
// 個別・全体色変化、モーションデータ・スクロール反転データのタイミング更新
|
|
7848
7850
|
[``, `dummy`].forEach(type =>
|
|
7849
7851
|
calcDataTiming(`color`, type, pushColors, { _colorFlg: true }));
|
|
7850
7852
|
|
|
@@ -8094,7 +8096,7 @@ const pushCssMotions = (_header, _frame, _val, _styleName, _styleNameRev) => {
|
|
|
8094
8096
|
* @param {number} _val
|
|
8095
8097
|
* @param {number} _scrollDir
|
|
8096
8098
|
*/
|
|
8097
|
-
const pushScrollchs = (_header, _frameArrow,
|
|
8099
|
+
const pushScrollchs = (_header, _frameArrow, _val, _frameStep, _scrollDir) => {
|
|
8098
8100
|
const tkObj = getKeyInfo();
|
|
8099
8101
|
|
|
8100
8102
|
const frameArrow = Math.max(_frameArrow, g_scoreObj.frameNum);
|