Просмотр исходного кода

增加了一个packagegit文件,用来描述et包跟包的git依赖,删掉了原来的PackageConfig,因为PackageConfig在下载的时候不方便解析

tanghai 1 год назад
Родитель
Сommit
1123763ca5

+ 7 - 5
Packages/cn.etetet.init/Editor/GitDependencyResolver/DependencyResolver.cs

@@ -17,7 +17,9 @@ namespace Hibzz.DependencyResolver
     [BsonIgnoreExtraElements]
     public class PackageGitDependency
     {
-        public Dictionary<string, string> gitDependencies;
+        public int Id;
+        public string Name;
+        public Dictionary<string, string> GitDependencies;
     }
     
     [InitializeOnLoad]
@@ -64,7 +66,7 @@ namespace Hibzz.DependencyResolver
                     continue;
                 }
                 
-                foreach (var gitDependency in packageDependencies.gitDependencies)
+                foreach (var gitDependency in packageDependencies.GitDependencies)
                 {
                     if (IsInCollection(gitDependency.Key, installedPackages))
                     {
@@ -87,7 +89,7 @@ namespace Hibzz.DependencyResolver
         static bool GetDependencies(PackageInfo packageInfo, out PackageGitDependency dependencies)
         {
             // Read the contents of the package.json file
-            string packageJsonPath = $"{packageInfo.resolvedPath}/package.json";
+            string packageJsonPath = $"{packageInfo.resolvedPath}/packagegit.json";
 
             if (!File.Exists(packageJsonPath))
             {
@@ -98,7 +100,7 @@ namespace Hibzz.DependencyResolver
 
             PackageGitDependency packageGitDependency = BsonSerializer.Deserialize<PackageGitDependency>(packageJsonContent);
             // if no token with the key git-dependecies is found, failed to get git dependencies
-            if (packageGitDependency.gitDependencies is null || packageGitDependency.gitDependencies.Count == 0)
+            if (packageGitDependency.GitDependencies is null || packageGitDependency.GitDependencies.Count == 0)
             {
                 dependencies = null;
                 return false;
@@ -201,7 +203,7 @@ namespace Hibzz.DependencyResolver
                     continue;
                 }
                 
-                foreach (var gitDependency in packageDependencies.gitDependencies)
+                foreach (var gitDependency in packageDependencies.GitDependencies)
                 {
                     if (IsInCollection(gitDependency.Key, installedPackages))
                     {

+ 0 - 8
Packages/cn.etetet.init/Editor/PackageConfigEditor.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 38a9c95f8a7257641899bcb1c87329b5
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 14
Packages/cn.etetet.init/Editor/PackageConfigEditor/PackageConfig.cs

@@ -1,14 +0,0 @@
-using System.IO;
-using UnityEditor;
-using UnityEngine;
-
-namespace ET
-{
-    [CreateAssetMenu(menuName = "ET/PackageConfig", fileName = "PackageConfig", order = 0)]
-    public class PackageConfig: ScriptableObject
-    {
-        public int Id;
-        public string Name;
-        public bool CreatePackageTypeFile;
-    }
-}

+ 0 - 11
Packages/cn.etetet.init/Editor/PackageConfigEditor/PackageConfig.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: d54714756eb2c264a9e75f3e033bb25f
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 44
Packages/cn.etetet.init/Editor/PackageConfigEditor/PackageConfigEditor.cs

@@ -1,44 +0,0 @@
-using System.IO;
-using UnityEditor;
-using UnityEngine;
-
-namespace ET
-{
-    [CustomEditor(typeof(PackageConfig))]
-    public class PackageConfigEditor: Editor
-    {
-        public static void CreatePackageTypeFile(string dir, PackageConfig config)
-        {
-            if (!Directory.Exists(dir))
-            {
-                Directory.CreateDirectory(dir);
-            }
-
-            using FileStream fileStream = new($"{dir}/PackageType.cs", FileMode.Create);
-            using StreamWriter streamWriter = new(fileStream);
-            streamWriter.WriteLine("namespace ET");
-            streamWriter.WriteLine("{");
-            streamWriter.WriteLine("    public static partial class PackageType");
-            streamWriter.WriteLine("    {");
-            streamWriter.WriteLine("        public const int " + config.Name + " = " + config.Id + ";");
-            streamWriter.WriteLine("    }");
-            streamWriter.WriteLine("}");
-        }
-        
-        public override void OnInspectorGUI()
-        {
-            base.OnInspectorGUI();
-            
-            if (GUILayout.Button("Create PackageType"))
-            {
-                PackageConfig packageConfig = (PackageConfig)this.target;
-                if (!packageConfig.CreatePackageTypeFile)
-                {
-                    return;
-                }
-                string path = AssetDatabase.GetAssetPath(packageConfig);
-                CreatePackageTypeFile(Path.Combine(Path.GetDirectoryName(path), "Scripts/Model/Share/"), packageConfig);
-            }
-        }
-    }
-}

+ 0 - 11
Packages/cn.etetet.init/Editor/PackageConfigEditor/PackageConfigEditor.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e1c92db51a225b247be79536be37d943
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: