From 3e57846c0e090da4574f4fab9b537dc4be6a8487 Mon Sep 17 00:00:00 2001 From: katboi01 <59540382+katboi01@users.noreply.github.com> Date: Thu, 22 Dec 2022 00:21:19 +0100 Subject: [PATCH] Fixed launch without data files changed load order to fix error log on missing data files --- Assets/Scripts/Manifest/ManifestDB.cs | 8 ++++--- Assets/Scripts/UmaViewerUI.cs.meta | 2 +- Packages/packages-lock.json | 24 ++++++++++---------- ProjectSettings/PackageManagerSettings.asset | 2 +- ProjectSettings/ProjectVersion.txt | 4 ++-- 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Assets/Scripts/Manifest/ManifestDB.cs b/Assets/Scripts/Manifest/ManifestDB.cs index 4da06b6..4c6f9a2 100644 --- a/Assets/Scripts/Manifest/ManifestDB.cs +++ b/Assets/Scripts/Manifest/ManifestDB.cs @@ -13,10 +13,11 @@ public class ManifestDB { public SqliteConnection MetaDB; public static string DBPath; - public const string DefaultDBPath = "umamusume/meta"; public Action callback; - public ManifestDB(string DBPath = DefaultDBPath) + + public ManifestDB() { + string DBPath = $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "Low"}\\Cygames\\umamusume\\meta"; ManifestDB.DBPath = DBPath; if (File.Exists(DBPath)) { @@ -25,6 +26,7 @@ public class ManifestDB } else { + Directory.CreateDirectory(Path.GetDirectoryName(DBPath)); SqliteConnection.CreateFile(DBPath); MetaDB = new SqliteConnection($@"Data Source={DBPath}"); MetaDB.Open(); @@ -51,7 +53,7 @@ public class ManifestDB callback?.Invoke("Checking Resource Version"); yield return UpdateMetaDB(); yield return UpdateMasterDB(); - callback?.Invoke($"Done"); + callback?.Invoke($"Done. Please restart the application."); } //umamusume uses the manifest file to generate meta database. diff --git a/Assets/Scripts/UmaViewerUI.cs.meta b/Assets/Scripts/UmaViewerUI.cs.meta index cbda223..a4ffec6 100644 --- a/Assets/Scripts/UmaViewerUI.cs.meta +++ b/Assets/Scripts/UmaViewerUI.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: -3 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 1ebb68e..99b6b22 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -5,7 +5,7 @@ "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.assetbundlebrowser": { "version": "https://github.com/Unity-Technologies/AssetBundles-Browser.git", @@ -21,14 +21,14 @@ "dependencies": { "com.unity.services.core": "1.0.1" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.formats.fbx": { "version": "4.1.2", @@ -38,7 +38,7 @@ "com.unity.timeline": "1.5.2", "com.autodesk.fbx": "4.1.1" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ide.rider": { "version": "2.0.7", @@ -47,7 +47,7 @@ "dependencies": { "com.unity.test-framework": "1.1.1" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { "version": "2.0.16", @@ -56,14 +56,14 @@ "dependencies": { "com.unity.test-framework": "1.1.9" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.postprocessing": { "version": "3.2.2", @@ -72,7 +72,7 @@ "dependencies": { "com.unity.modules.physics": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.services.core": { "version": "1.0.1", @@ -81,7 +81,7 @@ "dependencies": { "com.unity.modules.unitywebrequest": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.test-framework": { "version": "1.1.31", @@ -92,7 +92,7 @@ "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { "version": "3.0.6", @@ -101,7 +101,7 @@ "dependencies": { "com.unity.ugui": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.timeline": { "version": "1.5.2", @@ -113,7 +113,7 @@ "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ugui": { "version": "1.0.0", diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index bc93024..be4a797 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -20,7 +20,7 @@ MonoBehaviour: m_Registries: - m_Id: main m_Name: - m_Url: https://packages.unity.cn + m_Url: https://packages.unity.com m_Scopes: [] m_IsDefault: 1 m_Capabilities: 7 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 9b8fc7a..3598ae5 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.24f1c2 -m_EditorVersionWithRevision: 2020.3.24f1c2 (f3616f7ef48a) +m_EditorVersion: 2020.3.28f1 +m_EditorVersionWithRevision: 2020.3.28f1 (f5400f52e03f)