danoniplus 45.4.0 → 45.5.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 +30 -18
- package/js/lib/danoni_constants.js +3 -2
- 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 : 2026/03/
|
|
7
|
+
* Revised : 2026/03/06
|
|
8
8
|
*
|
|
9
9
|
* https://github.com/cwtickle/danoniplus
|
|
10
10
|
*/
|
|
11
|
-
const g_version = `Ver 45.
|
|
12
|
-
const g_revisedDate = `2026/03/
|
|
11
|
+
const g_version = `Ver 45.5.1`;
|
|
12
|
+
const g_revisedDate = `2026/03/06`;
|
|
13
13
|
|
|
14
14
|
// カスタム用バージョン (danoni_custom.js 等で指定可)
|
|
15
15
|
let g_localVersion = ``;
|
|
@@ -6456,6 +6456,7 @@ const commonSettingBtn = _labelName => {
|
|
|
6456
6456
|
const switchSave = evt => {
|
|
6457
6457
|
const from = boolToSwitch(g_stateObj.dataSaveFlg);
|
|
6458
6458
|
g_stateObj.dataSaveFlg = !g_stateObj.dataSaveFlg;
|
|
6459
|
+
updateSettingSummary();
|
|
6459
6460
|
|
|
6460
6461
|
const to = boolToSwitch(g_stateObj.dataSaveFlg);
|
|
6461
6462
|
evt.target.classList.replace(g_cssObj[`button_${from}`], g_cssObj[`button_${to}`]);
|
|
@@ -6517,7 +6518,7 @@ const commonSettingBtn = _labelName => {
|
|
|
6517
6518
|
|
|
6518
6519
|
const makeSettingSummary = () => {
|
|
6519
6520
|
const tmpDiv = createEmptySprite(divRoot, `settingSumSprite`, g_windowObj.settingSumSprite);
|
|
6520
|
-
tmpDiv.style.background = g_headerObj.baseBrightFlg ? `#
|
|
6521
|
+
tmpDiv.style.background = g_headerObj.baseBrightFlg ? `#ffffffee` : `#000000cc`;
|
|
6521
6522
|
|
|
6522
6523
|
multiAppend(tmpDiv,
|
|
6523
6524
|
createDivCss2Label(`lblSummaryHeader`, g_lblNameObj.settingSummary, g_lblPosObj.lblSummaryHeader),
|
|
@@ -6553,14 +6554,18 @@ const updateSettingSummary = () => {
|
|
|
6553
6554
|
const orgShuffleFlg = g_keyObj[`shuffle${keyCtrlPtn}`].filter((shuffleGr, j) => shuffleGr !== g_keyObj[`shuffle${keyCtrlPtn}_0d`][j]).length === 0;
|
|
6554
6555
|
const shuffleName = `${getStgDetailName(g_stateObj.shuffle)}${!orgShuffleFlg && !g_stateObj.shuffle.endsWith(`+`) ? getStgDetailName('(S)') : ''}`;
|
|
6555
6556
|
const settingData = getSelectedSettingList(shuffleName);
|
|
6556
|
-
|
|
6557
|
-
|
|
6558
|
-
|
|
6559
|
-
document.getElementById(`
|
|
6560
|
-
document.getElementById(`
|
|
6561
|
-
document.getElementById(`
|
|
6557
|
+
const estimatedHighscoreCondition = g_stateObj.dataSaveFlg && (g_stateObj.autoPlay !== C_FLG_ALL && g_headerObj.playbackRate === 1 && g_stateObj.fadein < 10 &&
|
|
6558
|
+
(g_stateObj.shuffle === C_FLG_OFF || (g_stateObj.shuffle.endsWith(`Mirror`) && orgShuffleFlg)));
|
|
6559
|
+
|
|
6560
|
+
document.getElementById(`lblSummaryDifInfo`).innerHTML = settingData.difData + `${estimatedHighscoreCondition ? '' : ` | <span class="common_kita common_bold">No Records</span>`}`;
|
|
6561
|
+
document.getElementById(`lblSummaryPlaystyleInfo`).textContent = settingData.playStyleData + `${g_stateObj.excessive === C_FLG_ON ? ' | Excessive' : ''}`;
|
|
6562
|
+
document.getElementById(`lblSummaryDisplayInfo`).textContent = settingData.displayData;
|
|
6563
|
+
document.getElementById(`lblSummaryDisplay2Info`).textContent = settingData.display2Data;
|
|
6564
|
+
document.getElementById(`lblSummaryEnvironment`).textContent =
|
|
6562
6565
|
`(Adj: ${g_stateObj.adjustment} f, Volume: ${g_stateObj.volume}%, ` +
|
|
6563
6566
|
`ColorType: ${g_colorType}, KeyPattern: ${g_keyObj.currentPtn === -1 ? 'Self' : g_keyObj.currentPtn + 1})`;
|
|
6567
|
+
|
|
6568
|
+
g_customJsObj.settingSummary.forEach(func => func());
|
|
6564
6569
|
};
|
|
6565
6570
|
|
|
6566
6571
|
/**
|
|
@@ -7581,6 +7586,9 @@ const setDifficulty = (_initFlg) => {
|
|
|
7581
7586
|
// ユーザカスタムイベント(初期)
|
|
7582
7587
|
g_customJsObj.difficulty.forEach(func => func(_initFlg, g_canLoadDifInfoFlg));
|
|
7583
7588
|
|
|
7589
|
+
// 設定サマリー表示の更新
|
|
7590
|
+
updateSettingSummary();
|
|
7591
|
+
|
|
7584
7592
|
// ---------------------------------------------------
|
|
7585
7593
|
// 4. 譜面初期情報ロード許可フラグの設定
|
|
7586
7594
|
g_canLoadDifInfoFlg = true;
|
|
@@ -7859,6 +7867,7 @@ const createOptionWindow = _sprite => {
|
|
|
7859
7867
|
g_stateObj.fadein = nextPos(g_stateObj.fadein, _sign, 100);
|
|
7860
7868
|
fadeinSlider.value = g_stateObj.fadein;
|
|
7861
7869
|
lnkFadein.textContent = `${g_stateObj.fadein}${g_lblNameObj.percent}`;
|
|
7870
|
+
updateSettingSummary();
|
|
7862
7871
|
};
|
|
7863
7872
|
|
|
7864
7873
|
multiAppend(spriteList.fadein,
|
|
@@ -7874,8 +7883,10 @@ const createOptionWindow = _sprite => {
|
|
|
7874
7883
|
);
|
|
7875
7884
|
|
|
7876
7885
|
const fadeinSlider = document.getElementById(`fadeinSlider`);
|
|
7877
|
-
fadeinSlider.addEventListener(`input`, () =>
|
|
7878
|
-
g_stateObj.fadein = inputSlider(fadeinSlider, lnkFadein, `fadein`)
|
|
7886
|
+
fadeinSlider.addEventListener(`input`, () => {
|
|
7887
|
+
g_stateObj.fadein = inputSlider(fadeinSlider, lnkFadein, `fadein`);
|
|
7888
|
+
updateSettingSummary();
|
|
7889
|
+
}, false);
|
|
7879
7890
|
|
|
7880
7891
|
// ---------------------------------------------------
|
|
7881
7892
|
// ボリューム (Volume)
|
|
@@ -8315,6 +8326,7 @@ const setExcessive = (_btn, _val) => {
|
|
|
8315
8326
|
g_stateObj.excessiveScoreId = g_stateObj.scoreId;
|
|
8316
8327
|
}
|
|
8317
8328
|
g_stateObj.excessive = g_settings.excessives[g_settings.excessiveNum];
|
|
8329
|
+
updateSettingSummary();
|
|
8318
8330
|
_btn.classList.replace(g_cssObj[`button_Rev${g_settings.excessives[curExcessive]}`],
|
|
8319
8331
|
g_cssObj[`button_Rev${g_settings.excessives[g_settings.excessiveNum]}`]);
|
|
8320
8332
|
};
|
|
@@ -8727,7 +8739,7 @@ const exSettingInit = () => {
|
|
|
8727
8739
|
createExpandedScView(_name);
|
|
8728
8740
|
},
|
|
8729
8741
|
title: g_msgObj[`${_name}Type`] ?? ``,
|
|
8730
|
-
}), g_cssObj.button_Default, g_cssObj
|
|
8742
|
+
}), g_cssObj.button_Default, g_cssObj.button_RevON);
|
|
8731
8743
|
|
|
8732
8744
|
/**
|
|
8733
8745
|
* 拡張ボタンのショートカット表示
|
|
@@ -14661,9 +14673,9 @@ const resultInit = () => {
|
|
|
14661
14673
|
maxCombo: 0, fmaxCombo: 0, score: 0,
|
|
14662
14674
|
};
|
|
14663
14675
|
|
|
14664
|
-
const
|
|
14665
|
-
(g_stateObj.shuffle === C_FLG_OFF || (
|
|
14666
|
-
if (
|
|
14676
|
+
const highscorePreCondition = (g_stateObj.autoAll === C_FLG_OFF && g_headerObj.playbackRate === 1 &&
|
|
14677
|
+
(g_stateObj.shuffle === C_FLG_OFF || (g_stateObj.shuffle.endsWith(`Mirror`) && orgShuffleFlg)));
|
|
14678
|
+
if (highscorePreCondition) {
|
|
14667
14679
|
|
|
14668
14680
|
// ハイスコア差分描画
|
|
14669
14681
|
Object.keys(jdgScoreObj).filter(score => score !== `score`).forEach(score =>
|
|
@@ -14838,7 +14850,7 @@ const resultInit = () => {
|
|
|
14838
14850
|
const currentDateTime = new Date().toLocaleString();
|
|
14839
14851
|
g_customJsObj.result.forEach(func => func());
|
|
14840
14852
|
|
|
14841
|
-
if (
|
|
14853
|
+
if (highscorePreCondition) {
|
|
14842
14854
|
|
|
14843
14855
|
// 古いキー定義の情報を検索
|
|
14844
14856
|
const relatedKeys = Object.entries(g_keyObj.keyTransPattern)
|
|
@@ -15031,7 +15043,7 @@ const resultInit = () => {
|
|
|
15031
15043
|
drawText(g_resultObj[score], { x: 200, hy: 7 + jdgScoreObj[score].pos, align: C_ALIGN_RIGHT });
|
|
15032
15044
|
});
|
|
15033
15045
|
|
|
15034
|
-
if (
|
|
15046
|
+
if (highscorePreCondition) {
|
|
15035
15047
|
drawText(`(${highscoreDfObj.score >= 0 ? '+' : '-'} ${Math.abs(highscoreDfObj.score)})`,
|
|
15036
15048
|
{ x: 206, hy: 18, color: highscoreDfObj.score > 0 ? `#ffff99` : `#cccccc`, align: C_ALIGN_RIGHT });
|
|
15037
15049
|
}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*
|
|
6
6
|
* Source by tickle
|
|
7
7
|
* Created : 2019/11/19
|
|
8
|
-
* Revised : 2026/03/
|
|
8
|
+
* Revised : 2026/03/05 (v45.5.0)
|
|
9
9
|
*
|
|
10
10
|
* https://github.com/cwtickle/danoniplus
|
|
11
11
|
*/
|
|
@@ -4439,7 +4439,7 @@ const g_lblNameObj = {
|
|
|
4439
4439
|
'u_Shakin(Great)': `Shakin(Great)`,
|
|
4440
4440
|
'u_Fast/Slow': `Fast/Slow`,
|
|
4441
4441
|
|
|
4442
|
-
'
|
|
4442
|
+
'u_Speed': `Velocity`,
|
|
4443
4443
|
'u_Density': `Density`,
|
|
4444
4444
|
'u_ToolDif': `DifLevel`,
|
|
4445
4445
|
'u_HighScore': `HighScore`,
|
|
@@ -4845,6 +4845,7 @@ const g_customJsObj = {
|
|
|
4845
4845
|
difficulty: [],
|
|
4846
4846
|
settingsDisplay: [],
|
|
4847
4847
|
exSetting: [],
|
|
4848
|
+
settingSummary: [],
|
|
4848
4849
|
keyconfig: [],
|
|
4849
4850
|
|
|
4850
4851
|
preloading: [],
|