[修复]1. 修复Offline 模式的时候启动异常

GameFrameX · Aug 19, 2024 · 73d3c4e · 73d3c4e
1 parent 18edf68
commit 73d3c4e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/Assets/Scripts/Framework/Procedure/PatchUpdater/ProcedurePatchInit.cs b/Assets/Scripts/Framework/Procedure/PatchUpdater/ProcedurePatchInit.cs
@@ -21,9 +21,9 @@ protected override async void OnEnter(IFsm<IProcedureManager> procedureOwner)
 
             if (GameApp.Asset.GamePlayMode == EPlayMode.OfflinePlayMode)
             {
-                Log.Info("当前为离线模式，直接启动 ProcedureGameLauncherState");
+                Log.Info("当前为离线模式，直接启动 ProcedureUpdateStaticVersion");
                 await GameApp.Asset.InitPackageAsync(AssetComponent.BuildInPackageName, string.Empty, string.Empty, true);
-                ChangeState<ProcedureGameLauncherState>(procedureOwner);
+                ChangeState<ProcedureUpdateStaticVersion>(procedureOwner);
                 return;
             }
 

diff --git a/Assets/Scripts/Framework/Procedure/PatchUpdater/ProcedureUpdateManifest.cs b/Assets/Scripts/Framework/Procedure/PatchUpdater/ProcedureUpdateManifest.cs
@@ -1,4 +1,5 @@
 using System.Collections;
+using System.Threading.Tasks;
 using Cysharp.Threading.Tasks;
 using GameFrameX.Asset.Runtime;
 using GameFrameX.Fsm.Runtime;
@@ -11,10 +12,20 @@ namespace GameFrameX.Procedure
 {
     internal sealed class ProcedureUpdateManifest : ProcedureBase
     {
-        protected override void OnEnter(IFsm<IProcedureManager> procedureOwner)
+        protected override async void OnEnter(IFsm<IProcedureManager> procedureOwner)
         {
             base.OnEnter(procedureOwner);
 
+            if (GameApp.Asset.GamePlayMode == EPlayMode.OfflinePlayMode)
+            {
+                var varStringVersion = procedureOwner.GetData<VarString>(AssetComponent.BuildInPackageName + "Version");
+                var buildInResourcePackage = GameApp.Asset.GetAssetsPackage(AssetComponent.BuildInPackageName);
+                var buildInOperation = buildInResourcePackage.UpdatePackageManifestAsync(varStringVersion.Value);
+                await buildInOperation.ToUniTask();
+                ChangeState<ProcedurePatchDone>(procedureOwner);
+                return;
+            }
+
             GameApp.Event.Fire(this, AssetPatchStatesChangeEventArgs.Create(AssetComponent.BuildInPackageName, EPatchStates.UpdateManifest));
             UpdateManifest(procedureOwner).ToUniTask();
         }
@@ -24,7 +35,7 @@ private IEnumerator UpdateManifest(IFsm<IProcedureManager> procedureOwner)
         {
             yield return new WaitForSecondsRealtime(0.1f);
 
-            var                            buildInResourcePackage = YooAssets.GetPackage(AssetComponent.BuildInPackageName);
+            var buildInResourcePackage = YooAssets.GetPackage(AssetComponent.BuildInPackageName);
             UpdatePackageManifestOperation buildInOperation;
             if (GameApp.Asset.GamePlayMode == EPlayMode.EditorSimulateMode)
             {

diff --git a/Assets/Scripts/Framework/Procedure/PatchUpdater/ProcedureUpdateStaticVersion.cs b/Assets/Scripts/Framework/Procedure/PatchUpdater/ProcedureUpdateStaticVersion.cs
@@ -3,6 +3,7 @@
 using GameFrameX.Asset.Runtime;
 using GameFrameX.Fsm.Runtime;
 using GameFrameX.Procedure.Runtime;
+using GameFrameX.Runtime;
 using UnityEngine;
 using YooAsset;
 
@@ -30,6 +31,13 @@ private IEnumerator GetStaticVersion(IFsm<IProcedureManager> procedureOwner)
             {
                 //更新成功
                 string packageVersion = buildInOperation.PackageVersion;
+                if (GameApp.Asset.GamePlayMode == EPlayMode.OfflinePlayMode)
+                {
+                    var varStringVersion = ReferencePool.Acquire<VarString>();
+                    varStringVersion.SetValue(packageVersion);
+                    procedureOwner.SetData(AssetComponent.BuildInPackageName + "Version", varStringVersion);
+                }
+
                 Debug.Log($"Updated package Version : {packageVersion}");
                 ChangeState<ProcedureUpdateManifest>(procedureOwner);
             }