From 7eec0f9f914bbd91c0a42f0ae1b96c51bb698a71 Mon Sep 17 00:00:00 2001 From: stary <834207172@qq.COM> Date: Fri, 17 Apr 2026 14:11:12 +0800 Subject: [PATCH] 1 --- .../HybridLoad/Fsm/HotFixStartState.cs | 34 +++++++++---------- .../Runtime/Tools/YooAssetFileSystem.cs | 12 +++++++ Assets/00.StaryEvoTools/package.json | 2 +- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/HotFixStartState.cs b/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/HotFixStartState.cs index d2fbaa7..567a081 100644 --- a/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/HotFixStartState.cs +++ b/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/HotFixStartState.cs @@ -68,7 +68,6 @@ namespace Stary.Evo if (isInitSuccess) await UpdateLocalPackage(packageRawFile); await LoadHotfixSettings(); - //await FsmSystem.SetCurState(nameof(ResUpdateLocalState)); #elif LOCAL_PLAYMODE await OFFLINE_PLAYMODE(package); await UpdateLocalPackage(package); @@ -78,24 +77,19 @@ namespace Stary.Evo await UpdateLocalPackage(packageRawFile); await LoadHotfixSettings(); #elif WEB_NORMAL - IRemoteServices remoteServices = new RemoteServices(defaultHostServer, fallbackHostServer); - var webServerFileSystemParams = FileSystemParameters.CreateDefaultWebServerFileSystemParameters(); - var webRemoteFileSystemParams = - FileSystemParameters.CreateDefaultWebRemoteFileSystemParameters(remoteServices); //支持跨域下载 - - var initParameters = new WebPlayModeParameters(); - initParameters.WebServerFileSystemParameters = webServerFileSystemParams; - initParameters.WebRemoteFileSystemParameters = webRemoteFileSystemParams; - - var initOperation = package.InitializeAsync(initParameters); - await initOperation; - - if (initOperation.Status == EOperationStatus.Succeed) - Debug.Log("UnityEvo:资源包初始化成功!"); - else - Debug.LogError($"UnityEvo:资源包初始化失败:{initOperation.Error}"); + if ((AppConfig.IsLogin)) + { + await GetServerVersion(); + await HOST_PLAYMODE(package); + } + else + { + await OFFLINE_PLAYMODE(package); + await ChChe_PLAYMODE(package); + } - Debug.LogError($"UnityEvo:暂不支持"); + await UpdateLocalPackage(package); + await LoadHotfixSettings(); #endif } @@ -119,7 +113,11 @@ namespace Stary.Evo private async UniTask HOST_PLAYMODE(ResourcePackage package) { +#if WEB_NORMAL + var initParams = YooAssetFileSystem.WebInitializeParameter(package.PackageName); +#else var initParams = YooAssetFileSystem.HostInitializeParameter(package.PackageName); +#endif // initParameters.CacheFileSystemParameters = cacheFileSystemParams; try { diff --git a/Assets/00.StaryEvoTools/Runtime/Tools/YooAssetFileSystem.cs b/Assets/00.StaryEvoTools/Runtime/Tools/YooAssetFileSystem.cs index bbec280..6355189 100644 --- a/Assets/00.StaryEvoTools/Runtime/Tools/YooAssetFileSystem.cs +++ b/Assets/00.StaryEvoTools/Runtime/Tools/YooAssetFileSystem.cs @@ -26,6 +26,18 @@ namespace Stary.Evo initParameters.BuildinFileSystemParameters = buildinFileSystemParams; return initParameters; } + + public static InitializeParameters WebInitializeParameter(string packageName) + { + var cacheFileSystemParams = FileSystemParameters.CreateDefaultBuildinFileSystemParameters(null, + $"{Application.persistentDataPath}/DownloadedContent/{packageName}"); + cacheFileSystemParams.AddParameter(FileSystemParametersDefine.APPEND_FILE_EXTENSION, true); + cacheFileSystemParams.AddParameter(FileSystemParametersDefine.COPY_BUILDIN_PACKAGE_MANIFEST, true); + + var initParameters = new WebPlayModeParameters(); + initParameters.WebServerFileSystemParameters = cacheFileSystemParams; + return initParameters; + } public static InitializeParameters EditorSimulateInitializeParameter(string packageName) { var buildResult = EditorSimulateModeHelper.SimulateBuild(packageName); diff --git a/Assets/00.StaryEvoTools/package.json b/Assets/00.StaryEvoTools/package.json index 80a8a79..c48518d 100644 --- a/Assets/00.StaryEvoTools/package.json +++ b/Assets/00.StaryEvoTools/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.tools", - "version": "1.4.8", + "version": "1.4.9", "displayName": "00.StaryEvo.Tools", "description": "This is an Framework package(后台服务器版本,端口9527)", "unity": "2021.3",