From e61958cb2e2478de77d6ecc2063e12f374b4c7f3 Mon Sep 17 00:00:00 2001 From: Katboi01 Date: Wed, 24 May 2023 01:08:50 +0200 Subject: [PATCH] Deleted "RuntimeInitializer.cs". Improved Face loading performance. --- .../UmaDatabase/UmaDatabaseController.cs | 9 +- Assets/Scripts/UmaViewerBuilder.cs | 2 +- .../Gallop/DereScript/RuntimeInitializer.cs | 161 ------------------ .../DereScript/RuntimeInitializer.cs.meta | 13 -- 4 files changed, 6 insertions(+), 179 deletions(-) delete mode 100644 Assets/Scripts/umamusume/Gallop/DereScript/RuntimeInitializer.cs delete mode 100644 Assets/Scripts/umamusume/Gallop/DereScript/RuntimeInitializer.cs.meta diff --git a/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs b/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs index 6a754ca..4746268 100644 --- a/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs +++ b/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs @@ -98,15 +98,15 @@ public class UmaDatabaseController static IEnumerable ReadMeta(SqliteConnection conn) { - List entries = new List(); SqliteCommand sqlite_cmd = conn.CreateCommand(); sqlite_cmd.CommandText = "SELECT m,n,h,c,d FROM a"; SqliteDataReader sqlite_datareader = sqlite_cmd.ExecuteReader(); while (sqlite_datareader.Read()) { + UmaDatabaseEntry entry = null; try { - UmaDatabaseEntry entry = new UmaDatabaseEntry() + entry = new UmaDatabaseEntry() { Type = (UmaFileType)Enum.Parse(typeof(UmaFileType), sqlite_datareader["m"] as String), Name = sqlite_datareader["n"] as String, @@ -114,11 +114,12 @@ public class UmaDatabaseController Checksum = sqlite_datareader["c"].ToString(), Prerequisites = sqlite_datareader["d"] as String }; - entries.Add(entry); } catch(Exception e) { Debug.LogError("Error caught: " + e); } + + if (entry != null) + yield return entry; } - return entries; } static IEnumerable ReadCharaMaster(SqliteConnection conn) diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 7e60cba..bb73e5f 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -1367,7 +1367,7 @@ public class UmaViewerBuilder : MonoBehaviour private void LoadFaceMorph(int id, string costumeId) { if (!CurrentUMAContainer.Head) return; - var locatorEntry = Main.AbList.FirstOrDefault(a => a.Name.EndsWith("3d/animator/drivenkeylocator")); + var locatorEntry = Main.AbList.FirstOrDefault(a => a.Name == "3d/animator/drivenkeylocator"); var bundle = AssetBundle.LoadFromFile(locatorEntry.FilePath); Main.LoadedBundles.Add(locatorEntry.Name, bundle); var locator = Instantiate(bundle.LoadAsset("DrivenKeyLocator"), CurrentUMAContainer.transform) as GameObject; diff --git a/Assets/Scripts/umamusume/Gallop/DereScript/RuntimeInitializer.cs b/Assets/Scripts/umamusume/Gallop/DereScript/RuntimeInitializer.cs deleted file mode 100644 index b98b0c8..0000000 --- a/Assets/Scripts/umamusume/Gallop/DereScript/RuntimeInitializer.cs +++ /dev/null @@ -1,161 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class RuntimeInitializer : MonoBehaviour -{ - // Use this for initialization - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } - - private void OnDestroy() - { -#if UNITY_EDITOR -#elif UNITY_STANDALONE - int isfull = Screen.fullScreen ? 1 : 0; - SaveManager.SetInt("ScreenMode", isfull); - if(isfull == 0) - { - SaveManager.SetInt("ScreenWidth", Screen.width); - SaveManager.SetInt("ScreenHeight", Screen.height); - } - SaveManager.Save(); -#endif - } - - /// - /// 明示的に初期化する場合 - /// - public static void CallInitialize() - { - InitializeBeforeSceneLoad(); - } - - //[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)] - private static void InitializeBeforeSceneLoad() - { - SaveManager.GetString("先にセーブデータを作成します"); - -#if UNITY_EDITOR -#elif UNITY_STANDALONE - //画面の解像度を設定する - int isFullScreen = SaveManager.GetInt("ScreenMode", 1); - if(isFullScreen == 1) - { - int width = Screen.currentResolution.width; - int height = Screen.currentResolution.height; - - Screen.SetResolution(width, height, true); - - SaveManager.SetInt("ScreenWidth", width); - SaveManager.SetInt("ScreenHeight", height); - } - else - { - int width = SaveManager.GetInt("ScreenWidth", 1280); - int height = SaveManager.GetInt("ScreenHeight", 720); - - Screen.SetResolution(width, height, false); - - SaveManager.SetInt("ScreenWidth", width); - SaveManager.SetInt("ScreenHeight", height); - } - - SaveManager.SetInt("ScreenMode", isFullScreen); - SaveManager.Save(); -#endif - - //フレームレートの設定を行う - int DontSync = SaveManager.GetInt("vSyncSetting", 1); //デフォルトは垂直同期無し - if (DontSync == 1) - { - QualitySettings.vSyncCount = 0; - int FrameRate = SaveManager.GetInt("FrameRate", 1); //デフォルト60 - switch (FrameRate) - { - case 0: - Application.targetFrameRate = 30; - break; - case 1: - //Every VBlank(60fps) - Application.targetFrameRate = 60; - break; - case 2: - //Every VBlank(120fps) - Application.targetFrameRate = 120; - break; - } - SaveManager.SetInt("FrameRate", FrameRate); - } - else - { - QualitySettings.vSyncCount = 1; - int FrameRate = SaveManager.GetInt("FrameRate", 1); //デフォルト60 - switch (FrameRate) - { - case 0: - //Every Second VBlank(60fpsの半分) - QualitySettings.vSyncCount = 2; - Application.targetFrameRate = 60; - break; - case 1: - //Every VBlank(60fps) - Application.targetFrameRate = 60; - break; - case 2: - //Every VBlank(120fps) - Application.targetFrameRate = 120; - break; - } - SaveManager.SetInt("FrameRate", FrameRate); - } - SaveManager.SetInt("vSyncSetting", DontSync); - SaveManager.Save(); - - - // ScriptableObjectテーブルから情報を取得し設定する。 - var table = Resources.Load("InitializerTable") as InitializerTable; - if (table != null) - { - GameObject obj1 = GameObject.Find("AssetManager"); - if (obj1 == null) - { - GameObject assetManager = Instantiate(table.AssetManager); - assetManager.name = assetManager.name.Replace("(Clone)", ""); - GameObject.DontDestroyOnLoad(assetManager); - } - - GameObject obj2 = GameObject.Find("ViewLauncher"); - if (obj2 == null) - { - GameObject viewLauncher = Instantiate(table.ViewLauncher); - viewLauncher.name = viewLauncher.name.Replace("(Clone)", ""); - GameObject.DontDestroyOnLoad(viewLauncher); - } - - GameObject obj3 = GameObject.Find("UIManager"); - if (obj3 == null) - { - GameObject uiManager = Instantiate(table.UIManager); - uiManager.name = uiManager.name.Replace("(Clone)", ""); - GameObject.DontDestroyOnLoad(uiManager); - } - - GameObject obj4 = GameObject.Find("ResourceManager"); - if (obj4 == null) - { - GameObject resourceManager = Instantiate(table.ResourcesManager); - resourceManager.name = resourceManager.name.Replace("(Clone)", ""); - GameObject.DontDestroyOnLoad(resourceManager); - } - } - } -} diff --git a/Assets/Scripts/umamusume/Gallop/DereScript/RuntimeInitializer.cs.meta b/Assets/Scripts/umamusume/Gallop/DereScript/RuntimeInitializer.cs.meta deleted file mode 100644 index 7046213..0000000 --- a/Assets/Scripts/umamusume/Gallop/DereScript/RuntimeInitializer.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: ab30c2ca30e1a144c97b8e0cc5c3d316 -timeCreated: 1535288250 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: