danoniplus 33.1.2 → 33.1.4
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 -10
- 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/08/
|
|
7
|
+
* Revised : 2023/08/19
|
|
8
8
|
*
|
|
9
9
|
* https://github.com/cwtickle/danoniplus
|
|
10
10
|
*/
|
|
11
|
-
const g_version = `Ver 33.1.
|
|
12
|
-
const g_revisedDate = `2023/08/
|
|
11
|
+
const g_version = `Ver 33.1.4`;
|
|
12
|
+
const g_revisedDate = `2023/08/19`;
|
|
13
13
|
|
|
14
14
|
// カスタム用バージョン (danoni_custom.js 等で指定可)
|
|
15
15
|
let g_localVersion = ``;
|
|
@@ -7766,13 +7766,15 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
|
|
|
7766
7766
|
});
|
|
7767
7767
|
|
|
7768
7768
|
// キー変化定義
|
|
7769
|
-
obj.keychFrames = [
|
|
7770
|
-
obj.keychTarget = [
|
|
7769
|
+
obj.keychFrames = [];
|
|
7770
|
+
obj.keychTarget = [];
|
|
7771
7771
|
if (hasVal(getRefData(`keych`, `${scoreIdHeader}_data`))) {
|
|
7772
7772
|
const keychdata = splitLF2(getRefData(`keych`, `${scoreIdHeader}_data`), `,`);
|
|
7773
|
-
obj.keychFrames.push(...keychdata.filter((val, j) => j % 2 === 0));
|
|
7773
|
+
obj.keychFrames.push(...(keychdata.filter((val, j) => j % 2 === 0)).map(val => val === `0` ? 0 : calcFrame(val)));
|
|
7774
7774
|
obj.keychTarget.push(...keychdata.filter((val, j) => j % 2 === 1));
|
|
7775
7775
|
}
|
|
7776
|
+
obj.keychFrames.unshift(0);
|
|
7777
|
+
obj.keychTarget.unshift(`0`);
|
|
7776
7778
|
|
|
7777
7779
|
return obj;
|
|
7778
7780
|
};
|
|
@@ -10900,10 +10902,10 @@ const resultInit = _ => {
|
|
|
10900
10902
|
drawText(`ESULT`, { x: 57, dy: -5, hy: 0, siz: 25 });
|
|
10901
10903
|
drawText(`${g_lblNameObj.dancing}${g_lblNameObj.star}${g_lblNameObj.onigiri}`,
|
|
10902
10904
|
{ x: 280, dy: -15, hy: 0, siz: 20, color: `#999999`, align: C_ALIGN_CENTER });
|
|
10903
|
-
drawText(mTitleForView[0], { hy: 1 });
|
|
10904
|
-
drawText(mTitleForView[1], { hy: 2 });
|
|
10905
|
-
drawText(`📝 ${g_headerObj.tuning} / 🎵 ${artistName}`, { hy: mTitleForView[1] !== `` ? 3 : 2, siz: 12 });
|
|
10906
|
-
drawText(difDataForImage, { hy: 4 });
|
|
10905
|
+
drawText(unEscapeHtml(mTitleForView[0]), { hy: 1 });
|
|
10906
|
+
drawText(unEscapeHtml(mTitleForView[1]), { hy: 2 });
|
|
10907
|
+
drawText(`📝 ${unEscapeHtml(g_headerObj.tuning)} / 🎵 ${unEscapeHtml(artistName)}`, { hy: mTitleForView[1] !== `` ? 3 : 2, siz: 12 });
|
|
10908
|
+
drawText(unEscapeHtml(difDataForImage), { hy: 4 });
|
|
10907
10909
|
drawText(playStyleData, { hy: 5 });
|
|
10908
10910
|
|
|
10909
10911
|
Object.keys(jdgScoreObj).forEach(score => {
|