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

1.根据PackageConfig生成PackageType类
2.增加CodeMode刷新功能

tanghai 1 год назад
Родитель
Сommit
50bf73dd00
25 измененных файлов с 124 добавлено и 29 удалено
  1. 1 0
      Unity/Packages/cn.etetet.actorlocation/PackageConfig.asset
  2. 0 7
      Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/PackageType.cs
  3. 8 0
      Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Share.meta
  4. 7 0
      Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Share/PackageType.cs
  5. 1 1
      Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Share/PackageType.cs.meta
  6. 14 0
      Unity/Packages/cn.etetet.core/Editor/PackageConfigEditor/PackageConfig.cs
  7. 11 0
      Unity/Packages/cn.etetet.core/Editor/PackageConfigEditor/PackageConfig.cs.meta
  8. 36 5
      Unity/Packages/cn.etetet.core/Editor/PackageConfigEditor/PackageConfigEditor.cs
  9. 1 1
      Unity/Packages/cn.etetet.core/Editor/PackageConfigEditor/PackageConfigEditor.cs.meta
  10. 1 0
      Unity/Packages/cn.etetet.core/PackageConfig.asset
  11. 2 3
      Unity/Packages/cn.etetet.core/Scripts/Model/Share/PackageType.cs
  12. 1 0
      Unity/Packages/cn.etetet.db/PackageConfig.asset
  13. 8 0
      Unity/Packages/cn.etetet.db/Scripts/Model/Share.meta
  14. 2 2
      Unity/Packages/cn.etetet.db/Scripts/Model/Share/PackageType.cs
  15. 1 1
      Unity/Packages/cn.etetet.db/Scripts/Model/Share/PackageType.cs.meta
  16. 9 0
      Unity/Packages/cn.etetet.loader/Editor/GlobalConfigEditor/GlobalConfigEditor.cs
  17. 1 0
      Unity/Packages/cn.etetet.loader/PackageConfig.asset
  18. 1 0
      Unity/Packages/cn.etetet.move/PackageConfig.asset
  19. 3 3
      Unity/Packages/cn.etetet.move/Scripts/Model/Share/PackageType.cs
  20. 1 0
      Unity/Packages/cn.etetet.unit/PackageConfig.asset
  21. 3 3
      Unity/Packages/cn.etetet.unit/Scripts/Model/Share/PackageType.cs
  22. 1 0
      Unity/Packages/cn.etetet.yooassets/PackageConfig.asset
  23. 8 0
      Unity/Packages/cn.etetet.yooassets/Scripts/Model/Share.meta
  24. 2 2
      Unity/Packages/cn.etetet.yooassets/Scripts/Model/Share/PackageType.cs
  25. 1 1
      Unity/Packages/cn.etetet.yooassets/Scripts/Model/Share/PackageType.cs.meta

+ 1 - 0
Unity/Packages/cn.etetet.actorlocation/PackageConfig.asset

@@ -13,4 +13,5 @@ MonoBehaviour:
   m_Name: PackageConfig
   m_EditorClassIdentifier: 
   Id: 3
+  Name: ActorLocation
   CreatePackageTypeFile: 1

+ 0 - 7
Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/PackageType.cs

@@ -1,7 +0,0 @@
-namespace ET
-{
-    public static partial class PackageType
-    {
-        public const int ActorLocation = 5;
-    }
-}

+ 8 - 0
Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Share.meta

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

+ 7 - 0
Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Share/PackageType.cs

@@ -0,0 +1,7 @@
+namespace ET
+{
+    public static partial class PackageType
+    {
+        public const int ActorLocation = 3;
+    }
+}

+ 1 - 1
Unity/Packages/cn.etetet.yooassets/Scripts/Model/PackageType.cs.meta → Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Share/PackageType.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ca784a168f044014c990a9e138a1c9c5
+guid: cecc76bb8a432a841980800cc18ebfe2
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,14 @@
+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;
+    }
+}

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

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

+ 36 - 5
Unity/Packages/cn.etetet.core/Editor/PackageConfigEditor/PackageConfigEditor.cs

@@ -1,11 +1,42 @@
-using UnityEngine;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
 
 namespace ET
 {
-    [CreateAssetMenu(menuName = "ET/PackageConfig", fileName = "PackageConfig", order = 0)]
-    public class PackageConfig: ScriptableObject
+    public static class PackageConfigEditor
     {
-        public int Id;
-        public bool CreatePackageTypeFile;
+        [MenuItem("ET/Generate PackageType File")]
+        public static void GeneratePackageTypeFile()
+        {
+            string[] packageConfigs = AssetDatabase.FindAssets("t:PackageConfig");
+            foreach (string packageConfig in packageConfigs)
+            {
+                string path = AssetDatabase.GUIDToAssetPath(packageConfig);
+                PackageConfig config = AssetDatabase.LoadAssetAtPath<PackageConfig>(path);
+                if (!config.CreatePackageTypeFile)
+                {
+                    continue;
+                }
+
+                string packageTypePath = Application.dataPath + "/../" + $"{Path.GetDirectoryName(path)}" + "/Scripts/Model/Share/PackageType.cs";
+                string dir = Path.GetDirectoryName(packageTypePath);
+                if (!Directory.Exists(dir))
+                {
+                    Directory.CreateDirectory(dir);
+                }
+
+                using FileStream fileStream = new(packageTypePath, 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("}");
+            }
+            Log.Debug("Generate PackageType File Finish!");
+        }
     }
 }

+ 1 - 1
Unity/Packages/cn.etetet.core/Editor/PackageConfigEditor/PackageConfigEditor.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d54714756eb2c264a9e75f3e033bb25f
+guid: e1c92db51a225b247be79536be37d943
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 0
Unity/Packages/cn.etetet.core/PackageConfig.asset

@@ -13,4 +13,5 @@ MonoBehaviour:
   m_Name: PackageConfig
   m_EditorClassIdentifier: 
   Id: 1
+  Name: Core
   CreatePackageTypeFile: 1

+ 2 - 3
Unity/Packages/cn.etetet.core/Scripts/Model/Share/PackageType.cs

@@ -1,8 +1,7 @@
-namespace ET
+namespace ET
 {
-    [UniqueId]
     public static partial class PackageType
     {
         public const int Core = 1;
     }
-}
+}

