danoniplus 45.5.8 → 45.5.11
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 +12 -9
- package/jsconfig.json +5 -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/
|
|
7
|
+
* Revised : 2026/04/10
|
|
8
8
|
*
|
|
9
9
|
* https://github.com/cwtickle/danoniplus
|
|
10
10
|
*/
|
|
11
|
-
const g_version = `Ver 45.5.
|
|
12
|
-
const g_revisedDate = `2026/
|
|
11
|
+
const g_version = `Ver 45.5.11`;
|
|
12
|
+
const g_revisedDate = `2026/04/10`;
|
|
13
13
|
|
|
14
14
|
// カスタム用バージョン (danoni_custom.js 等で指定可)
|
|
15
15
|
let g_localVersion = ``;
|
|
@@ -4184,9 +4184,10 @@ const headerConvert = _dosObj => {
|
|
|
4184
4184
|
|
|
4185
4185
|
// ローカルストレージに保存済みのColorType設定からDisplayのColor設定を反映
|
|
4186
4186
|
if (g_localStorage.colorType !== undefined) {
|
|
4187
|
-
g_colorType = g_localStorage.colorType
|
|
4187
|
+
g_colorType = g_keycons.colorTypes.concat(g_keycons.colorSelf).includes(g_localStorage.colorType)
|
|
4188
|
+
? g_localStorage.colorType : `Default`;
|
|
4188
4189
|
if (obj.colorUse) {
|
|
4189
|
-
g_stateObj.d_color = boolToSwitch(g_keycons.colorDefTypes.
|
|
4190
|
+
g_stateObj.d_color = boolToSwitch(g_keycons.colorDefTypes.includes(g_colorType));
|
|
4190
4191
|
}
|
|
4191
4192
|
}
|
|
4192
4193
|
|
|
@@ -14781,8 +14782,10 @@ const resultInit = () => {
|
|
|
14781
14782
|
const transitionData = g_resultObj.gaugeTransition;
|
|
14782
14783
|
|
|
14783
14784
|
for (let i = 0; i < transitionData?.length; i++) {
|
|
14784
|
-
|
|
14785
|
-
|
|
14785
|
+
if (i === 0 || transitionData[i - 1][1] !== transitionData[i][1]) {
|
|
14786
|
+
frame.push(transitionData[i][0] - startFrame);
|
|
14787
|
+
life.push(transitionData[i][1]);
|
|
14788
|
+
}
|
|
14786
14789
|
}
|
|
14787
14790
|
|
|
14788
14791
|
frame.push(playingFrame);
|
|
@@ -14793,11 +14796,11 @@ const resultInit = () => {
|
|
|
14793
14796
|
context.lineWidth = 2;
|
|
14794
14797
|
|
|
14795
14798
|
let preX, preY;
|
|
14796
|
-
const borderY = g_limitObj.gaugeTransitionHeight - g_workObj.lifeBorder * g_limitObj.gaugeTransitionHeight / g_headerObj.maxLifeVal;
|
|
14799
|
+
const borderY = (g_limitObj.gaugeTransitionHeight - 2) - g_workObj.lifeBorder * (g_limitObj.gaugeTransitionHeight - 2) / g_headerObj.maxLifeVal + 1;
|
|
14797
14800
|
|
|
14798
14801
|
for (let i = 0; i < frame.length; i++) {
|
|
14799
14802
|
const x = frame[i] * g_limitObj.gaugeTransitionWidth / playingFrame;
|
|
14800
|
-
const y = g_limitObj.gaugeTransitionHeight - life[i] * g_limitObj.gaugeTransitionHeight / g_headerObj.maxLifeVal;
|
|
14803
|
+
const y = (g_limitObj.gaugeTransitionHeight - 2) - life[i] * (g_limitObj.gaugeTransitionHeight - 2) / g_headerObj.maxLifeVal + 1;
|
|
14801
14804
|
|
|
14802
14805
|
if (i === 0) {
|
|
14803
14806
|
context.beginPath();
|
package/jsconfig.json
CHANGED