[fix][runtime]:uwr访问本地文件路径统一加file头

CatImmortal · Nov 1, 2023 · 398f9ba · 398f9ba
1 parent a751c0f
commit 398f9ba
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/Assets/CatAsset/Runtime/Database/RuntimeInfo/BundleRuntimeInfo.cs b/Assets/CatAsset/Runtime/Database/RuntimeInfo/BundleRuntimeInfo.cs
@@ -89,7 +89,7 @@ public string LoadPath
                     switch (BundleState)
                     {
                         case State.InReadOnly:
-                            loadPath = RuntimeUtil.GetReadOnlyPath(Manifest.RelativePath);
+                            loadPath = RuntimeUtil.GetReadOnlyPath(Manifest.RelativePath,Manifest.IsRaw);
                             break;
                         case State.InReadWrite:
                         case State.InRemote:

diff --git a/Assets/CatAsset/Runtime/Loader/PackageOnlyAssetLoader.cs b/Assets/CatAsset/Runtime/Loader/PackageOnlyAssetLoader.cs
@@ -11,7 +11,7 @@ public class PackageOnlyAssetLoader : DefaultAssetLoader
         /// <inheritdoc />
         public override void CheckVersion(OnVersionChecked onVersionChecked)
         {
-            string path = RuntimeUtil.GetReadOnlyPath(CatAssetManifest.ManifestBinaryFileName);
+            string path = RuntimeUtil.GetReadOnlyPath(CatAssetManifest.ManifestBinaryFileName,true);
 
             CatAssetManager.AddWebRequestTask(path,path,((success, uwr) =>
             {

diff --git a/Assets/CatAsset/Runtime/Misc/RuntimeUtil.cs b/Assets/CatAsset/Runtime/Misc/RuntimeUtil.cs
@@ -37,9 +37,16 @@ public static string GetRegularPath(string path)
         /// <summary>
         /// 获取在只读区下的完整路径
         /// </summary>
-        public static string GetReadOnlyPath(string path)
+        public static string GetReadOnlyPath(string path,bool isUwrPath = false)
         {
             string result = GetRegularPath(Path.Combine(Application.streamingAssetsPath, path));
+
+            if (isUwrPath && !path.Contains("file://"))
+            {
+                //使用UnityWebRequest访问 统一加file://头
+                result = "file://" + result;
+            }
+
             return result;
         }
 
@@ -53,7 +60,7 @@ public static string GetReadWritePath(string path,bool isUwrPath = false)
 
             if (isUwrPath && !path.Contains("file://"))
             {
-                //使用UnityWebRequest访问Persistent路径 统一加file://头
+                //使用UnityWebRequest访问 统一加file://头
                 result = "file://" + result;
             }
 

diff --git a/Assets/CatAsset/Runtime/Updatable/Checker/VersionChecker.cs b/Assets/CatAsset/Runtime/Updatable/Checker/VersionChecker.cs
@@ -52,7 +52,7 @@ public static void CheckVersion(OnVersionChecked callback)
             onVersionChecked = callback;
 
             //进行只读区 读写区 远端三方的资源清单检查
-            string readOnlyManifestPath = RuntimeUtil.GetReadOnlyPath(CatAssetManifest.ManifestBinaryFileName);
+            string readOnlyManifestPath = RuntimeUtil.GetReadOnlyPath(CatAssetManifest.ManifestBinaryFileName,true);
             string readWriteManifestPath = RuntimeUtil.GetReadWritePath(CatAssetManifest.ManifestBinaryFileName, true);
             string remoteManifestPath = RuntimeUtil.GetRemotePath(CatAssetManifest.ManifestBinaryFileName);