+ 1 - 0
Unity/Packages/cn.etetet.db/PackageConfig.asset

@@ -13,4 +13,5 @@ MonoBehaviour:
   m_Name: PackageConfig
   m_EditorClassIdentifier: 
   Id: 6
+  Name: DB
   CreatePackageTypeFile: 1

+ 8 - 0
Unity/Packages/cn.etetet.db/Scripts/Model/Share.meta

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

+ 2 - 2
Unity/Packages/cn.etetet.db/Scripts/Model/Server/PackageType.cs → Unity/Packages/cn.etetet.db/Scripts/Model/Share/PackageType.cs

@@ -1,7 +1,7 @@
-namespace ET
+namespace ET
 {
     public static partial class PackageType
     {
         public const int DB = 6;
     }
-}
+}

+ 1 - 1
Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/PackageType.cs.meta → Unity/Packages/cn.etetet.db/Scripts/Model/Share/PackageType.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 361cd10ce61f830469a82d6b828e9e6b
+guid: e312afb8e086a594d9aae96b1556d103
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 9 - 0
Unity/Packages/cn.etetet.loader/Editor/GlobalConfigEditor/GlobalConfigEditor.cs

@@ -9,6 +9,15 @@ namespace ET
     [CustomEditor(typeof(GlobalConfig))]
     public class GlobalConfigEditor : Editor
     {
+        [MenuItem("ET/CodeMode Refresh")]
+        public static void Refresh()
+        {
+            GlobalConfig globalConfig = AssetDatabase.LoadAssetAtPath<GlobalConfig>("Packages/cn.etetet.loader/Resources/GlobalConfig.asset");
+            CodeModeChangeHelper.ChangeToCodeMode(globalConfig.CodeMode);
+            AssetDatabase.Refresh();
+            Log.Debug("code mode refresh finish!");
+        }
+        
         private void OnEnable()
         {
             GlobalConfig globalConfig = (GlobalConfig)this.target;

+ 1 - 0
Unity/Packages/cn.etetet.loader/PackageConfig.asset

@@ -13,4 +13,5 @@ MonoBehaviour:
   m_Name: PackageConfig
   m_EditorClassIdentifier: 
   Id: 2
+  Name: Loader
   CreatePackageTypeFile: 0

+ 1 - 0
Unity/Packages/cn.etetet.move/PackageConfig.asset

@@ -13,4 +13,5 @@ MonoBehaviour:
   m_Name: PackageConfig
   m_EditorClassIdentifier: 
   Id: 4
+  Name: Move
   CreatePackageTypeFile: 1

+ 3 - 3
Unity/Packages/cn.etetet.move/Scripts/Model/Share/PackageType.cs

@@ -1,7 +1,7 @@
-namespace ET
+namespace ET
 {
     public static partial class PackageType
     {
-        public const int Move = 2;
+        public const int Move = 4;
     }
-}
+}

+ 1 - 0
Unity/Packages/cn.etetet.unit/PackageConfig.asset

@@ -13,4 +13,5 @@ MonoBehaviour:
   m_Name: PackageConfig
   m_EditorClassIdentifier: 
   Id: 5
+  Name: Unit
   CreatePackageTypeFile: 1

+ 3 - 3
Unity/Packages/cn.etetet.unit/Scripts/Model/Share/PackageType.cs

@@ -1,7 +1,7 @@
-namespace ET
+namespace ET
 {
     public static partial class PackageType
     {
-        public const int Unit = 3;
+        public const int Unit = 5;
     }
-}
+}

+ 1 - 0
Unity/Packages/cn.etetet.yooassets/PackageConfig.asset

@@ -13,4 +13,5 @@ MonoBehaviour:
   m_Name: PackageConfig
   m_EditorClassIdentifier: 
   Id: 7
+  Name: YooAssets
   CreatePackageTypeFile: 1

+ 8 - 0
Unity/Packages/cn.etetet.yooassets/Scripts/Model/Share.meta

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

+ 2 - 2
Unity/Packages/cn.etetet.yooassets/Scripts/Model/PackageType.cs → Unity/Packages/cn.etetet.yooassets/Scripts/Model/Share/PackageType.cs

@@ -1,7 +1,7 @@
-namespace ET
+namespace ET
 {
     public static partial class PackageType
     {
         public const int YooAssets = 7;
     }
-}
+}

+ 1 - 1
Unity/Packages/cn.etetet.db/Scripts/Model/Server/PackageType.cs.meta → Unity/Packages/cn.etetet.yooassets/Scripts/Model/Share/PackageType.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 67d00018ca18c0b4086f8a15805bcf2a
+guid: 3f9c86e800c3f274e9dad7c1fccb22ae
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2