✨ 更新

Author: xinansky

Editor/Data/AssetBuildConfig.cs

@@ -11,6 +11,11 @@ namespace AIO.UEditor
     [Serializable]
     [Description("资源打包配置")]
     [HelpURL("https://github.com/AIO-GAME/Unity.Asset.CLI/blob/main/.github/API_USAGE/ToolWindow.md#-%E6%89%93%E5%8C%85%E5%B7%A5%E5%85%B7-")]
+#if UNITY_2021_1_OR_NEWER
+    [Icon("Packages/com.aio.cli.asset/Resources/Editor/Icon/pencils.png")]
+#else
+    [ScriptIcon(IconRelative = "Packages/com.aio.cli.asset/Resources/Editor/Icon/pencils.png")]
+#endif
     public partial class AssetBuildConfig : ScriptableObject
     {
         private static AssetBuildConfig _instance;

Editor/Data/Collect/Root/AssetCollectRoot.cs

@@ -19,9 +19,9 @@ namespace AIO.UEditor
     [Serializable]
     [HelpURL("https://github.com/AIO-GAME/Unity.Asset.CLI/blob/main/.github/API_USAGE/ToolWindow.md#asset-system-%E5%B7%A5%E5%85%B7%E8%AF%B4%E6%98%8E")]
 #if UNITY_2021_1_OR_NEWER
-    [Icon("Packages/com.aio.package/Resources/Editor/Setting/icon_interests.png")]
+    [Icon("Packages/com.aio.cli.asset/Resources/Editor/Icon/pencils.png")]
 #else
-    [ScriptIcon(IconRelative = "Packages/com.aio.package/Resources/Editor/Setting/icon_interests.png")]
+    [ScriptIcon(IconRelative = "Packages/com.aio.cli.asset/Resources/Editor/Icon/pencils.png")]
 #endif
     public partial class AssetCollectRoot : ScriptableObject
     {

Editor/Data/Collect/Root/AssetCollectRoot.cs.meta

@@ -31,8 +31,14 @@ public void OnActivation()
 
             HeaderIcon = AssetPreview.GetMiniThumbnail(ASConfig);
             UpdateRecordQueue();
-            PackageNames     = ACConfig.GetNames() ?? Array.Empty<string>();
-            PackageNameIndex = PackageNames.ToList().IndexOf(ABConfig.PackageName);
+            PackageNames = ACConfig.GetNames() ?? Array.Empty<string>();
+            if (PackageNames.Length > 0)
+            {
+                PackageNameIndex = PackageNames.ToList().IndexOf(ABConfig.PackageName);
+                if (PackageNameIndex == -1) PackageNameIndex = 0;
+                ABConfig.PackageName = PackageNames[PackageNameIndex];
+            }
+            else PackageNameIndex = -1;
         }
 
         public void OnGUI()
@@ -467,8 +473,8 @@ private void OnGUIRemote()
                                                     AssetSystem.SequenceRecordQueue.GET_REMOTE_PATH(ASConfig));
 
                             if (GELayout.Button("Upload FTP", GSValue))
-                                AHandle.FTP.Create("", "", "")
-                                       .UploadFile(
+                                AHandle.FTP.Create("", "", "").
+                                        UploadFile(
                                                    AssetSystem.SequenceRecordQueue.LOCAL_PATH);
                         }
                     }
@@ -576,4 +582,4 @@ private void Update()
 
         #endregion
     }
-}
+}

Editor/Windows/AssetWindow.cs.meta

@@ -79,19 +79,21 @@ protected override IEnumerator CreateCoroutine()
 
             private TaskAwaiter<TObject> AwaiterGeneric;
 
+            private AssetOperationHandle Operation;
+
             private async Task<TObject> GetTask()
             {
-                var operation = Instance.HandleGet<AssetOperationHandle>(Address);
-                if (operation is null)
+                Operation = Instance.HandleGet<AssetOperationHandle>(Address);
+                if (Operation is null)
                 {
                     var package = await Instance.AutoGetPackageTask(Address);
                     if (package is null) return null;
-                    operation = package.LoadAssetAsync(Address, AssetType);
-                    if (!await operation.CheckTask()) return null;
-                    Instance.HandleAdd(Address, operation);
+                    Operation = package.LoadAssetAsync(Address, AssetType);
+                    if (!await Operation.CheckTask()) return null;
+                    Instance.HandleAdd(Address, Operation);
                 }
 
-                return operation?.GetAssetObject<TObject>();
+                return Operation?.GetAssetObject<TObject>();
             }
 
             protected override TaskAwaiter<TObject> CreateAsync()
@@ -105,8 +107,7 @@ protected override TaskAwaiter<TObject> CreateAsync()
         }
 
         /// <inheritdoc />
-        public override ILoaderHandle<TObject> LoadAssetAsync<TObject>(string location, Type type, Action<TObject> completed = null) =>
-            new LoadAsset<TObject>(location, type, completed);
+        public override ILoaderHandle<TObject> LoadAssetAsync<TObject>(string location, Type type, Action<TObject> completed = null) => new LoadAsset<TObject>(location, type, completed);
     }
 }
 

Editor/Windows/Inspector/AssetConfigCommonEditor.cs

@@ -15,6 +15,11 @@ namespace AIO.UEngine
 {
     [Description("资源系统配置"), Serializable]
     [HelpURL("https://github.com/AIO-GAME/Unity.Asset.CLI/blob/main/.github/API_USAGE/Config.md#-aiouengineasconfig---%E8%B5%84%E6%BA%90%E7%B3%BB%E7%BB%9F%E9%85%8D%E7%BD%AE-")]
+#if UNITY_2021_1_OR_NEWER
+    [Icon("Packages/com.aio.cli.asset/Resources/Editor/Icon/pencils.png")]
+#else
+    [ScriptIcon(IconRelative = "Packages/com.aio.cli.asset/Resources/Editor/Icon/pencils.png")]
+#endif
     public class ASConfig : ScriptableObject<ASConfig>
     {
         /// <summary>