From 69be3cfa23435aaa23d0d69bf2ba64dc6ab966fa Mon Sep 17 00:00:00 2001
From: Weekend <872285171@qq.com>
Date: Sun, 19 Nov 2023 01:41:47 +0800
Subject: [PATCH] =?UTF-8?q?update:=E7=BB=9F=E4=B8=80WebGL=E5=B9=B3?=
=?UTF-8?q?=E5=8F=B0=E4=B8=8E=E5=85=B6=E4=BB=96=E5=B9=B3=E5=8F=B0=E7=9A=84?=
=?UTF-8?q?=E8=BF=9C=E7=A8=8B=E7=83=AD=E6=9B=B4=E8=B5=84=E6=BA=90=E5=BC=95?=
=?UTF-8?q?=E7=94=A8=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Modules/ResourceModule/BuiltinQueryMgr.cs | 12 ----------
.../ResourceManager.Services.cs | 23 +++++++++++++++++++
.../Modules/ResourceModule/ResourceManager.cs | 5 +++-
3 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/BuiltinQueryMgr.cs b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/BuiltinQueryMgr.cs
index 83c75f91..55d686b6 100644
--- a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/BuiltinQueryMgr.cs
+++ b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/BuiltinQueryMgr.cs
@@ -10,18 +10,6 @@ namespace TEngine
public const string RootFolderName = "yoo";
}
- ///
- /// 内置文件查询服务类。
- ///
- public class BuiltinQueryServices : IBuildinQueryServices
- {
- public bool QueryStreamingAssets(string packageName, string fileName)
- {
- // 注意:fileName包含文件格式
- return BuiltinQueryMgr.FileExists(packageName, fileName);
- }
- }
-
#if UNITY_EDITOR
///
/// 内置资源资源查询帮助类。
diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.Services.cs b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.Services.cs
index 7e09b9d5..011f0bd0 100644
--- a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.Services.cs
+++ b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.Services.cs
@@ -84,6 +84,29 @@ namespace TEngine
return $"{_defaultHostServer}/{_packageName}/{fileName}";
}
}
+
+ ///
+ /// 内置文件查询服务类。
+ ///
+ public class BuiltinQueryServices : IBuildinQueryServices
+ {
+ public bool QueryStreamingAssets(string packageName, string fileName)
+ {
+ // 注意:fileName包含文件格式
+ return BuiltinQueryMgr.FileExists(packageName, fileName);
+ }
+ }
+
+ ///
+ /// WebGL内置文件查询服务类。WebGL平台不需要内置查询,直接使用远程热更资源。
+ ///
+ public class WebGLBuiltinQueryServices : IBuildinQueryServices
+ {
+ public bool QueryStreamingAssets(string packageName, string fileName)
+ {
+ return true;
+ }
+ }
}
public class BundleStream : FileStream
diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.cs b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.cs
index 47c9cd3a..048317f6 100644
--- a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.cs
+++ b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.cs
@@ -394,8 +394,11 @@ namespace TEngine
YooAssets.SetCacheSystemDisableCacheOnWebGL();
var createParameters = new WebPlayModeParameters();
createParameters.DecryptionServices = new GameDecryptionServices();
- createParameters.BuildinQueryServices = new BuiltinQueryServices();
+ createParameters.BuildinQueryServices = new WebGLBuiltinQueryServices();
createParameters.RemoteServices = new RemoteServices(targetPackageName);
+ // WebGL运行模式下,直接使用远程热更资源。
+ createParameters.BuildinRootDirectory = SettingsUtils.FrameworkGlobalSettings.HostServerURL;
+ createParameters.SandboxRootDirectory = SettingsUtils.FrameworkGlobalSettings.HostServerURL;
initializationOperation = package.InitializeAsync(createParameters);
}