danoniplus 46.6.0 → 46.6.2
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 +10 -8
- package/js/lib/danoni_constants.js +7 -1
- 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/04/
|
|
7
|
+
* Revised : 2026/04/12
|
|
8
8
|
*
|
|
9
9
|
* https://github.com/cwtickle/danoniplus
|
|
10
10
|
*/
|
|
11
|
-
const g_version = `Ver 46.6.
|
|
12
|
-
const g_revisedDate = `2026/04/
|
|
11
|
+
const g_version = `Ver 46.6.2`;
|
|
12
|
+
const g_revisedDate = `2026/04/12`;
|
|
13
13
|
|
|
14
14
|
// カスタム用バージョン (danoni_custom.js 等で指定可)
|
|
15
15
|
let g_localVersion = ``;
|
|
@@ -1206,7 +1206,7 @@ const safeExecuteCustomHooks = (_hookName, _funcArray, ...args) => {
|
|
|
1206
1206
|
} else if (errorCache && !errorCache[index]?.has(func)) {
|
|
1207
1207
|
// ループがある場合のエラー処理(初回のみ)
|
|
1208
1208
|
console.group(`${unEscapeEmoji(g_emojiObj.crossMark)} Custom Function Error: [${_hookName}] (Index: ${index}${func.name ? `, Func: ${func.name}` : ``})`);
|
|
1209
|
-
console.error(`${unEscapeEmoji(g_emojiObj.policeLight)} [${
|
|
1209
|
+
console.error(`${unEscapeEmoji(g_emojiObj.policeLight)} [${g_errorFrames[_hookName]()} Frame] ${g_msgObj.customFunctionError}`, e);
|
|
1210
1210
|
console.groupEnd();
|
|
1211
1211
|
errorCache[index] = new Set();
|
|
1212
1212
|
errorCache[index].add(func);
|
|
@@ -15085,8 +15085,10 @@ const resultInit = () => {
|
|
|
15085
15085
|
const transitionData = g_resultObj.gaugeTransition;
|
|
15086
15086
|
|
|
15087
15087
|
for (let i = 0; i < transitionData?.length; i++) {
|
|
15088
|
-
|
|
15089
|
-
|
|
15088
|
+
if (i === 0 || transitionData[i - 1][1] !== transitionData[i][1]) {
|
|
15089
|
+
frame.push(transitionData[i][0] - startFrame);
|
|
15090
|
+
life.push(transitionData[i][1]);
|
|
15091
|
+
}
|
|
15090
15092
|
}
|
|
15091
15093
|
|
|
15092
15094
|
frame.push(playingFrame);
|
|
@@ -15097,11 +15099,11 @@ const resultInit = () => {
|
|
|
15097
15099
|
context.lineWidth = 2;
|
|
15098
15100
|
|
|
15099
15101
|
let preX, preY;
|
|
15100
|
-
const borderY = g_limitObj.gaugeTransitionHeight - g_workObj.lifeBorder * g_limitObj.gaugeTransitionHeight / g_headerObj.maxLifeVal;
|
|
15102
|
+
const borderY = (g_limitObj.gaugeTransitionHeight - 2) - g_workObj.lifeBorder * (g_limitObj.gaugeTransitionHeight - 2) / g_headerObj.maxLifeVal + 1;
|
|
15101
15103
|
|
|
15102
15104
|
for (let i = 0; i < frame.length; i++) {
|
|
15103
15105
|
const x = frame[i] * g_limitObj.gaugeTransitionWidth / playingFrame;
|
|
15104
|
-
const y = g_limitObj.gaugeTransitionHeight - life[i] * g_limitObj.gaugeTransitionHeight / g_headerObj.maxLifeVal;
|
|
15106
|
+
const y = (g_limitObj.gaugeTransitionHeight - 2) - life[i] * (g_limitObj.gaugeTransitionHeight - 2) / g_headerObj.maxLifeVal + 1;
|
|
15105
15107
|
|
|
15106
15108
|
if (i === 0) {
|
|
15107
15109
|
context.beginPath();
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*
|
|
6
6
|
* Source by tickle
|
|
7
7
|
* Created : 2019/11/19
|
|
8
|
-
* Revised : 2026/04/
|
|
8
|
+
* Revised : 2026/04/12 (v46.6.2)
|
|
9
9
|
*
|
|
10
10
|
* https://github.com/cwtickle/danoniplus
|
|
11
11
|
*/
|
|
@@ -5036,6 +5036,12 @@ const g_errorCache = {
|
|
|
5036
5036
|
'g_customJsObj.resultEnterFrame': [],
|
|
5037
5037
|
};
|
|
5038
5038
|
|
|
5039
|
+
const g_errorFrames = {
|
|
5040
|
+
'g_customJsObj.titleEnterFrame': () => g_scoreObj.titleFrameNum,
|
|
5041
|
+
'g_customJsObj.mainEnterFrame': () => g_scoreObj.baseFrame,
|
|
5042
|
+
'g_customJsObj.resultEnterFrame': () => g_scoreObj.resultFrameNum,
|
|
5043
|
+
};
|
|
5044
|
+
|
|
5039
5045
|
/**
|
|
5040
5046
|
* 従来のカスタム関数をg_customJsObj, g_skinJsObjへ追加
|
|
5041
5047
|
* - customjsファイルを読み込んだ直後にこの関数を呼び出している
|