From a2e7e197c347598b861977aae84b5a13a55a33c4 Mon Sep 17 00:00:00 2001 From: yuuki <> Date: Thu, 21 Mar 2024 00:16:44 +0900 Subject: [PATCH] =?UTF-8?q?utf-8=E3=81=A7=E5=9B=BA=E5=AE=9A=E3=81=97?= =?UTF-8?q?=E6=AD=8C=E8=A9=9E=E3=81=AE=E6=96=87=E5=AD=97=E5=8C=96=E3=81=91?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/src/js/controller.js | 2 +- public/src/js/importsongs.js | 4 ++-- public/src/js/loadsong.js | 4 ++-- public/src/js/songselect.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/src/js/controller.js b/public/src/js/controller.js index 7f0c4b2..bebb6f5 100644 --- a/public/src/js/controller.js +++ b/public/src/js/controller.js @@ -266,7 +266,7 @@ class Controller{ var chartDiff = this.selectedSong.difficulty chart = chart[chartDiff] } - this.addPromise(promises, chart.read(this.selectedSong.type === "tja" ? "sjis" : undefined).then(data => { + this.addPromise(promises, chart.read(this.selectedSong.type === "tja" ? "utf-8" : undefined).then(data => { this.songData = data.replace(/\0/g, "").split("\n") return Promise.resolve() }), chart.url) diff --git a/public/src/js/importsongs.js b/public/src/js/importsongs.js index 5fd673b..ddf84b5 100644 --- a/public/src/js/importsongs.js +++ b/public/src/js/importsongs.js @@ -146,7 +146,7 @@ var file = fileObj.file var level = fileObj.level var name = file.name.toLowerCase() - return file.read(name === "songtitle.txt" ? undefined : "sjis").then(data => { + return file.read(name === "songtitle.txt" ? undefined : "utf-8").then(data => { var data = data.replace(/\0/g, "").split("\n") var category if(name === "genre.ini"){ @@ -228,7 +228,7 @@ var category = fileObj.category var category_id = fileObj.category_id if(!this.limited){ - var filePromise = file.read("sjis") + var filePromise = file.read("utf-8") }else{ var filePromise = Promise.resolve() } diff --git a/public/src/js/loadsong.js b/public/src/js/loadsong.js index 534eb1e..1166862 100644 --- a/public/src/js/loadsong.js +++ b/public/src/js/loadsong.js @@ -135,7 +135,7 @@ class LoadSong{ chart = chart[chartDiff] } if(chart){ - this.addPromise(chart.read(song.type === "tja" ? "sjis" : "").then(data => { + this.addPromise(chart.read(song.type === "tja" ? "utf-8" : "").then(data => { this.songData = data.replace(/\0/g, "").split("\n") }), chart.url) }else{ @@ -309,7 +309,7 @@ class LoadSong{ if(song.type === "tja" || !chart || !chart.separateDiff || !chart[chartDiff]){ this.startMultiplayer() }else{ - chart[chartDiff].read(song.type === "tja" ? "sjis" : "").then(data => { + chart[chartDiff].read(song.type === "tja" ? "utf-8" : "").then(data => { this.song2Data = data.replace(/\0/g, "").split("\n") }, () => {}).then(() => { this.startMultiplayer() diff --git a/public/src/js/songselect.js b/public/src/js/songselect.js index 8fd39f5..7cd008b 100644 --- a/public/src/js/songselect.js +++ b/public/src/js/songselect.js @@ -2681,7 +2681,7 @@ class SongSelect{ var currentSong = this.songs[selectedSong] var file = currentSong.chart var importSongs = new ImportSongs(false, assets.otherFiles) - return file.read(currentSong.type === "tja" ? "sjis" : "").then(data => { + return file.read(currentSong.type === "tja" ? "utf-8" : "").then(data => { currentSong.chart = new CachedFile(data, file) return importSongs[currentSong.type === "tja" ? "addTja" : "addOsu"]({ file: currentSong.chart,