update AssetArtScanner

支持列表元素上下拖拽排序

Assets/YooAsset/Editor/AssetArtScanner/AssetArtScannerWindow.cs

@@ -69,7 +69,6 @@ namespace YooAsset.Editor
                 _scannerListView = root.Q<ListView>("ScannerListView");
                 _scannerListView.makeItem = MakeScannerListViewItem;
                 _scannerListView.bindItem = BindScannerListViewItem;
-
 #if UNITY_2022_3_OR_NEWER
                 _scannerListView.selectionChanged += ScannerListView_onSelectionChange;
 #elif  UNITY_2020_1_OR_NEWER
@@ -277,12 +276,23 @@ namespace YooAsset.Editor
         {
             _scannerListView.Clear();
             _scannerListView.ClearSelection();
-            _scannerListView.itemsSource = FilterScanners();
-            _scannerListView.Rebuild();
 
-            if (_lastModifyScannerIndex >= 0 && _lastModifyScannerIndex < _scannerListView.itemsSource.Count)
+            var filterItems = FilterScanners();
+            if (AssetArtScannerSettingData.Setting.Scanners.Count == filterItems.Count)
             {
-                _scannerListView.selectedIndex = _lastModifyScannerIndex;
+#if UNITY_2020_3_OR_NEWER
+                _scannerListView.reorderable = true;
+#endif
+                _scannerListView.itemsSource = AssetArtScannerSettingData.Setting.Scanners;
+                _scannerListView.Rebuild();
+            }
+            else
+            {
+#if UNITY_2020_3_OR_NEWER
+                _scannerListView.reorderable = false;
+#endif
+                _scannerListView.itemsSource = filterItems;
+                _scannerListView.Rebuild();
             }
         }
         private List<AssetArtScanner> FilterScanners()
@@ -344,31 +354,7 @@ namespace YooAsset.Editor
 
             // 显示检视面板
             var scanSchema = selectScanner.LoadSchema();
-            if (scanSchema != null)
-            {
-                var inspector = scanSchema.CreateInspector();
-                if (inspector == null)
-                {
-                    UIElementsTools.SetElementVisible(_inspectorContainer, false);
-                }
-                else
-                {
-                    if (inspector.Containner is VisualElement container)
-                    {
-                        UIElementsTools.SetElementVisible(_inspectorContainer, true);
-                        _inspectorContainer.Clear();
-                        _inspectorContainer.Add(container);
-                        _inspectorContainer.style.width = inspector.Width;
-                        _inspectorContainer.style.minWidth = inspector.MinWidth;
-                        _inspectorContainer.style.maxWidth = inspector.MaxWidth;
-                    }
-                    else
-                    {
-                        Debug.LogWarning($"{nameof(ScannerSchema)} inspector container is invalid !");
-                        UIElementsTools.SetElementVisible(_inspectorContainer, false);
-                    }
-                }
-            }
+            RefreshInspector(scanSchema);
 
             // 设置Schema对象
             if (scanSchema == null)
@@ -521,6 +507,38 @@ namespace YooAsset.Editor
             AssetArtScannerSettingData.RemoveCollector(selectSacnner, selectCollector);
             FillCollectorViewData();
         }
+
+        // 属性面板相关
+        private void RefreshInspector(ScannerSchema scanSchema)
+        {
+            if (scanSchema == null)
+            {
+                UIElementsTools.SetElementVisible(_inspectorContainer, false);
+                return;
+            }
+
+            var inspector = scanSchema.CreateInspector();
+            if (inspector == null)
+            {
+                UIElementsTools.SetElementVisible(_inspectorContainer, false);
+                return;
+            }
+
+            if (inspector.Containner is VisualElement container)
+            {
+                UIElementsTools.SetElementVisible(_inspectorContainer, true);
+                _inspectorContainer.Clear();
+                _inspectorContainer.Add(container);
+                _inspectorContainer.style.width = inspector.Width;
+                _inspectorContainer.style.minWidth = inspector.MinWidth;
+                _inspectorContainer.style.maxWidth = inspector.MaxWidth;
+            }
+            else
+            {
+                Debug.LogWarning($"{nameof(ScannerSchema)} inspector container is invalid !");
+                UIElementsTools.SetElementVisible(_inspectorContainer, false);
+            }
+        }
     }
 }
 #endif

Assets/YooAsset/Editor/AssetArtScanner/AssetArtScannerWindow.uxml

