From 6cfebad198d5e8bea6f57495b84547b06d60b3c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=A6=E5=8F=B3=E7=9C=8B?= <1918891542@qq.com> Date: Tue, 20 Jun 2023 16:57:11 +0800 Subject: [PATCH] add datatype --- Assets/Scripts/UmaDatabase/UmaDataTypes.cs | 2 + Packages/manifest.json | 3 +- Packages/packages-lock.json | 48 ++++++-------------- ProjectSettings/PackageManagerSettings.asset | 2 +- ProjectSettings/ProjectVersion.txt | 4 +- 5 files changed, 21 insertions(+), 38 deletions(-) diff --git a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs index 76c63fd..1dce455 100644 --- a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs +++ b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs @@ -151,6 +151,7 @@ public enum UmaFileType gacha, gachaselect, guide, + heroes, home, imageeffect, item, @@ -160,6 +161,7 @@ public enum UmaFileType manifest, manifest2, manifest3, + mapevent, master, minigame, mob, diff --git a/Packages/manifest.json b/Packages/manifest.json index 389237c..a4c6539 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,7 +1,6 @@ { "dependencies": { - "com.unity.collab-proxy": "1.17.0", - "com.unity.formats.fbx": "4.1.2", + "com.unity.formats.fbx": "5.0.0", "com.unity.ide.rider": "2.0.7", "com.unity.ide.visualstudio": "2.0.16", "com.unity.ide.vscode": "1.2.5", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index d589c4a..f2df686 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,37 +1,28 @@ { "dependencies": { "com.autodesk.fbx": { - "version": "4.1.1", + "version": "5.0.0", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.unity.collab-proxy": { - "version": "1.17.0", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.services.core": "1.0.1" - }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.formats.fbx": { - "version": "4.1.2", + "version": "5.0.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.timeline": "1.5.2", - "com.autodesk.fbx": "4.1.1" + "com.unity.timeline": "1.7.1", + "com.autodesk.fbx": "5.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ide.rider": { "version": "2.0.7", @@ -40,7 +31,7 @@ "dependencies": { "com.unity.test-framework": "1.1.1" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ide.visualstudio": { "version": "2.0.16", @@ -49,14 +40,14 @@ "dependencies": { "com.unity.test-framework": "1.1.9" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ide.vscode": { "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.postprocessing": { "version": "3.2.2", @@ -65,16 +56,7 @@ "dependencies": { "com.unity.modules.physics": "1.0.0" }, - "url": "https://packages.unity.com" - }, - "com.unity.services.core": { - "version": "1.0.1", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0" - }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.test-framework": { "version": "1.1.31", @@ -85,7 +67,7 @@ "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.textmeshpro": { "version": "3.0.6", @@ -94,10 +76,10 @@ "dependencies": { "com.unity.ugui": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.timeline": { - "version": "1.5.2", + "version": "1.7.1", "depth": 1, "source": "registry", "dependencies": { @@ -106,7 +88,7 @@ "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ugui": { "version": "1.0.0", diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index be4a797..bc93024 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.com + m_Url: https://packages.unity.cn m_Scopes: [] m_IsDefault: 1 m_Capabilities: 7 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 3598ae5..9b8fc7a 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.28f1 -m_EditorVersionWithRevision: 2020.3.28f1 (f5400f52e03f) +m_EditorVersion: 2020.3.24f1c2 +m_EditorVersionWithRevision: 2020.3.24f1c2 (f3616f7ef48a)