add mini game sample

小游戏扩展库独立

Assets/YooAsset/Editor/AssetArtReporter/AssetArtReporterWindow.cs

@@ -196,6 +196,32 @@ namespace YooAsset.Editor
             }
         }
 
+        /// <summary>
+        /// 导入单个报告对象
+        /// </summary>
+        public void ImportSingleReprotFile(ScanReport report)
+        {
+            _reportCombiner = new ScanReportCombiner();
+
+            try
+            {
+                _reportCombiner.Combine(report);
+
+                // 刷新页面
+                RefreshToolbar();
+                FillTableView();
+                RebuildView();
+            }
+            catch (System.Exception e)
+            {
+                _reportCombiner = null;
+                _titleLabel.text = "导入报告失败！";
+                _descLabel.text = e.Message;
+                UnityEngine.Debug.LogError(e.StackTrace);
+            }
+        }
+
+
         private void ImportSingleBtn_clicked()
         {
             string selectFilePath = EditorUtility.OpenFilePanel("导入报告", _lastestOpenFolder, "json");
@@ -446,15 +472,31 @@ namespace YooAsset.Editor
                 var column = new TableColumn(header.HeaderTitle, header.HeaderTitle, columnStyle);
                 column.MakeCell = () =>
                 {
-                    var label = new Label();
+                    if (header.HeaderType == EHeaderType.AssetObject)
-                    label.style.marginLeft = 3f;
+                    {
-                    label.style.unityTextAlign = TextAnchor.MiddleLeft;
+                        var objectFiled = new ObjectField();
-                    return label;
+                        return objectFiled;
+                    }
+                    else
+                    {
+                        var label = new Label();
+                        label.style.marginLeft = 3f;
+                        label.style.unityTextAlign = TextAnchor.MiddleLeft;
+                        return label;
+                    }
                 };
                 column.BindCell = (VisualElement element, ITableData data, ITableCell cell) =>
                 {
-                    var infoLabel = element as Label;
+                    if (header.HeaderType == EHeaderType.AssetObject)
-                    infoLabel.text = (string)cell.GetDisplayObject();
+                    {
+                        var objectFiled = element as ObjectField;
+                        objectFiled.value = (UnityEngine.Object)cell.GetDisplayObject();
+                    }
+                    else
+                    {
+                        var infoLabel = element as Label;
+                        infoLabel.text = (string)cell.GetDisplayObject();
+                    }
                 };
                 _elementTableView.AddColumn(column);
             }
@@ -480,6 +522,10 @@ namespace YooAsset.Editor
                     {
                         tableData.AddAssetPathCell(scanInfo.HeaderTitle, scanInfo.ScanInfo);
                     }
+                    else if (header.HeaderType == EHeaderType.AssetObject)
+                    {
+                        tableData.AddAssetObjectCell(scanInfo.HeaderTitle, scanInfo.ScanInfo);
+                    }
                     else if (header.HeaderType == EHeaderType.StringValue)
                     {
                         tableData.AddStringValueCell(scanInfo.HeaderTitle, scanInfo.ScanInfo);

Assets/YooAsset/Editor/AssetArtReporter/EHeaderType.cs

@@ -8,6 +8,11 @@ namespace YooAsset.Editor
         /// </summary>
         AssetPath,
 
+        /// <summary>
+        /// 资源对象
+        /// </summary>
+        AssetObject,
+
         /// <summary>
         /// 字符串
         /// </summary>

Assets/YooAsset/Editor/AssetArtReporter/ReportHeader.cs

@@ -126,6 +126,12 @@ namespace YooAsset.Editor
                 if (string.IsNullOrEmpty(guid))
                     throw new Exception($"{HeaderTitle} value is invalid asset path : {value}");
             }
+            else if (HeaderType == EHeaderType.AssetObject)
+            {
+                string guid = AssetDatabase.AssetPathToGUID(value);
+                if (string.IsNullOrEmpty(guid))
+                    throw new Exception($"{HeaderTitle} value is invalid asset object : {value}");
+            }
             else if (HeaderType == EHeaderType.DoubleValue)
             {
                 if (double.TryParse(value, out double doubleValue) == false)

Assets/YooAsset/Editor/AssetArtScanner/AssetArtScannerSetting.cs

@@ -46,7 +46,7 @@ namespace YooAsset.Editor
             }
             catch (Exception e)
             {
-                return new ScannerResult(e.Message);
+                return new ScannerResult(e.StackTrace);
             }
         }
 

