From dc47e1dfd2b349da406aab4dd001403a35e860f4 Mon Sep 17 00:00:00 2001 From: zhangjie0072 Date: Mon, 1 Aug 2022 11:45:58 +0800 Subject: [PATCH] update unity to 2021 --- .../Easy Save 3/Scripts/ES3Prefab.cs | 2 +- .../Editor/Brotli/win_x86_64/brotli.exe.meta | 7 -- .../WX-WASM-SDK/Editor/PVRTexToolCLI.exe.meta | 7 -- .../Release/WXTextureMin.exe.meta | 7 -- .../WX-WASM-SDK/Editor/astcenc-avx2.exe.meta | 7 -- .../Editor/astcenc-sse4.1.exe.meta | 7 -- Assets/WX-WASM-SDK/Editor/convert.exe.meta | 7 -- Assets/WX-WASM-SDK/Editor/pngquant.exe.meta | 7 -- Packages/manifest.json | 6 +- Packages/packages-lock.json | 73 +++++++++++++++---- 10 files changed, 62 insertions(+), 68 deletions(-) delete mode 100755 Assets/WX-WASM-SDK/Editor/Brotli/win_x86_64/brotli.exe.meta delete mode 100755 Assets/WX-WASM-SDK/Editor/PVRTexToolCLI.exe.meta delete mode 100755 Assets/WX-WASM-SDK/Editor/TextureEditor/Release/WXTextureMin.exe.meta delete mode 100755 Assets/WX-WASM-SDK/Editor/astcenc-avx2.exe.meta delete mode 100755 Assets/WX-WASM-SDK/Editor/astcenc-sse4.1.exe.meta delete mode 100755 Assets/WX-WASM-SDK/Editor/convert.exe.meta delete mode 100755 Assets/WX-WASM-SDK/Editor/pngquant.exe.meta diff --git a/Assets/ThirdPlugins/Easy Save 3/Scripts/ES3Prefab.cs b/Assets/ThirdPlugins/Easy Save 3/Scripts/ES3Prefab.cs index c62c91eb..c71d9b40 100644 --- a/Assets/ThirdPlugins/Easy Save 3/Scripts/ES3Prefab.cs +++ b/Assets/ThirdPlugins/Easy Save 3/Scripts/ES3Prefab.cs @@ -90,7 +90,7 @@ namespace ES3Internal public void GeneratePrefabReferences() { #if UNITY_2018_3_OR_NEWER - if (this.gameObject.scene.name != null || UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage() != null) + if (this.gameObject.scene.name != null || UnityEditor.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage() != null) #else if (this.gameObject.scene.name != null) #endif diff --git a/Assets/WX-WASM-SDK/Editor/Brotli/win_x86_64/brotli.exe.meta b/Assets/WX-WASM-SDK/Editor/Brotli/win_x86_64/brotli.exe.meta deleted file mode 100755 index d2308a1d..00000000 --- a/Assets/WX-WASM-SDK/Editor/Brotli/win_x86_64/brotli.exe.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 14077bb4dfcdf487aa222261b4719a0e -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/WX-WASM-SDK/Editor/PVRTexToolCLI.exe.meta b/Assets/WX-WASM-SDK/Editor/PVRTexToolCLI.exe.meta deleted file mode 100755 index 63434b12..00000000 --- a/Assets/WX-WASM-SDK/Editor/PVRTexToolCLI.exe.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b24e50552812c4744bee4993ab8c8100 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/WX-WASM-SDK/Editor/TextureEditor/Release/WXTextureMin.exe.meta b/Assets/WX-WASM-SDK/Editor/TextureEditor/Release/WXTextureMin.exe.meta deleted file mode 100755 index 789a012d..00000000 --- a/Assets/WX-WASM-SDK/Editor/TextureEditor/Release/WXTextureMin.exe.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 080a33cc99a93e04f919698d4ba695dd -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/WX-WASM-SDK/Editor/astcenc-avx2.exe.meta b/Assets/WX-WASM-SDK/Editor/astcenc-avx2.exe.meta deleted file mode 100755 index 6f80f101..00000000 --- a/Assets/WX-WASM-SDK/Editor/astcenc-avx2.exe.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: fff90a9752fcf4776ac78b63a2dc5bbe -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/WX-WASM-SDK/Editor/astcenc-sse4.1.exe.meta b/Assets/WX-WASM-SDK/Editor/astcenc-sse4.1.exe.meta deleted file mode 100755 index f1ffc9e6..00000000 --- a/Assets/WX-WASM-SDK/Editor/astcenc-sse4.1.exe.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ef04dda9954cb475e837d171f41edddc -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/WX-WASM-SDK/Editor/convert.exe.meta b/Assets/WX-WASM-SDK/Editor/convert.exe.meta deleted file mode 100755 index 0103208b..00000000 --- a/Assets/WX-WASM-SDK/Editor/convert.exe.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0f23cc7cad673124cba2684fe768a345 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/WX-WASM-SDK/Editor/pngquant.exe.meta b/Assets/WX-WASM-SDK/Editor/pngquant.exe.meta deleted file mode 100755 index bfb6b6fe..00000000 --- a/Assets/WX-WASM-SDK/Editor/pngquant.exe.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 33f2ecc6bd637416a867bd317d8fe151 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index b75acd6a..bd8dd655 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,11 +2,11 @@ "dependencies": { "com.unity.2d.animation": "3.2.16", "com.unity.2d.pixel-perfect": "2.1.0", - "com.unity.2d.psdimporter": "2.1.11", + "com.unity.2d.psdimporter": "6.0.4", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "3.0.18", + "com.unity.2d.spriteshape": "7.0.5", "com.unity.2d.tilemap": "1.0.0", - "com.unity.collab-proxy": "1.14.15", + "com.unity.collab-proxy": "1.17.2", "com.unity.ide.rider": "1.2.1", "com.unity.ide.visualstudio": "2.0.14", "com.unity.ide.vscode": "1.2.5", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index f696b4f8..c4d5fd2b 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,12 +1,11 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "3.2.17", + "version": "7.0.6", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "2.1.2", - "com.unity.mathematics": "1.1.0", + "com.unity.2d.common": "6.0.3", "com.unity.2d.sprite": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.uielements": "1.0.0" @@ -14,17 +13,19 @@ "url": "https://packages.unity.cn" }, "com.unity.2d.common": { - "version": "2.1.2", + "version": "6.0.3", "depth": 1, "source": "registry", "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.modules.uielements": "1.0.0" + "com.unity.mathematics": "1.1.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.burst": "1.5.1" }, "url": "https://packages.unity.cn" }, "com.unity.2d.path": { - "version": "2.1.1", + "version": "5.0.2", "depth": 1, "source": "registry", "dependencies": {}, @@ -38,12 +39,12 @@ "url": "https://packages.unity.cn" }, "com.unity.2d.psdimporter": { - "version": "2.1.11", + "version": "6.0.4", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "2.1.2", - "com.unity.2d.animation": "3.2.17", + "com.unity.2d.animation": "7.0.6", + "com.unity.2d.common": "6.0.3", "com.unity.2d.sprite": "1.0.0" }, "url": "https://packages.unity.cn" @@ -55,13 +56,14 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "3.0.18", + "version": "7.0.5", "depth": 0, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.2d.common": "2.1.0", - "com.unity.2d.path": "2.1.1" + "com.unity.2d.common": "6.0.3", + "com.unity.2d.path": "5.0.2", + "com.unity.modules.physics2d": "1.0.0" }, "url": "https://packages.unity.cn" }, @@ -71,11 +73,22 @@ "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.14.15", + "version": "1.17.2", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.services.core": "1.0.1" + }, "url": "https://packages.unity.cn" }, "com.unity.ext.nunit": { @@ -111,12 +124,30 @@ "url": "https://packages.unity.cn" }, "com.unity.mathematics": { - "version": "1.1.0", + "version": "1.2.6", "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", "depth": 0, @@ -291,6 +322,18 @@ "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" }