Jelajahi Sumber

Unity6 后包不再跟版本号,调整相关路径名称 (#646)

RabbitCocoa 1 tahun lalu
induk
melakukan
3436d213a1

+ 16 - 3
Packages/com.etetet.init/Editor/GitDependencyResolver/DependencyResolver.cs

@@ -20,14 +20,23 @@ namespace Hibzz.DependencyResolver
         //[MenuItem("ET/MoveToPackage")]
         static void MoveToPackage(string package, string version)
         {
-            string dir = Path.Combine("Library/PackageCache", $"{package}@{version}");
+            string packageName = default;
+            string moveFileName = default;
+            #if UNITY_6000_0_OR_NEWER
+            packageName = package;
+            moveFileName = "MoveToPackages_6";
+            #else 
+            packageName =$"{package}@{version}";
+            moveFileName = "MoveToPackages";
+            #endif
+            string dir = Path.Combine("Library/PackageCache", packageName);
             if (!Directory.Exists(dir))
             {
                 return;
             }
         
-            Debug.Log($"move package: {package}@{version}");
-            Process process = ProcessHelper.PowerShell($"-NoExit -ExecutionPolicy Bypass -File ./Packages/com.etetet.init/MoveToPackages.ps1 {package} {version}", waitExit: true);
+            Debug.Log($"move package: {packageName}");
+            Process process = ProcessHelper.PowerShell($"-NoExit -ExecutionPolicy Bypass -File ./Packages/com.etetet.init/{moveFileName}.ps1 {package} {version}", waitExit: true);
             Debug.Log(process.StandardOutput.ReadToEnd());
         }
         
@@ -83,7 +92,11 @@ namespace Hibzz.DependencyResolver
                 
                 string[] ss = baseName.Split("@");
                 string packageName = ss[0];
+                #if UNITY_6000_0_OR_NEWER
+                string version = "";
+                #else 
                 string version = ss[1];
+                #endif
 
                 MoveToPackage(packageName, version);
             }

+ 9 - 0
Packages/com.etetet.init/MoveToPackages_6.ps1

@@ -0,0 +1,9 @@
+param($packageName, $version)
+
+Write-Host $packageName
+
+$from = "Library/PackageCache/$packageName" 
+Move-Item $from "Packages/$packageName"
+
+Write-Host "move finish!" $packageName 
+#Read-Host -Prompt "Press Enter to exit"

+ 7 - 0
Packages/com.etetet.init/MoveToPackages_6.ps1.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6997902c080851b4586429ad0eb5197b
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: