diff --git a/Assets/ThirdPlugins/Easy Save 3/Scripts/ES3Prefab.cs b/Assets/ThirdPlugins/Easy Save 3/Scripts/ES3Prefab.cs index c71d9b40..bdd28194 100644 --- a/Assets/ThirdPlugins/Easy Save 3/Scripts/ES3Prefab.cs +++ b/Assets/ThirdPlugins/Easy Save 3/Scripts/ES3Prefab.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using UnityEngine; using ES3Internal; +using UnityEditor.Experimental.SceneManagement; #if UNITY_EDITOR using UnityEditor; #endif @@ -90,7 +91,7 @@ namespace ES3Internal public void GeneratePrefabReferences() { #if UNITY_2018_3_OR_NEWER - if (this.gameObject.scene.name != null || UnityEditor.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage() != null) + if (this.gameObject.scene.name != null || PrefabStageUtility.GetCurrentPrefabStage() != null) #else if (this.gameObject.scene.name != null) #endif diff --git a/Packages/manifest.json b/Packages/manifest.json index 46f0fcb5..c5ba926f 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,18 +1,18 @@ { "dependencies": { - "com.unity.2d.animation": "7.0.6", - "com.unity.2d.pixel-perfect": "5.0.1", - "com.unity.2d.psdimporter": "6.0.4", + "com.unity.2d.animation": "3.2.18", + "com.unity.2d.pixel-perfect": "2.1.0", + "com.unity.2d.psdimporter": "2.1.11", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "7.0.5", + "com.unity.2d.spriteshape": "3.0.18", "com.unity.2d.tilemap": "1.0.0", - "com.unity.collab-proxy": "1.17.2", - "com.unity.ide.rider": "3.0.15", + "com.unity.collab-proxy": "1.14.18", + "com.unity.ide.rider": "1.2.1", "com.unity.ide.visualstudio": "2.0.16", "com.unity.ide.vscode": "1.2.5", - "com.unity.test-framework": "1.1.31", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.4", + "com.unity.test-framework": "1.1.33", + "com.unity.textmeshpro": "2.1.6", + "com.unity.timeline": "1.2.18", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index b5d3ebc9..2e62ec0a 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,11 +1,12 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "7.0.6", + "version": "3.2.18", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "6.0.3", + "com.unity.2d.common": "2.1.2", + "com.unity.mathematics": "1.1.0", "com.unity.2d.sprite": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.uielements": "1.0.0" @@ -13,38 +14,36 @@ "url": "https://packages.unity.cn" }, "com.unity.2d.common": { - "version": "6.0.3", + "version": "2.1.2", "depth": 1, "source": "registry", "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.mathematics": "1.1.0", - "com.unity.modules.uielements": "1.0.0", - "com.unity.burst": "1.5.1" + "com.unity.modules.uielements": "1.0.0" }, "url": "https://packages.unity.cn" }, "com.unity.2d.path": { - "version": "5.0.2", + "version": "2.1.1", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.cn" }, "com.unity.2d.pixel-perfect": { - "version": "5.0.1", + "version": "2.1.0", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.cn" }, "com.unity.2d.psdimporter": { - "version": "6.0.4", + "version": "2.1.11", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.animation": "7.0.6", - "com.unity.2d.common": "6.0.3", + "com.unity.2d.common": "2.1.2", + "com.unity.2d.animation": "3.2.17", "com.unity.2d.sprite": "1.0.0" }, "url": "https://packages.unity.cn" @@ -56,14 +55,13 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "7.0.5", + "version": "3.0.18", "depth": 0, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.2d.common": "6.0.3", - "com.unity.2d.path": "5.0.2", - "com.unity.modules.physics2d": "1.0.0" + "com.unity.2d.common": "2.1.0", + "com.unity.2d.path": "2.1.1" }, "url": "https://packages.unity.cn" }, @@ -73,22 +71,11 @@ "source": "builtin", "dependencies": {} }, - "com.unity.burst": { - "version": "1.6.6", - "depth": 2, - "source": "registry", - "dependencies": { - "com.unity.mathematics": "1.2.1" - }, - "url": "https://packages.unity.cn" - }, "com.unity.collab-proxy": { - "version": "1.17.2", + "version": "1.14.18", "depth": 0, "source": "registry", - "dependencies": { - "com.unity.services.core": "1.0.1" - }, + "dependencies": {}, "url": "https://packages.unity.cn" }, "com.unity.ext.nunit": { @@ -99,11 +86,11 @@ "url": "https://packages.unity.cn" }, "com.unity.ide.rider": { - "version": "3.0.15", + "version": "1.2.1", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.6" + "com.unity.test-framework": "1.1.1" }, "url": "https://packages.unity.cn" }, @@ -124,32 +111,14 @@ "url": "https://packages.unity.cn" }, "com.unity.mathematics": { - "version": "1.2.6", + "version": "1.1.0", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.cn" }, - "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.cn" - }, - "com.unity.services.core": { - "version": "1.4.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.modules.androidjni": "1.0.0" - }, - "url": "https://packages.unity.cn" - }, "com.unity.test-framework": { - "version": "1.1.31", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { @@ -160,7 +129,7 @@ "url": "https://packages.unity.cn" }, "com.unity.textmeshpro": { - "version": "3.0.6", + "version": "2.1.6", "depth": 0, "source": "registry", "dependencies": { @@ -169,7 +138,7 @@ "url": "https://packages.unity.cn" }, "com.unity.timeline": { - "version": "1.6.4", + "version": "1.2.18", "depth": 0, "source": "registry", "dependencies": { @@ -322,18 +291,6 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index d5797253..b9623c16 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.6f1c1 -m_EditorVersionWithRevision: 2021.3.6f1c1 (07401303b748) +m_EditorVersion: 2019.4.40f1c1 +m_EditorVersionWithRevision: 2019.4.40f1c1 (bcafa7f80565)