Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ver30.2.1] フェードインでスクロール反転の初期位置が正しく反映されない問題を修正 #1409

Merged
merged 3 commits into from Feb 18, 2023
Merged

[ver30.2.1] フェードインでスクロール反転の初期位置が正しく反映されない問題を修正 #1409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b88017
[0645/scroll-rev:0.1.0] フェードインでスクロール反転の初期位置が正しく反映されない問題を修正
cwtickle Feb 18, 2023
f5b7f68
Merge pull request #1408 from cwtickle/hotfix/0645-scroll-rev
cwtickle Feb 18, 2023
433cebc
[ver30.2.1] フェードインでスクロール反転の初期位置が正しく反映されない問題を修正
cwtickle Feb 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion SECURITY.md
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@ v28の対応終了時期はv31リリース開始時を予定しています。

| Version | Supported | Latest Version | Logs | First Release | End of Support |
| ------- | ------------------ |----------------|------|---------------|----------------|
| v30 | :heavy_check_mark: |[v30.2.0](https://github.com/cwtickle/danoniplus/releases/tag/v30.2.0) |[:memo:](https://github.com/cwtickle/danoniplus/wiki/Changelog-latest)|2023-02-10|-|
| 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|-|
| 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|
Expand Down
16 changes: 9 additions & 7 deletions js/danoni_main.js
View file
Open in desktop
Expand Up @@ -4,12 +4,12 @@
*
* Source by tickle
* Created : 2018/10/08
* Revised : 2023/02/17
* Revised : 2023/02/18
*
* https://github.com/cwtickle/danoniplus
*/
const g_version = `Ver 30.2.0`;
const g_revisedDate = `2023/02/17`;
const g_version = `Ver 30.2.1`;
const g_revisedDate = `2023/02/18`;
const g_alphaVersion = ``;

// カスタム用バージョン (danoni_custom.js 等で指定可)
Expand Down Expand Up @@ -7152,7 +7152,7 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
const arrowNum = parseFloat(tmpScrollchData[1]);
const scrollDir = parseFloat(tmpScrollchData[2] ?? `1`);

scrollchData.push([frame, frame, arrowNum, scrollDir]);
scrollchData.push([frame, arrowNum, frame, scrollDir]);
});
return scrollchData.sort((_a, _b) => _a[0] - _b[0]).flat();
}
Expand Down Expand Up @@ -7738,7 +7738,8 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
g_workObj.boostData = getTimingData(_dataObj.boostData);

/**
* 色変化・モーションデータのタイミング更新
* 色変化・モーションデータ・スクロール反転データのタイミング更新
* - この関数を使用する場合、配列グループの先頭2つが「フレーム数、矢印番号」となっていないと動作しない
* @param {string} _type
* @param {string} _header
* @param {function} _setFunc
Expand All @@ -7759,6 +7760,7 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
const calcFrameFlg = (_colorFlg && !isFrzHitColor(baseData[k + 1]) && !baseData[k + 3]) || _calcFrameFlg;

if (baseData[k] < g_scoreObj.frameNum) {
// フェードイン直前にある色変化・モーションデータ・スクロール反転データを取得して格納
if (!hasValInArray(baseData[k + 1], frontData)) {
frontData.unshift(baseData.slice(k + 1, k + _term));
}
Expand Down Expand Up @@ -7844,7 +7846,7 @@ const pushArrows = (_dataObj, _speedOnFrame, _motionOnFrame, _firstArrivalFrame)
return _data;
};

// 個別・全体色変化、モーションデータのタイミング更新
// 個別・全体色変化、モーションデータ・スクロール反転データのタイミング更新
[``, `dummy`].forEach(type =>
calcDataTiming(`color`, type, pushColors, { _colorFlg: true }));

Expand Down Expand Up @@ -8094,7 +8096,7 @@ const pushCssMotions = (_header, _frame, _val, _styleName, _styleNameRev) => {
* @param {number} _val
* @param {number} _scrollDir
*/
const pushScrollchs = (_header, _frameArrow, _frameStep, _val, _scrollDir) => {
const pushScrollchs = (_header, _frameArrow, _val, _frameStep, _scrollDir) => {
const tkObj = getKeyInfo();

const frameArrow = Math.max(_frameArrow, g_scoreObj.frameNum);
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
@@ -1,6 +1,6 @@
{
"name": "danoniplus",
"version": "30.2.0",
"version": "30.2.1",
"description": "Dancing☆Onigiri (CW Edition) - Web-based Rhythm Game",
"main": "index.js",
"scripts": {
Expand Down