From 510a97069d89ae65f13d5e3696dc59946beb7a79 Mon Sep 17 00:00:00 2001 From: katboi01 Date: Thu, 7 Nov 2024 03:34:58 +0100 Subject: [PATCH] Added check for existing files to improve startup time and show more accurate download progress --- .../Scripts/UmaDatabase/UmaDatabaseEntry.cs | 2 +- Assets/Scripts/UmaViewerDownload.cs | 22 ++++++++++++++----- Assets/Scripts/UmaViewerMain.cs | 6 ----- ProjectSettings/ProjectSettings.asset | 10 +++++++-- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/Assets/Scripts/UmaDatabase/UmaDatabaseEntry.cs b/Assets/Scripts/UmaDatabase/UmaDatabaseEntry.cs index 51ece4d..d67c50c 100644 --- a/Assets/Scripts/UmaDatabase/UmaDatabaseEntry.cs +++ b/Assets/Scripts/UmaDatabase/UmaDatabaseEntry.cs @@ -29,7 +29,7 @@ public class UmaDatabaseEntry { get { - return $"{Config.Instance.MainPath}/dat/{Url.Substring(0, 2)}/{Url}"; + return $"{Config.Instance.MainPath}\\dat\\{Url.Substring(0, 2)}\\{Url}"; //"\\" is consistent with Directory.GetFiles() } } diff --git a/Assets/Scripts/UmaViewerDownload.cs b/Assets/Scripts/UmaViewerDownload.cs index 6b55c59..936de72 100644 --- a/Assets/Scripts/UmaViewerDownload.cs +++ b/Assets/Scripts/UmaViewerDownload.cs @@ -7,6 +7,7 @@ using UnityEngine.Networking; using static UmaViewerUI; using System.Threading.Tasks; using System.Threading; +using System.Linq; public class UmaViewerDownload : MonoBehaviour { @@ -62,17 +63,18 @@ public class UmaViewerDownload : MonoBehaviour } } - public static IEnumerator DownloadAssets(List entrys, Action callback = null) + public static IEnumerator DownloadAssets(List entries, Action callback = null) { - callback?.Invoke(0, entrys.Count, "DownLoading"); - var percent_num = entrys.Count / 100; - for(int i = 0; i < entrys.Count; i++) + entries = RemoveExistingFilesFromList(entries); + callback?.Invoke(0, entries.Count, "DownLoading"); + var percent_num = entries.Count / 100; + for(int i = 0; i < entries.Count; i++) { - var entry = entrys[i]; + var entry = entries[i]; yield return downloadWaitUntil; if(i % percent_num == 0) { - callback?.Invoke(i, entrys.Count, "DownLoading"); + callback?.Invoke(i, entries.Count, "DownLoading"); } CurrentCoroutinesCount++; semaphore.WaitAsync(); @@ -157,4 +159,12 @@ public class UmaViewerDownload : MonoBehaviour { return $"{ASSET_BASE_URL}/{hash.Substring(0, 2)}/{hash}"; } + + private static List RemoveExistingFilesFromList(List entries) + { + //dictionary is used for best performance + var localFiles = Directory.GetFiles($"{Config.Instance.MainPath.Replace("/","\\")}\\dat\\", "*", SearchOption.AllDirectories).ToDictionary(file => file, file => true); + entries = entries.Where(entry => !localFiles.ContainsKey(entry.Path)).ToList(); + return entries; + } } diff --git a/Assets/Scripts/UmaViewerMain.cs b/Assets/Scripts/UmaViewerMain.cs index 6d3c20f..dfad931 100644 --- a/Assets/Scripts/UmaViewerMain.cs +++ b/Assets/Scripts/UmaViewerMain.cs @@ -210,12 +210,6 @@ public class UmaViewerMain : MonoBehaviour Builder.ShaderList = new List(shaders.LoadAllAssets()); } - public void ChangeAA(int val) - { - - } - - public void OpenUrl(string url) { Application.OpenURL(url); diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 03ff35f..779698a 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 22 + serializedVersion: 23 productGUID: 466286cbc59748b4ca46e7b05d5929c2 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 2.1.15 + bundleVersion: 2.1.16 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -150,6 +150,7 @@ PlayerSettings: m_ColorGamuts: 00000000 targetPixelDensity: 395 resolutionScalingMode: 1 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: @@ -596,8 +597,11 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -756,6 +760,7 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: + vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -799,6 +804,7 @@ PlayerSettings: m_VersionName: apiCompatibilityLevel: 6 activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: []