AlphaaeGameStudio/TEngine
1
0
Fork 0
mirror of https://github.com/Alex-Rachel/TEngine.git synced 2025-08-14 16:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

简化流程，支持非强制更新，移除冗余UpdateMainFest与UpdateVersion的流程，因为Yoo统一了编辑器单机和联网的流程了。

Browse Source 
简化流程，支持非强制更新，移除冗余UpdateMainFest与UpdateVersion的流程，因为Yoo统一了编辑器单机和联网的流程了。
This commit is contained in:
Alex-Rachel
2025-03-25 19:10:39 +08:00
parent b1d06ecef5
commit e37c066f9f
8 changed files with 102 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
UnityProject/Assets/GameScripts/Procedure/ProcedureInitResources.cs
View File

@@ -1,8 +1,7 @@
using System;
using System.Collections;
using Cysharp.Threading.Tasks;
using System.Collections;
using Launcher;
using TEngine;
using UnityEngine;
using YooAsset;
using ProcedureOwner = TEngine.IFsm<TEngine.IProcedureModule>;
@@ -14,8 +13,12 @@ namespace Procedure
public override bool UseNativeDialog => true;
private ProcedureOwner _procedureOwner;
protected override void OnEnter(ProcedureOwner procedureOwner)
{
_procedureOwner = procedureOwner;
base.OnEnter(procedureOwner);
_initResourcesComplete = false;
@@ -26,6 +29,11 @@ namespace Procedure
Utility.Unity.StartCoroutine(InitResources(procedureOwner));
}
private void ChangeToCreateDownloaderState(ProcedureOwner procedureOwner)
{
ChangeState<ProcedureCreateDownloader>(procedureOwner);
}
protected override void OnUpdate(ProcedureOwner procedureOwner, float elapseSeconds, float realElapseSeconds)
{
base.OnUpdate(procedureOwner, elapseSeconds, realElapseSeconds);
@@ -36,25 +44,35 @@ namespace Procedure
return;
}
if ((_resourceModule.PlayMode == EPlayMode.HostPlayMode || _resourceModule.PlayMode == EPlayMode.WebPlayMode))
if (_resourceModule.PlayMode == EPlayMode.HostPlayMode || _resourceModule.PlayMode == EPlayMode.WebPlayMode)
{
//线上最新版本operation.PackageVersion
Log.Debug($"Updated package Version : from {_resourceModule.GetPackageVersion()} to {_resourceModule.PackageVersion}");
ChangeState<ProcedureUpdateManifest>(procedureOwner);
//注意：保存资源版本号作为下次默认启动的版本!
// 如果当前是WebGL或者是边玩边下载直接进入预加载阶段。
if (_resourceModule.PlayMode == EPlayMode.WebPlayMode ||
_resourceModule.UpdatableWhilePlaying)
{
// 边玩边下载还可以拓展首包支持。
ChangeToPreloadState(procedureOwner);
return;
}
ChangeToCreateDownloaderState(procedureOwner);
return;
}
ChangeState<ProcedurePreload>(procedureOwner);
ChangeToPreloadState(procedureOwner);
}
/// <summary>
/// 编辑器与单机保持相同流程。
/// </summary>
/// <returns></returns>
//// <summary>
/// 初始化资源流程。
/// <remarks>YooAsset 需要保持编辑器、单机、联机模式流程一致。</remarks>
private IEnumerator InitResources(ProcedureOwner procedureOwner)
{
string packageVersion;
Log.Info("更新资源清单！！！");
LauncherMgr.Show(UIDefine.UILoadUpdate, $"更新清单文件...");
// 1. 获取资源清单的版本信息
var operation1 = _resourceModule.RequestPackageVersionAsync();
yield return operation1;
@@ -64,11 +82,16 @@ namespace Procedure
yield break;
}
packageVersion = operation1.PackageVersion;
var packageVersion = operation1.PackageVersion;
_resourceModule.PackageVersion = packageVersion;
if (Utility.PlayerPrefs.HasKey("GAME_VERSION"))
{
Utility.PlayerPrefs.SetString("GAME_VERSION", _resourceModule.PackageVersion);
}
Log.Info($"Init resource package version : {packageVersion}");
// 2. 传入的版本信息更新资源清单
var operation2 = _resourceModule.UpdatePackageManifestAsync(packageVersion);
yield return operation2;
@@ -77,19 +100,75 @@ namespace Procedure
OnInitResourcesError(procedureOwner, operation2.Error);
yield break;
}
_initResourcesComplete = true;
}
private void ChangeToPreloadState(ProcedureOwner procedureOwner)
{
ChangeState<ProcedurePreload>(procedureOwner);
}
private void OnInitResourcesError(ProcedureOwner procedureOwner, string message)
{
// 检查设备网络连接状态。
if (_resourceModule.PlayMode == EPlayMode.HostPlayMode)
{
if (!IsNeedUpdate())
{
return;
}
else
{
Log.Error(LoadText.Instance.Label_Net_UnReachable);
LauncherMgr.ShowMessageBox(LoadText.Instance.Label_Net_UnReachable, MessageShowType.TwoButton,
LoadStyle.StyleEnum.Style_Retry,
Application.Quit);
return;
}
}
Log.Error(message);
LauncherMgr.ShowMessageBox($"初始化资源失败！点击确认重试 \n <color=#FF0000>{message}</color>", MessageShowType.TwoButton,
LoadStyle.StyleEnum.Style_Retry
, () =>
LoadStyle.StyleEnum.Style_Retry, () => { Utility.Unity.StartCoroutine(InitResources(procedureOwner)); }, Application.Quit);
}
private bool IsNeedUpdate()
{
// 如果不能联网且当前游戏非强制(不更新可以进入游戏。)
if (Settings.UpdateSetting.UpdateStyle == UpdateStyle.Optional && !_resourceModule.UpdatableWhilePlaying)
{
// 获取上次成功记录的版本
string packageVersion = Utility.PlayerPrefs.GetString("GAME_VERSION", string.Empty);
if (string.IsNullOrEmpty(packageVersion))
{
Utility.Unity.StartCoroutine(InitResources(procedureOwner));
}, UnityEngine.Application.Quit);
LauncherMgr.Show(UIDefine.UILoadUpdate, LoadText.Instance.Label_Net_UnReachable);
LauncherMgr.ShowMessageBox("没有找到本地版本记录，需要更新资源！", MessageShowType.TwoButton,
LoadStyle.StyleEnum.Style_Retry,
() => { Utility.Unity.StartCoroutine(InitResources(_procedureOwner)); },
Application.Quit);
return false;
}
_resourceModule.PackageVersion = packageVersion;
if (Settings.UpdateSetting.UpdateNotice == UpdateNotice.Notice)
{
LauncherMgr.Show(UIDefine.UILoadUpdate, LoadText.Instance.Label_Load_Notice);
LauncherMgr.ShowMessageBox($"更新失败，检测到可选资源更新，推荐完成更新提升游戏体验！ \\n \\n 确定再试一次，取消进入游戏", MessageShowType.TwoButton,
LoadStyle.StyleEnum.Style_Retry,
() => { Utility.Unity.StartCoroutine(InitResources(_procedureOwner)); },
() => { ChangeState<ProcedurePreload>(_procedureOwner); });
}
else
{
ChangeState<ProcedurePreload>(_procedureOwner);
}
return false;
}
return true;
}
}
}