Assets/YooAsset/Editor/AssetArtScanner/ScannerResult.cs

@@ -52,7 +52,7 @@ namespace YooAsset.Editor
             if (Succeed)
             {
                 var reproterWindow = AssetArtReporterWindow.OpenWindow();
-                reproterWindow.ImportSingleReprotFile(ReprotFilePath);
+                reproterWindow.ImportSingleReprotFile(Report);
             }
         }
     }

Assets/YooAsset/Editor/AssetBundleCollector/AssetDependencyDatabase.cs

@@ -70,7 +70,11 @@ namespace YooAsset.Editor
                     foreach (var cacheInfoPair in _database)
                     {
                         var assetPath = cacheInfoPair.Key;
+#if UNITY_2021_3_OR_NEWER
                         var assetGUID = AssetDatabase.AssetPathToGUID(assetPath, AssetPathToGUIDOptions.OnlyExistingAssets);
+#else
+                        var assetGUID = AssetDatabase.AssetPathToGUID(assetPath);
+#endif
                         if (string.IsNullOrEmpty(assetGUID))
                         {
                             removeList.Add(assetPath);

Assets/YooAsset/Editor/UIElements/TableViewer/DefaultCells/AssetObjectCell.cs

@@ -0,0 +1,42 @@
+#if UNITY_2019_4_OR_NEWER
+using UnityEditor;
+using System;
+
+namespace YooAsset.Editor
+{
+    public class AssetObjectCell : ITableCell, IComparable
+    {
+        public string SearchTag { private set; get; }
+        public object CellValue { set; get; }
+        public string StringValue
+        {
+            get
+            {
+                return (string)CellValue;
+            }
+        }
+
+        public AssetObjectCell(string searchTag, string assetPath)
+        {
+            SearchTag = searchTag;
+            CellValue = assetPath;
+        }
+
+        public object GetDisplayObject()
+        {
+            return AssetDatabase.LoadMainAssetAtPath(StringValue);
+        }
+        public int CompareTo(object other)
+        {
+            if (other is AssetObjectCell cell)
+            {
+                return this.StringValue.CompareTo(cell.StringValue);
+            }
+            else
+            {
+                return 0;
+            }
+        }
+    }
+}
+#endif

Assets/YooAsset/Editor/UIElements/TableViewer/DefaultCells/AssetObjectCell.cs.meta

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

Assets/YooAsset/Editor/UIElements/TableViewer/DefaultTableData/DefaultTableData.cs

@@ -31,9 +31,14 @@ namespace YooAsset.Editor
             var cell = new ButtonCell(searchTag);
             Cells.Add(cell);
         }
-        public void AddAssetPathCell(string searchTag, string path)
+        public void AddAssetPathCell(string searchTag, string assetPath)
         {
-            var cell = new AssetPathCell(searchTag, path);
+            var cell = new AssetPathCell(searchTag, assetPath);
+            Cells.Add(cell);
+        }
+        public void AddAssetObjectCell(string searchTag, string assetPath)
+        {
+            var cell = new AssetObjectCell(searchTag, assetPath);
             Cells.Add(cell);
         }
         public void AddStringValueCell(string searchTag, string value)

Assets/YooAsset/Runtime/Assembly/AssemblyInfo.cs

@@ -5,6 +5,7 @@
 [assembly: InternalsVisibleTo("YooAsset.Test.Editor")]
 
 // 外部友元
+[assembly: InternalsVisibleTo("YooAsset.MiniGame")]
 [assembly: InternalsVisibleTo("YooAsset.RuntimeExtension")]
 [assembly: InternalsVisibleTo("YooAsset.EditorExtension")]
 [assembly: InternalsVisibleTo("Assembly-CSharp-Editor")]

Assets/YooAsset/Runtime/DownloadSystem/DownloadSystemHelper.cs

@@ -69,6 +69,8 @@ namespace YooAsset
             url = new System.Uri(path).ToString();
 #elif UNITY_STANDALONE || UNITY_WSA
             url = StringUtility.Format("file:///{0}", path);
+#elif UNITY_TVOS
+            url = StringUtility.Format("file:///{0}", path);
 #else
             throw new System.NotImplementedException();
 #endif

Assets/YooAsset/Runtime/Utility/YooUtility.cs

@@ -34,6 +34,20 @@ namespace YooAsset
                 return str.Remove(index); //"assets/config/test.unity3d" --> "assets/config/test"
         }
 
