Merge pull request #87 from AIO-GAME/1.x

1.x
AIO-GAME · Jun 6, 2024 · 299efae · 299efae
2 parents 8faa7cf + 313085d
commit 299efae
Show file tree

Hide file tree

Showing 19 changed files with 474 additions and 258 deletions.
diff --git a/Editor.GUI.CLI/External/AIO.Git/MenuItem.Git.ALL.cs b/Editor.GUI.CLI/External/AIO.Git/MenuItem.Git.ALL.cs
@@ -15,16 +15,13 @@ internal static partial class PackageGen
     {
         private static IEnumerable<PackageInfo> GetInfo()
         {
-            var packageInfos = AssetDatabase.FindAssets("package", new[] { "Packages" })
-                                            .Select(AssetDatabase.GUIDToAssetPath)
-                                            .Where(x => AssetDatabase.LoadAssetAtPath<TextAsset>(x) != null)
-                                            .Select(PackageInfo.FindForAssetPath)
-                                            .GroupBy(x => x.assetPath)
-                                            .Select(x => x.First())
-                                            .Where(x => File.Exists(Path.Combine(x.resolvedPath, ".git"))
-                                                     || Directory.Exists(Path.Combine(x.resolvedPath, ".git")))
-                                            .ToList();
-            return packageInfos;
+            return AssetDatabase.FindAssets("package", new[] { "Packages" })
+                                .Select(AssetDatabase.GUIDToAssetPath)
+                                .Where(x => AssetDatabase.LoadAssetAtPath<TextAsset>(x) != null)
+                                .Select(PackageInfo.FindForAssetPath)
+                                .GroupBy(x => x.assetPath)
+                                .Select(x => x.First())
+                                .Where(x => AHelper.IO.Exists(Path.Combine(x.resolvedPath, ".git")));
         }
 
         #region Git All

diff --git a/Editor.GUI.CLI/External/AIO.Git/MenuItem.Git.cs b/Editor.GUI.CLI/External/AIO.Git/MenuItem.Git.cs
@@ -22,45 +22,36 @@ internal static partial class PackageGen
         /// <summary>
         /// 生成
         /// </summary>
-        [MenuItem("Git/~~~ Generate ~~~", false, 9999)]
+        [MenuItem("Git/[ Generate Code ->", false, 9999)]
         internal static void Generate()
         {
             Debug.Log($"<b><color=#5DADE2>[GIT]</color></b> {CMD_GIT} Generate");
-
-            var packageInfos = AssetDatabase.FindAssets("package", new[] { "Packages" })
-                                            .Select(AssetDatabase.GUIDToAssetPath)
-                                            .Where(x => AssetDatabase.LoadAssetAtPath<TextAsset>(x) != null)
-                                            .Select(PackageInfo.FindForAssetPath)
-                                            .GroupBy(x => x.assetPath)
-                                            .Select(x => x.First())
-                                            .Where(x =>
-                                                       File.Exists(Path.Combine(EHelper.Path.Project, x.resolvedPath, ".git")) ||
-                                                       Directory.Exists(Path.Combine(EHelper.Path.Project, x.resolvedPath, ".git"))
-                                                  )
-                                            .ToList();
-
-            var change                               = CreateProject();
-            if (CreateTemplate(packageInfos)) change = true;
+            var change = CreateProject() || CreateTemplate
+                (AssetDatabase.FindAssets("package", new[] { "Packages" })
+                              .Select(AssetDatabase.GUIDToAssetPath)
+                              .Where(x => AssetDatabase.LoadAssetAtPath<TextAsset>(x) != null)
+                              .Select(PackageInfo.FindForAssetPath)
+                              .GroupBy(x => x.assetPath)
+                              .Select(x => x.First())
+                              .Where(x => AHelper.IO.Exists(Path.Combine(EHelper.Path.Project, x.resolvedPath, ".git"))));
             if (!change) return;
 
             AssetDatabase.Refresh();
-            var RefreshSettings =
-                typeof(AssetDatabase).GetMethod("RefreshSettings", BindingFlags.Static | BindingFlags.Public);
+            var RefreshSettings = typeof(AssetDatabase).GetMethod("RefreshSettings", BindingFlags.Static | BindingFlags.Public);
             if (RefreshSettings != null) RefreshSettings.Invoke(null, null);
             CompilationPipeline.RequestScriptCompilation();
         }
 
         [AInit(EInitAttrMode.Editor, ushort.MaxValue - 1)]
         internal static void AutoGenerate()
         {
-            if (EHelper.Prefs.LoadBoolean("Git.AutoGenerate"))
-                Generate();
+            if (EHelper.Prefs.LoadBoolean("Git.AutoGenerate")) Generate();
         }
 
         /// <summary>
         /// 生成
         /// </summary>
-        [MenuItem("Git/~~~ Clean ~~~", false, 9999)]
+        [MenuItem("Git/[ Clear Code ->", false, 9999)]
         internal static void Clean()
         {
             var OutPath = GetOutPath();
@@ -76,8 +67,7 @@ internal static void Clean()
             AssetDatabase.RefreshSettings();
 #endif
 
-            var RefreshSettings = typeof(AssetDatabase).GetMethod("RefreshSettings",
-                                                                  BindingFlags.Static | BindingFlags.Public);
+            var RefreshSettings = typeof(AssetDatabase).GetMethod("RefreshSettings", BindingFlags.Static | BindingFlags.Public);
             if (RefreshSettings != null) RefreshSettings.Invoke(null, null);
 
             CompilationPipeline.RequestScriptCompilation();

diff --git a/Runtime/Tools/Initialize/AInitAttribute.cs b/Runtime/Tools/Initialize/AInitAttribute.cs
@@ -1,53 +1,55 @@
 #region
 
 using System;
+#if UNITY_EDITOR
 using System.Runtime.CompilerServices;
+#endif
 
 #endregion
 
 namespace AIO.UEditor
 {
+    /// <summary>
+    /// 初始化属性
+    /// </summary>
+    /// <c>使用方式</c>
+    /// <code>
+    /// [AInit(EInitAttrMode.Editor)] : 编辑器启动
+    /// [AInit(EInitAttrMode.RuntimeAfterAssembliesLoaded)] : 程序集加载
+    /// [AInit(0)] : 优先级
+    /// </code>
     [AttributeUsage(AttributeTargets.Method, Inherited = false)]
     public class AInitAttribute : Attribute
     {
-        public AInitAttribute(int order = 0
 #if UNITY_EDITOR
-                             ,
-                              [CallerFilePath]   string filePath   = "",
-                              [CallerLineNumber] int    lineNumber = 0
-#endif
-        )
+        public string FilePath   { get; }
+        public int    LineNumber { get; }
+
+        public AInitAttribute(int order = 0, [CallerFilePath] string filePath = "", [CallerLineNumber] int lineNumber = 0)
         {
-#if UNITY_EDITOR
             FilePath   = filePath.Replace("\\", "/");
             LineNumber = lineNumber;
-#endif
-            Order = order;
+            Order      = order;
         }
 
-        public AInitAttribute(EInitAttrMode mode,
-                              int           order = 0
-#if UNITY_EDITOR
-                             ,
-                              [CallerFilePath]   string filePath   = "",
-                              [CallerLineNumber] int    lineNumber = 0
-#endif
-        )
+        public AInitAttribute(EInitAttrMode mode, int order = 0, [CallerFilePath] string filePath = "", [CallerLineNumber] int lineNumber = 0)
         {
-#if UNITY_EDITOR
             FilePath   = filePath.Replace("\\", "/");
             LineNumber = lineNumber + 1;
-#endif
-            Mode  = mode;
+            Mode       = mode;
+            Order      = order;
+        }
+#else
+        public AInitAttribute(int order = 0) { Order = order; }
+        public AInitAttribute(EInitAttrMode mode, int order = 0)
+        {
+            Mode = mode;
             Order = order;
         }
+#endif
 
         public EInitAttrMode Mode { get; set; } = EInitAttrMode.Editor;
 
         public int Order { get; set; }
-#if UNITY_EDITOR
-        public string FilePath   { get; }
-        public int    LineNumber { get; }
-#endif
     }
 }