gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

updater is done

Browse Source
This commit is contained in:
Yoshman29
2022-12-20 22:22:35 +01:00
parent f85ee1cfe9
commit 41ebe30677
4 changed files with 60 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/updating/UpdateScreen.hx
+37
View File
@@ -1,5 +1,7 @@
package funkin.updating;
import flixel.util.FlxDestroyUtil;
import funkin.ui.FunkinText;
import funkin.menus.TitleState;
import flixel.math.FlxRect;
import flixel.system.FlxSound;
@@ -15,8 +17,13 @@ class UpdateScreen extends MusicBeatState {
public var bf:FlxSprite;
public var done:Bool = false;
public var elapsedTime:Float = 0;
public var lerpSpeed:Float = 0;
public var overSound:FlxSound;
public var generalProgress:FunkinText;
public var partProgress:FunkinText;
public function new(check:UpdateCheckCallback) {
super(false);
updater = new AsyncUpdater(check.updates);
@@ -39,6 +46,16 @@ class UpdateScreen extends MusicBeatState {
bf.screenCenter();
add(bf);
partProgress = new FunkinText(0, progressBar.y, FlxG.width, "-\n-", 20);
partProgress.y -= partProgress.height;
partProgress.alignment = CENTER;
add(partProgress);
generalProgress = new FunkinText(0, partProgress.y - 10, FlxG.width, "", 32);
generalProgress.y -= generalProgress.height;
generalProgress.alignment = CENTER;
add(generalProgress);
overSound = FlxG.sound.load(Paths.sound('gameOverEnd'));
updater.execute();
@@ -47,17 +64,30 @@ class UpdateScreen extends MusicBeatState {
public override function update(elapsed:Float) {
super.update(elapsed);
elapsedTime += elapsed;
progressBar.y = FlxG.height - (60 + (Math.sin(elapsedTime * Math.PI / 2) * 15));
if (done) return;
var prog = updater.progress;
lerpSpeed = lerp(lerpSpeed, prog.downloadSpeed, 1/16);
switch(prog.step) {
case PREPARING:
progressBar.value = 0;
generalProgress.text = "Preparing update installation... (1/4)";
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)";
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)";
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)";
}
var rect = new FlxRect(0, (1 - (progressBar.value / 4)) * bf.frameHeight, bf.frameWidth, 0);
rect.height = bf.frameHeight - rect.y;
@@ -68,9 +98,16 @@ class UpdateScreen extends MusicBeatState {
// update is done, play bf's anim
FlxG.sound.music.stop();
overSound.play();
remove(generalProgress);
remove(partProgress);
generalProgress = FlxDestroyUtil.destroy(generalProgress);
partProgress = FlxDestroyUtil.destroy(partProgress);
bf.animation.curAnim.frameRate = 24;
bf.animation.play("loading-anim", true, false, 1);
bf.alpha = 1;
FlxG.camera.fade(0xFF000000, overSound.length / 1000, false, function() {
if (updater.executableReplaced) {
// the executable has been replaced, restart the game entirely