@@ -9,7 +9,7 @@
         <ui:VisualElement name="ScannerListContainer" style="width: 250px; flex-grow: 0; background-color: rgb(67, 67, 67); border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
             <ui:Label text="Scanner List" display-tooltip-when-elided="true" name="ScannerListTitle" style="background-color: rgb(89, 89, 89); -unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 3px; border-right-width: 3px; border-top-width: 3px; border-bottom-width: 3px; font-size: 12px;" />
             <uie:ToolbarSearchField focusable="true" name="ScannerSearchField" style="width: 230px;" />
-            <ui:ListView focusable="true" name="ScannerListView" item-height="20" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
+            <ui:ListView focusable="true" name="ScannerListView" item-height="20" virtualization-method="DynamicHeight" reorder-mode="Animated" reorderable="true" style="flex-grow: 1;" />
             <ui:VisualElement name="ScannerAddContainer" style="justify-content: center; flex-direction: row; flex-shrink: 0;">
                 <ui:Button text=" - " display-tooltip-when-elided="true" name="RemoveBtn" />
                 <ui:Button text=" + " display-tooltip-when-elided="true" name="AddBtn" />

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml

@@ -28,7 +28,7 @@
     <ui:VisualElement name="ContentContainer" style="flex-grow: 1; flex-direction: row;">
         <ui:VisualElement name="PackageContainer" style="width: 200px; flex-grow: 0; background-color: rgb(67, 67, 67); border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
             <ui:Label text="Packages" display-tooltip-when-elided="true" name="PackageTitle" style="background-color: rgb(89, 89, 89); -unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px; font-size: 12px;" />
-            <ui:ListView focusable="true" name="PackageListView" item-height="20" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
+            <ui:ListView focusable="true" name="PackageListView" item-height="20" virtualization-method="DynamicHeight" reorderable="true" reorder-mode="Animated" style="flex-grow: 1;" />
             <ui:VisualElement name="PackageAddContainer" style="height: 20px; flex-direction: row; justify-content: center;">
                 <ui:Button text=" - " display-tooltip-when-elided="true" name="RemoveBtn" />
                 <ui:Button text=" + " display-tooltip-when-elided="true" name="AddBtn" />
@@ -38,7 +38,7 @@
             <ui:Label text="Groups" display-tooltip-when-elided="true" name="GroupTitle" style="background-color: rgb(89, 89, 89); -unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px; font-size: 12px;" />
             <ui:TextField picking-mode="Ignore" label="Package Name" name="PackageName" style="flex-direction: column;" />
             <ui:TextField picking-mode="Ignore" label="Package Desc" name="PackageDesc" style="flex-direction: column;" />
-            <ui:ListView focusable="true" name="GroupListView" item-height="20" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
+            <ui:ListView focusable="true" name="GroupListView" item-height="20" virtualization-method="DynamicHeight" reorderable="true" reorder-mode="Animated" style="flex-grow: 1;" />
             <ui:VisualElement name="GroupAddContainer" style="height: 20px; flex-direction: row; justify-content: center;">
                 <ui:Button text=" - " display-tooltip-when-elided="true" name="RemoveBtn" />
                 <ui:Button text=" + " display-tooltip-when-elided="true" name="AddBtn" />

Assets/YooAsset/Editor/UIElements/ElementsDefine/PanelSplitView.cs

