From fd9f671dd6e2ddde44099037a91b5166cb64423a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E3=80=91=E7=A8=8B=E4=B8=80?= =?UTF-8?q?=E5=B3=B0?= <649669121@qq.com> Date: Fri, 16 Dec 2022 18:20:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81Unity=E5=86=85?= =?UTF-8?q?=E9=83=A8=E7=9A=84=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Core/Extensions/PackageFetchInfo.cs | 2 +- .../Core/Extensions/UpmPackageVersionEx.cs | 11 +++++- .../Editor/Core/UpmGitUtils.cs | 31 ++++++++++++--- UpmGitExtension/Packages/packages-lock.json | 38 ++++++++++--------- .../PackageManagerSettings.asset | 11 +++--- .../ProjectSettings/ProjectVersion.txt | 4 +- UpmGitExtension/ProjectSettings/boot.config | 0 7 files changed, 63 insertions(+), 34 deletions(-) create mode 100644 UpmGitExtension/ProjectSettings/boot.config diff --git a/UpmGitExtension/Assets/UpmGitExtension/Editor/Core/Extensions/PackageFetchInfo.cs b/UpmGitExtension/Assets/UpmGitExtension/Editor/Core/Extensions/PackageFetchInfo.cs index 934d8ab..aeccd49 100644 --- a/UpmGitExtension/Assets/UpmGitExtension/Editor/Core/Extensions/PackageFetchInfo.cs +++ b/UpmGitExtension/Assets/UpmGitExtension/Editor/Core/Extensions/PackageFetchInfo.cs @@ -52,7 +52,7 @@ namespace Cocklebur compatibleVersions.Add(curVersion.version.ToString()); verified = curVersion.version.ToString(); } - VersionsInfo versionsInfo = new VersionsInfo(allVersions, compatibleVersions, verified, null); + VersionsInfo versionsInfo = new VersionsInfo(allVersions, compatibleVersions, verified); for (int i = versions.Count - 1; i >= 0; i--) { diff --git a/UpmGitExtension/Assets/UpmGitExtension/Editor/Core/Extensions/UpmPackageVersionEx.cs b/UpmGitExtension/Assets/UpmGitExtension/Editor/Core/Extensions/UpmPackageVersionEx.cs index 259a879..6b07f35 100644 --- a/UpmGitExtension/Assets/UpmGitExtension/Editor/Core/Extensions/UpmPackageVersionEx.cs +++ b/UpmGitExtension/Assets/UpmGitExtension/Editor/Core/Extensions/UpmPackageVersionEx.cs @@ -1,3 +1,9 @@ +#if UNITY_2020_3_41|| UNITY_2021_3_12 +#define UPM_GIT_NEW +#else +#undef UPM_GIT_NEW +#endif + using System; using System.Collections.Generic; using System.Text.RegularExpressions; @@ -27,7 +33,9 @@ namespace Cocklebur public UpmPackageVersionEx(UpmPackageVersion packageVersion) : base(packageVersion.GetPackageInfo(), packageVersion.isInstalled, packageVersion.isUnityPackage) { +#if UPM_GIT_NEW packageInfo = packageVersion.GetPackageInfo(); +#endif m_MinimumUnityVersion = UnityVersionToSemver(Application.unityVersion).ToString(); OnAfterDeserialize(); } @@ -44,9 +52,10 @@ namespace Cocklebur public string fullVersionString { get; private set; } public SemVersion semVersion { get; private set; } +#if UPM_GIT_NEW [SerializeField] internal UnityEditor.PackageManager.PackageInfo packageInfo; - +#endif [SerializeField] private string m_MinimumUnityVersion; diff --git a/UpmGitExtension/Assets/UpmGitExtension/Editor/Core/UpmGitUtils.cs b/UpmGitExtension/Assets/UpmGitExtension/Editor/Core/UpmGitUtils.cs index f200940..36ebd55 100644 --- a/UpmGitExtension/Assets/UpmGitExtension/Editor/Core/UpmGitUtils.cs +++ b/UpmGitExtension/Assets/UpmGitExtension/Editor/Core/UpmGitUtils.cs @@ -1,3 +1,9 @@ +#if UNITY_2020_3_41 || UNITY_2021_3_12 +#define UPM_GIT_NEW +#else +#undef UPM_GIT_NEW +#endif + using System.Collections.Generic; using System.IO; using UnityEditor; @@ -143,7 +149,7 @@ namespace Cocklebur internal static bool IsError(this UpmAddOperation op) { if (op == null) return false; - return op.logErrorInConsole; + return op.error != null; } #endregion @@ -161,11 +167,12 @@ namespace Cocklebur internal static PackageInfo GetPackageInfo(this IPackageVersion version) { +#if UPM_GIT_NEW if (version == null) return null; PackageInfo info; string key = version.uniqueId; if (dictCachePackageInfo.TryGetValue(key, out info)) return info; - var allPkg = PackageInfo.GetAllRegisteredPackages(); + var allPkg = PackageInfo.GetAll(); foreach (var pkg in allPkg) { SetCachePackageInfo(pkg.packageId, pkg); @@ -178,6 +185,9 @@ namespace Cocklebur //To Do : 重新按照地址下载 PkgInfo ? #endif return null; +#else + return version.packageInfo; +#endif } private static void AddPackageInfo(UpmPackageVersionEx version) @@ -218,13 +228,22 @@ namespace Cocklebur EditorUtility.DisplayDialog(L10n.Tr("Unity Package Manager"), message, L10n.Tr("OK")); } - internal static bool IsGit(this IPackageVersion version) { return version.HasTag(PackageTag.Git); } + internal static bool IsGit(this IPackageVersion version) + { +#if UPM_GIT_NEW + return version.HasTag(PackageTag.Git); +#else + return version.packageInfo.source == UnityEditor.PackageManager.PackageSource.Git; +#endif + } internal static void UpdateVersions(UpmPackage upmPackage, IEnumerable newVersions) { - //upmPackage.UpdateVersions(newVersions); - //(upmPackage.versions as UpmVersionList).GetUpdateTarget - +#if UPM_GIT_NEW + upmPackage.UpdateVersions(newVersions, 0); +#else + upmPackage.UpdateVersions(newVersions); +#endif } #endregion diff --git a/UpmGitExtension/Packages/packages-lock.json b/UpmGitExtension/Packages/packages-lock.json index 87c1cd7..8c31117 100644 --- a/UpmGitExtension/Packages/packages-lock.json +++ b/UpmGitExtension/Packages/packages-lock.json @@ -7,14 +7,14 @@ "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.ide.visualstudio": { "version": "2.0.16", @@ -23,32 +23,23 @@ "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" - }, - "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.services.core": { - "version": "1.5.2", + "version": "1.0.1", "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" + "com.unity.modules.unitywebrequest": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.test-framework": { "version": "1.1.33", @@ -59,7 +50,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.timeline": { "version": "1.6.4", @@ -71,7 +62,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.modules.ai": { "version": "1.0.0", @@ -218,6 +209,17 @@ "version": "1.0.0", "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", diff --git a/UpmGitExtension/ProjectSettings/PackageManagerSettings.asset b/UpmGitExtension/ProjectSettings/PackageManagerSettings.asset index 4625697..a6d2470 100644 --- a/UpmGitExtension/ProjectSettings/PackageManagerSettings.asset +++ b/UpmGitExtension/ProjectSettings/PackageManagerSettings.asset @@ -13,24 +13,23 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_EnablePreReleasePackages: 0 + m_EnablePackageDependencies: 1 m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 - m_SeeAllPackageVersions: 0 - m_DismissPreviewPackagesInUse: 0 + m_SeeAllPackageVersions: 1 oneTimeWarningShown: 1 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 - m_ConfigSource: 0 m_UserSelectedRegistryName: m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -842 - m_OriginalInstanceId: -844 + m_UserModificationsInstanceId: -826 + m_OriginalInstanceId: -828 m_LoadAssets: 0 diff --git a/UpmGitExtension/ProjectSettings/ProjectVersion.txt b/UpmGitExtension/ProjectSettings/ProjectVersion.txt index c050dc0..ee634df 100644 --- a/UpmGitExtension/ProjectSettings/ProjectVersion.txt +++ b/UpmGitExtension/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.2.0b14 -m_EditorVersionWithRevision: 2022.2.0b14 (0220fa099330) +m_EditorVersion: 2020.3.41f1c1 +m_EditorVersionWithRevision: 2020.3.41f1c1 (148a17cb7d64) diff --git a/UpmGitExtension/ProjectSettings/boot.config b/UpmGitExtension/ProjectSettings/boot.config new file mode 100644 index 0000000..e69de29 -- GitLab