Skip to content

Fix bug with preload hooks #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fifty-six merged 1 commit into from
Dec 8, 2025
Merged

Fix bug with preload hooks #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Assembly-CSharp/Preloader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,8 @@ Dictionary<string, List<Func<IEnumerator>>> sceneHooks
}

const string scenePrefix = $"{PreloadBundleName}_";
yield return DoPreloadScenes(toPreload, preloadedObjects, sceneHooks, scenePrefix);
yield return DoPreloadScenes(toPreload, preloadedObjects, sceneHooks: [], scenePrefix, progressAlpha: 0.5f, progressBeta: 0f);
yield return DoPreloadScenes(toPreload: [], preloadedObjects, sceneHooks, scenePrefix: "", progressAlpha: 0.5f, progressBeta: 0.5f);
repackBundle.Unload(true);
}

Expand All @@ -275,7 +276,9 @@ private IEnumerator DoPreloadScenes
Dictionary<string, List<(ModLoader.ModInstance Mod, List<string> Preloads)>> toPreload,
IDictionary<ModLoader.ModInstance, Dictionary<string, Dictionary<string, GameObject>>> preloadedObjects,
Dictionary<string, List<Func<IEnumerator>>> sceneHooks,
string scenePrefix = ""
string scenePrefix = "",
float progressAlpha = 1,
float progressBeta = 0
)
{
List<string> sceneNames = toPreload.Keys.Union(sceneHooks.Keys).ToList();
Expand Down Expand Up @@ -436,10 +439,10 @@ IEnumerator DoLoad(AsyncOperation load)
.Select(x => (x.load?.progress ?? 0) * 0.5f + (x.unload?.progress ?? 0) * 0.5f)
.Average();

progressBar.Progress = sceneProgressAverage;
progressBar.Progress = (sceneProgressAverage * progressAlpha + progressBeta);
}

progressBar.Progress = 1;
progressBar.Progress = (1 * progressAlpha + progressBeta);
}

/// <summary>
Expand Down