@@ -12,15 +12,9 @@ namespace YooAsset.Editor
     /// </summary>
     public class PanelSplitView : TwoPaneSplitView
     {
-#if UNITY_6000_0_OR_NEWER
-        public new class UxmlFactory : UxmlElementAttribute
-        {
-        }
-#else
         public new class UxmlFactory : UxmlFactory<PanelSplitView, UxmlTraits>
         {
         }
-#endif
 
         /// <summary>
         /// 竖版分屏

Assets/YooAsset/Editor/UIElements/ElementsDefine/ResizeHandle.cs

@@ -9,15 +9,9 @@ namespace YooAsset.Editor
 {
     public class ResizeHandle : VisualElement
     {
-#if UNITY_6000_0_OR_NEWER
-        public new class UxmlFactory : UxmlElementAttribute
-        {
-        }
-#else
         public new class UxmlFactory : UxmlFactory<ResizeHandle, UxmlTraits>
         {
         }
-#endif
 
         private bool _isResizing = false;
         private float _initialWidth;

Assets/YooAsset/Editor/UIElements/TableView/TableView.cs

@@ -15,15 +15,9 @@ namespace YooAsset.Editor
     /// </summary>
     public class TableView : VisualElement
     {
-#if UNITY_6000_0_OR_NEWER
-        public new class UxmlFactory : UxmlElementAttribute
-        {
-        }
-#else
         public new class UxmlFactory : UxmlFactory<TableView, UxmlTraits>
         {
         }
-#endif
 
         private readonly Toolbar _toolbar;
         private readonly ListView _listView;

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/BundleResult.meta

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

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/BundleResult/TTAssetBundleResult.cs

@@ -0,0 +1,68 @@
+#if UNITY_WEBGL && DOUYINMINIGAME
+using System.IO;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using TTSDK;
+
+namespace YooAsset
+{
+    internal class TTAssetBundleResult : BundleResult
+    {
+        private readonly IFileSystem _fileSystem;
+        private readonly PackageBundle _packageBundle;
+        private readonly AssetBundle _assetBundle;
+        
+        public TTAssetBundleResult(IFileSystem fileSystem, PackageBundle packageBundle, AssetBundle assetBundle)
+        {
+            _fileSystem = fileSystem;
+            _packageBundle = packageBundle;
+            _assetBundle = assetBundle;
+        }
+
+        public override void UnloadBundleFile()
+        {
+            if (_assetBundle != null)
+            {
+                _assetBundle.TTUnload(true);
+            }
+        }
+        public override string GetBundleFilePath()
+        {
+            return _fileSystem.GetBundleFilePath(_packageBundle);
+        }
+        public override byte[] ReadBundleFileData()
+        {
+            return _fileSystem.ReadBundleFileData(_packageBundle);
+        }
+        public override string ReadBundleFileText()
+        {
+            return _fileSystem.ReadBundleFileText(_packageBundle);
+        }
+
+        public override FSLoadAssetOperation LoadAssetAsync(AssetInfo assetInfo)
+        {
+            var operation = new AssetBundleLoadAssetOperation(_packageBundle, _assetBundle, assetInfo);
+            OperationSystem.StartOperation(_fileSystem.PackageName, operation);
+            return operation;
+        }
+        public override FSLoadAllAssetsOperation LoadAllAssetsAsync(AssetInfo assetInfo)
+        {
+            var operation = new AssetBundleLoadAllAssetsOperation(_packageBundle, _assetBundle, assetInfo);
+            OperationSystem.StartOperation(_fileSystem.PackageName, operation);
+            return operation;
+        }
+        public override FSLoadSubAssetsOperation LoadSubAssetsAsync(AssetInfo assetInfo)
+        {
+            var operation = new AssetBundleLoadSubAssetsOperation(_packageBundle, _assetBundle, assetInfo);
+            OperationSystem.StartOperation(_fileSystem.PackageName, operation);
+            return operation;
+        }
+        public override FSLoadSceneOperation LoadSceneOperation(AssetInfo assetInfo, LoadSceneParameters loadParams, bool suspendLoad)
+        {
+            var operation = new AssetBundleLoadSceneOperation(assetInfo, loadParams, suspendLoad);
+            OperationSystem.StartOperation(_fileSystem.PackageName, operation);
+            return operation;
+        }
+    }
+}
+#endif

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/BundleResult/TTAssetBundleResult.cs.meta

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

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadBundleOperation.cs

@@ -69,7 +69,7 @@ internal class TTFSLoadBundleOperation : FSLoadBundleOperation
                 else
                 {
                     _steps = ESteps.Done;
-                    Result = new AssetBundleResult(_fileSystem, _bundle, assetBundle, null);
+                    Result = new TTAssetBundleResult(_fileSystem, _bundle, assetBundle);
                     Status = EOperationStatus.Succeed;
                 }
             }

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/TiktokFileSystem.cs

@@ -8,7 +8,7 @@ using System;
 
 public static class TiktokFileSystemCreater
 {
-    public static FileSystemParameters CreateByteGameFileSystemParameters(string packageRoot, IRemoteServices remoteServices)
+    public static FileSystemParameters CreateFileSystemParameters(string packageRoot, IRemoteServices remoteServices)
     {
         string fileSystemClass = $"{nameof(TiktokFileSystem)},YooAsset.RuntimeExtension";
         var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
@@ -16,7 +16,7 @@ public static class TiktokFileSystemCreater
         return fileSystemParams;
     }
 
-    public static FileSystemParameters CreateByteGameFileSystemParameters(string packageRoot, IRemoteServices remoteServices, IWebDecryptionServices decryptionServices)
+    public static FileSystemParameters CreateFileSystemParameters(string packageRoot, IRemoteServices remoteServices, IWebDecryptionServices decryptionServices)
     {
         string fileSystemClass = $"{nameof(TiktokFileSystem)},YooAsset.RuntimeExtension";
         var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
@@ -268,19 +268,6 @@ internal class TiktokFileSystem : IFileSystem
         }
         return filePath;
     }
-
-    /// <summary>
-    /// 加载加密资源文件
-    /// </summary>
-    public AssetBundle LoadEncryptedAssetBundle(PackageBundle bundle, byte[] fileData)
-    {
-        WebDecryptFileInfo fileInfo = new WebDecryptFileInfo();
-        fileInfo.BundleName = bundle.BundleName;
-        fileInfo.FileLoadCRC = bundle.UnityCRC;
-        fileInfo.FileData = fileData;
-        var decryptResult = DecryptionServices.LoadAssetBundle(fileInfo);
-        return decryptResult.Result;
-    }
     #endregion
 }
 #endif

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSLoadBundleOperation.cs

@@ -67,7 +67,7 @@ internal class WXFSLoadBundleOperation : FSLoadBundleOperation
                 else
                 {
                     _steps = ESteps.Done;
-                    Result = new AssetBundleResult(_fileSystem, _bundle, assetBundle, null);
+                    Result = new WXAssetBundleResult(_fileSystem, _bundle, assetBundle);
                     Status = EOperationStatus.Succeed;
                 }
             }

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/WechatFileSystem.cs

@@ -8,14 +8,14 @@ using WeChatWASM;
 
 public static class WechatFileSystemCreater
 {
-    public static FileSystemParameters CreateWechatFileSystemParameters(string packageRoot, IRemoteServices remoteServices)
+    public static FileSystemParameters CreateFileSystemParameters(string packageRoot, IRemoteServices remoteServices)
     {
         string fileSystemClass = $"{nameof(WechatFileSystem)},YooAsset.RuntimeExtension";
         var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
         fileSystemParams.AddParameter(FileSystemParametersDefine.REMOTE_SERVICES, remoteServices);
         return fileSystemParams;
     }
-    public static FileSystemParameters CreateWechatFileSystemParameters(string packageRoot, IRemoteServices remoteServices, IWebDecryptionServices decryptionServices)
+    public static FileSystemParameters CreateFileSystemParameters(string packageRoot, IRemoteServices remoteServices, IWebDecryptionServices decryptionServices)
     {
         string fileSystemClass = $"{nameof(WechatFileSystem)},YooAsset.RuntimeExtension";
         var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
@@ -286,19 +286,6 @@ internal class WechatFileSystem : IFileSystem
         }
         return filePath;
     }
-
-    /// <summary>
-    /// 加载加密资源文件
-    /// </summary>
-    public AssetBundle LoadEncryptedAssetBundle(PackageBundle bundle, byte[] fileData)
-    {
-        WebDecryptFileInfo fileInfo = new WebDecryptFileInfo();
-        fileInfo.BundleName = bundle.BundleName;
-        fileInfo.FileLoadCRC = bundle.UnityCRC;
-        fileInfo.FileData = fileData;
-        var decryptResult = DecryptionServices.LoadAssetBundle(fileInfo);
-        return decryptResult.Result;
-    }
     #endregion
 }
 #endif

Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/PatchLogic/FsmNode/FsmInitializePackage.cs

@@ -76,7 +76,7 @@ internal class FsmInitializePackage : IStateNode
             string fallbackHostServer = GetHostServerURL();
             string packageRoot = $"{WeChatWASM.WX.env.USER_DATA_PATH}/__GAME_FILE_CACHE"; //注意：如果有子目录，请修改此处！
             IRemoteServices remoteServices = new RemoteServices(defaultHostServer, fallbackHostServer);
-            createParameters.WebServerFileSystemParameters = WechatFileSystemCreater.CreateWechatFileSystemParameters(packageRoot, remoteServices);
+            createParameters.WebServerFileSystemParameters = WechatFileSystemCreater.CreateFileSystemParameters(packageRoot, remoteServices);
 #else
             createParameters.WebServerFileSystemParameters = FileSystemParameters.CreateDefaultWebServerFileSystemParameters(new WebDecryption());
 #endif