Merge pull request #204 from HyeokjinKang/re-revert

Revert: 정상화

Author: HyeokjinKang

package.json

@@ -11,7 +11,7 @@
     "build": "tsc",
     "auto-build": "tsc-watch",
     "start": "supervisor dist/index.js",
-    "obfuscate": "javascript-obfuscator public/js/ --output public/js/ --debug-protection true --disable-console-output true --domain-lock 'urlate.coupy.dev' --domain-lock-redirect-url 'urlate.coupy.dev' --numbers-to-expressions true"
+    "obfuscate": "javascript-obfuscator public/js/ --output public/js/ --debug-protection false --disable-console-output true --domain-lock 'urlate.coupy.dev' --domain-lock-redirect-url 'urlate.coupy.dev' --numbers-to-expressions true --self-defending true"
   },
   "author": "Team Croissant",
   "license": "AGPL-3.0-or-later",

public/js/game.js

@@ -485,6 +485,7 @@ document.addEventListener("DOMContentLoaded", () => {
 
 const tracksUpdate = () => {
   let songList = "";
+  let loadedCount = 0;
   for (let i = 0; i < tracks.length; i++) {
     if (tracks[i].type == 3) {
       songList += `<div class="songSelectionContainer songSelectionDisable">
@@ -595,7 +596,8 @@ const tracksUpdate = () => {
             }
           }
         }
-        if (i == tracks.length - 1 && iniMode != -1) {
+        loadedCount++;
+        if (loadedCount == tracks.length && iniMode != -1) {
           loaded++;
           if (loaded == 4) {
             loaded = -1;
@@ -904,11 +906,10 @@ const numberWithCommas = (x) => {
 const gameLoaded = () => {
   if (iniMode == 1) {
     if (localStorage.songNum) {
-      let songNum = Number(localStorage.songNum);
-      songSelection = songNum;
-      difficultySelected(Number(localStorage.difficultySelection ? localStorage.difficultySelection : 0), true);
+      songSelection = Number(localStorage.songNum);
       sortSelected(Number(localStorage.sort ? localStorage.sort : 0), true);
-      songSelected(songNum, true);
+      songSelected(songSelection, true);
+      difficultySelected(Number(localStorage.difficultySelection ? localStorage.difficultySelection : 0), true);
     }
     menuSelected(0);
   } else if (display == 0 && songSelection == -1) {

public/js/play.js

@@ -81,7 +81,6 @@ let tick = new Howl({
 });
 let resultEffect = new Howl({
   src: [`${cdn}/tracks/result.mp3`],
-  html5: true,
   autoplay: false,
   loop: false,
 });

public/js/test.js

@@ -78,7 +78,6 @@ let tick = new Howl({
 });
 let resultEffect = new Howl({
   src: [`${cdn}/tracks/result.mp3`],
-  html5: true,
   autoplay: false,
   loop: false,
 });

public/js/tutorial.js

@@ -79,7 +79,6 @@ let tick = new Howl({
 });
 let resultEffect = new Howl({
   src: [`${cdn}/tracks/result.mp3`],
-  html5: true,
   autoplay: false,
   loop: false,
 });