diff --git a/buildnumber.txt b/buildnumber.txt index 7dbc594e..3dfef23a 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -1596 \ No newline at end of file +1598 \ No newline at end of file diff --git a/source/funkin/updating/AsyncUpdater.hx b/source/funkin/updating/AsyncUpdater.hx index 236748af..61b6fa5b 100644 --- a/source/funkin/updating/AsyncUpdater.hx +++ b/source/funkin/updating/AsyncUpdater.hx @@ -57,6 +57,7 @@ class AsyncUpdater { for(k=>e in files) { var path = '$path$e'; progress.curFile = k+1; + progress.curFileName = e; trace('extracting file ${path}'); var reader = ZipUtils.openZip(path); @@ -65,6 +66,9 @@ class AsyncUpdater { // FileSystem.deleteFile(path); } if (executableReplaced = FileSystem.exists('$path$executableName')) { + progress.curFile = files.length; + progress.curFileName = executableName; + var progPath = Sys.programPath(); var bakFile = '${Path.withoutExtension(progPath)}.bak'; if (FileSystem.exists(bakFile)) diff --git a/source/funkin/updating/UpdateScreen.hx b/source/funkin/updating/UpdateScreen.hx index 557a9b58..37c1719e 100644 --- a/source/funkin/updating/UpdateScreen.hx +++ b/source/funkin/updating/UpdateScreen.hx @@ -79,15 +79,16 @@ class UpdateScreen extends MusicBeatState { partProgress.text = "Creating installation folder and cleaning old update files..."; case DOWNLOADING_ASSETS: progressBar.value = 1 + ((prog.curFile-1+(prog.bytesLoaded/prog.bytesTotal)) / prog.files); - generalProgress.text = "Download update assets... (2/4)"; + generalProgress.text = "Downloading update assets... (2/4)"; partProgress.text = 'Downloading file ${prog.curFileName}\n(${prog.curFile+1}/${prog.files} | ${CoolUtil.getSizeString(prog.bytesLoaded)} / ${CoolUtil.getSizeString(prog.bytesTotal)} | ${CoolUtil.getSizeString(lerpSpeed)}/s)'; case DOWNLOADING_EXECUTABLE: progressBar.value = 2 + (prog.bytesLoaded/prog.bytesTotal); - generalProgress.text = "Download new engine executable... (3/4)"; + generalProgress.text = "Downloading new engine executable... (3/4)"; partProgress.text = 'Downloading ${prog.curFileName}\n(${CoolUtil.getSizeString(prog.bytesLoaded)} / ${CoolUtil.getSizeString(prog.bytesTotal)} | ${CoolUtil.getSizeString(lerpSpeed)}/s)'; case INSTALLING: progressBar.value = 3 + ((prog.curFile-1+(prog.curZipProgress.curFile/prog.curZipProgress.fileCount))/prog.files); generalProgress.text = "Installing new files... (4/4)"; + partProgress.text = 'Installing ${prog.curFileName}\n(${prog.curFile}/${prog.files})'; } var rect = new FlxRect(0, (1 - (progressBar.value / 4)) * bf.frameHeight, bf.frameWidth, 0); rect.height = bf.frameHeight - rect.y;