+        /// <summary>
+        /// URL地址是否包含双斜杠
+        /// 注意：只检查协议之后的部分
+        /// </summary>
+        public static bool HasDoubleSlashes(string url)
+        {
+            if (url == null)
+                throw new ArgumentNullException();
+
+            int protocolIndex = url.IndexOf("://");
+            string partToCheck = protocolIndex == -1 ? url : url.Substring(protocolIndex + 3);
+            return partToCheck.Contains("//") || partToCheck.Contains(@"\\");
+        }
+
         /// <summary>
         /// 合并路径
         /// </summary>

Assets/YooAsset/Runtime/YooAssets.cs

@@ -75,7 +75,14 @@ namespace YooAsset
                 if (_driver != null)
                     GameObject.Destroy(_driver);
 
-                OnApplicationQuit(true);
+                // 终止并清空所有包裹的异步操作
+                ClearAllPackageOperation();
+
+                // 卸载所有AssetBundle
+                AssetBundle.UnloadAllAssetBundles(true);
+
+                // 清空资源包裹列表
+                _packages.Clear();
             }
         }
 
@@ -91,25 +98,15 @@ namespace YooAsset
         }
 
         /// <summary>
-        /// 应用程序退出处理
+        /// 终止并清空所有包裹的异步操作
         /// </summary>
-        internal static void OnApplicationQuit(bool unloadAllAssetBundles)
+        internal static void ClearAllPackageOperation()
         {
-            // 说明：在编辑器下确保播放被停止时IO类操作被终止。
             foreach (var package in _packages)
             {
                 OperationSystem.ClearPackageOperation(package.PackageName);
             }
             OperationSystem.DestroyAll();
-
-            // 清空资源包裹列表
-            _packages.Clear();
-
-            // 卸载所有AssetBundle
-            if (unloadAllAssetBundles)
-            {
-                AssetBundle.UnloadAllAssetBundles(true);
-            }
         }
 
         /// <summary>

Assets/YooAsset/Runtime/YooAssetsDriver.cs

@@ -24,7 +24,8 @@ namespace YooAsset
 #if UNITY_EDITOR
         void OnApplicationQuit()
         {
-            YooAssets.OnApplicationQuit(false);
+            // 说明：在编辑器下确保播放被停止时IO类操作被终止。
+            YooAssets.ClearAllPackageOperation();
         }
 #endif
 

Assets/YooAsset/Samples~/Extension Sample/Runtime/YooAsset.RuntimeExtension.asmdef

@@ -2,9 +2,7 @@
     "name": "YooAsset.RuntimeExtension",
     "rootNamespace": "",
     "references": [
-        "GUID:e34a5702dd353724aa315fb8011f08c3",
+        "GUID:e34a5702dd353724aa315fb8011f08c3"
-        "GUID:5efd170ecd8084500bed5692932fe14e",
-        "GUID:bb21d6197862c4c3e863390dec9859a7"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/YooAsset/Samples~/Mini Game.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5280dfac6a481ee429c769ba5688c9d2
+guid: 2bbcb90032364234abe49c81b95714e1
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/YooAsset/Samples~/Mini Game/Runtime.meta

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

Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/TTFSRequestPackageVersionOperation.cs

@@ -11,14 +11,16 @@ internal class TTFSRequestPackageVersionOperation : FSRequestPackageVersionOpera
     }
 
     private readonly TiktokFileSystem _fileSystem;
+    private readonly bool _appendTimeTicks;
     private readonly int _timeout;
     private RequestTiktokPackageVersionOperation _requestPackageVersionOp;
     private ESteps _steps = ESteps.None;
 
 
-    internal TTFSRequestPackageVersionOperation(TiktokFileSystem fileSystem, int timeout)
+    internal TTFSRequestPackageVersionOperation(TiktokFileSystem fileSystem, bool appendTimeTicks, int timeout)
     {
         _fileSystem = fileSystem;
+        _appendTimeTicks = appendTimeTicks;
         _timeout = timeout;
     }
     internal override void InternalStart()
@@ -34,7 +36,7 @@ internal class TTFSRequestPackageVersionOperation : FSRequestPackageVersionOpera
         {
             if (_requestPackageVersionOp == null)
             {
-                _requestPackageVersionOp = new RequestTiktokPackageVersionOperation(_fileSystem, _timeout);
+                _requestPackageVersionOp = new RequestTiktokPackageVersionOperation(_fileSystem, _appendTimeTicks, _timeout);
                 _requestPackageVersionOp.StartOperation();
                 AddChildOperation(_requestPackageVersionOp);
             }

Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs

@@ -11,6 +11,7 @@ internal class RequestTiktokPackageVersionOperation : AsyncOperationBase
     }
 
     private readonly TiktokFileSystem _fileSystem;
+    private readonly bool _appendTimeTicks;
     private readonly int _timeout;
     private UnityWebTextRequestOperation _webTextRequestOp;
     private int _requestCount = 0;
@@ -21,10 +22,11 @@ internal class RequestTiktokPackageVersionOperation : AsyncOperationBase
     /// </summary>
     public string PackageVersion { private set; get; }
 
-    
+
-    public RequestTiktokPackageVersionOperation(TiktokFileSystem fileSystem, int timeout)
+    public RequestTiktokPackageVersionOperation(TiktokFileSystem fileSystem, bool appendTimeTicks, int timeout)
     {
         _fileSystem = fileSystem;
+        _appendTimeTicks = appendTimeTicks;
         _timeout = timeout;
     }
     internal override void InternalStart()
@@ -80,11 +82,19 @@ internal class RequestTiktokPackageVersionOperation : AsyncOperationBase
 
     private string GetRequestURL(string fileName)
     {
+        string url;
+
         // 轮流返回请求地址
         if (_requestCount % 2 == 0)
-            return _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
+            url = _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
         else
-            return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
+            url = _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
+
+        // 在URL末尾添加时间戳
+        if (_appendTimeTicks)
+            return $"{url}?{System.DateTime.UtcNow.Ticks}";
+        else
+            return url;
     }
 }
 #endif

Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/TiktokFileSystem.cs

@@ -121,7 +121,7 @@ internal class TiktokFileSystem : IFileSystem
     }
     public virtual FSRequestPackageVersionOperation RequestPackageVersionAsync(bool appendTimeTicks, int timeout)
     {
-        var operation = new TTFSRequestPackageVersionOperation(this, timeout);
+        var operation = new TTFSRequestPackageVersionOperation(this, appendTimeTicks, timeout);
         return operation;
     }
     public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options)

Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageVersionOperation.cs

@@ -11,8 +11,8 @@ internal class RequestWechatPackageVersionOperation : AsyncOperationBase
     }
 
     private readonly WechatFileSystem _fileSystem;
-    private readonly int _timeout;
     private readonly bool _appendTimeTicks;
+    private readonly int _timeout;
     private UnityWebTextRequestOperation _webTextRequestOp;
     private int _requestCount = 0;
     private ESteps _steps = ESteps.None;

Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/WechatFileSystem.cs

@@ -198,6 +198,15 @@ internal class WechatFileSystem : IFileSystem
             RemoteServices = new WebRemoteServices(webRoot);
         }
 
+        // 检查URL双斜杠
+        // 注意：双斜杠会导致微信插件加载文件失败，但网络请求又不返回失败！
+        {
+            var mainURL = RemoteServices.GetRemoteMainURL("test.bundle");
+            var fallbackURL = RemoteServices.GetRemoteFallbackURL("test.bundle");
+            if (PathUtility.HasDoubleSlashes(mainURL) || PathUtility.HasDoubleSlashes(fallbackURL))
+                throw new Exception($"{nameof(RemoteServices)} returned URL contains double slashes. !");
+        }
+
         _fileSystemMgr = WX.GetFileSystemManager();
     }
     public virtual void OnDestroy()

Assets/YooAsset/Samples~/Mini Game/Runtime/YooAsset.MiniGame.asmdef

@@ -0,0 +1,18 @@
+{
+    "name": "YooAsset.MiniGame",
+    "rootNamespace": "",
+    "references": [
+        "GUID:e34a5702dd353724aa315fb8011f08c3",
+        "GUID:5efd170ecd8084500bed5692932fe14e",
+        "GUID:bb21d6197862c4c3e863390dec9859a7"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Assets/YooAsset/Samples~/Mini Game/Runtime/YooAsset.MiniGame.asmdef.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 839b8c2cb327b8a43afe86fd33563571
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/package.json

@@ -14,6 +14,11 @@
             "description": "YooAsset runtime sample, Include resource update, resource download, resource loading and other functions.",
             "path": "Samples~/Space Shooter"
         },
+        {
+            "displayName": "Mini Game",
+            "description": "YooAsset extension file system, Include wechat file system, tiktok file system.",
+            "path": "Samples~/Mini Game"
+        },
         {
             "displayName": "Extension Sample",
             "description": "YooAsset extension sample, Include patcher combine, patcher compare, patcher importer and other functions.",