From 54ff5fab417705193e4d938c3f6ff7aeffb7880a Mon Sep 17 00:00:00 2001 From: ALEXTANG <574809918@qq.com> Date: Tue, 25 Oct 2022 11:06:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0HybirdCLR=20Procedure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更新HybirdCLR Procedure --- ...TEngine.Demo.asmdef.meta => GameMain.meta} | 5 ++- Assets/GameMain/Scripts.meta | 8 ++++ .../Scripts}/GameProcedure.meta | 0 .../GameProcedure/ProcedureCheckVersion.cs | 4 +- .../ProcedureCheckVersion.cs.meta | 0 .../GameProcedure/ProcedureCodeInit.cs | 45 +++++++++++++++++-- .../GameProcedure/ProcedureCodeInit.cs.meta | 0 .../Scripts/GameProcedure/ProcedureLaunch.cs | 15 +++++++ .../GameProcedure/ProcedureLaunch.cs.meta | 0 .../GameProcedure/ProcedureResourcesInit.cs | 16 ++----- .../ProcedureResourcesInit.cs.meta | 0 .../GameProcedure/ProcedureResourcesUpdate.cs | 2 +- .../ProcedureResourcesUpdate.cs.meta | 0 .../GameProcedure/ProcedureResourcesVerify.cs | 12 +---- .../ProcedureResourcesVerify.cs.meta | 0 .../Scripts}/GameProcedure/ProcedureSplash.cs | 19 +++----- .../GameProcedure/ProcedureSplash.cs.meta | 0 .../GameProcedure/ProcedureStartGame.cs | 19 ++++++++ .../GameProcedure/ProcedureStartGame.cs.meta | 0 Assets/TEngine.Demo/Demo/TEngine.Demo.asmdef | 18 -------- .../Runtime/GameProcedure/ProcedureLaunch.cs | 24 ---------- .../GameProcedure/ProcedureStartGame.cs | 34 -------------- .../Runtime/HotUpdate/Scripts/UI/LoadText.cs | 2 +- 23 files changed, 99 insertions(+), 124 deletions(-) rename Assets/{TEngine.Demo/Demo/TEngine.Demo.asmdef.meta => GameMain.meta} (57%) create mode 100644 Assets/GameMain/Scripts.meta rename Assets/{TEngine/Scripts/Runtime => GameMain/Scripts}/GameProcedure.meta (100%) rename Assets/{TEngine/Scripts/Runtime => GameMain/Scripts}/GameProcedure/ProcedureCheckVersion.cs (98%) rename Assets/{TEngine/Scripts/Runtime => GameMain/Scripts}/GameProcedure/ProcedureCheckVersion.cs.meta (100%) rename Assets/{TEngine/Scripts/Runtime => GameMain/Scripts}/GameProcedure/ProcedureCodeInit.cs (50%) rename Assets/{TEngine/Scripts/Runtime => GameMain/Scripts}/GameProcedure/ProcedureCodeInit.cs.meta (100%) create mode 100644 Assets/GameMain/Scripts/GameProcedure/ProcedureLaunch.cs rename Assets/{TEngine/Scripts/Runtime => GameMain/Scripts}/GameProcedure/ProcedureLaunch.cs.meta (100%) rename Assets/{TEngine/Scripts/Runtime => GameMain/Scripts}/GameProcedure/ProcedureResourcesInit.cs (65%) rename Assets/{TEngine/Scripts/Runtime => GameMain/Scripts}/GameProcedure/ProcedureResourcesInit.cs.meta (100%) rename Assets/{TEngine/Scripts/Runtime => GameMain/Scripts}/GameProcedure/ProcedureResourcesUpdate.cs (98%) rename Assets/{TEngine/Scripts/Runtime => GameMain/Scripts}/GameProcedure/ProcedureResourcesUpdate.cs.meta (100%) rename Assets/{TEngine/Scripts/Runtime => GameMain/Scripts}/GameProcedure/ProcedureResourcesVerify.cs (60%) rename Assets/{TEngine/Scripts/Runtime => GameMain/Scripts}/GameProcedure/ProcedureResourcesVerify.cs.meta (100%) rename Assets/{TEngine/Scripts/Runtime => GameMain/Scripts}/GameProcedure/ProcedureSplash.cs (61%) rename Assets/{TEngine/Scripts/Runtime => GameMain/Scripts}/GameProcedure/ProcedureSplash.cs.meta (100%) create mode 100644 Assets/GameMain/Scripts/GameProcedure/ProcedureStartGame.cs rename Assets/{TEngine/Scripts/Runtime => GameMain/Scripts}/GameProcedure/ProcedureStartGame.cs.meta (100%) delete mode 100644 Assets/TEngine.Demo/Demo/TEngine.Demo.asmdef delete mode 100644 Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureLaunch.cs delete mode 100644 Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureStartGame.cs diff --git a/Assets/TEngine.Demo/Demo/TEngine.Demo.asmdef.meta b/Assets/GameMain.meta similarity index 57% rename from Assets/TEngine.Demo/Demo/TEngine.Demo.asmdef.meta rename to Assets/GameMain.meta index 57c07f15..564afe8c 100644 --- a/Assets/TEngine.Demo/Demo/TEngine.Demo.asmdef.meta +++ b/Assets/GameMain.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: 786fadd7944e4da47b5272e501edc067 -AssemblyDefinitionImporter: +guid: 2e3556191f5868b45bdae236bf486400 +folderAsset: yes +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/GameMain/Scripts.meta b/Assets/GameMain/Scripts.meta new file mode 100644 index 00000000..8e7aa3e6 --- /dev/null +++ b/Assets/GameMain/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 87b670c48f0b7184bbcdbab5636fecce +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TEngine/Scripts/Runtime/GameProcedure.meta b/Assets/GameMain/Scripts/GameProcedure.meta similarity index 100% rename from Assets/TEngine/Scripts/Runtime/GameProcedure.meta rename to Assets/GameMain/Scripts/GameProcedure.meta diff --git a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureCheckVersion.cs b/Assets/GameMain/Scripts/GameProcedure/ProcedureCheckVersion.cs similarity index 98% rename from Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureCheckVersion.cs rename to Assets/GameMain/Scripts/GameProcedure/ProcedureCheckVersion.cs index 4f804899..082fe867 100644 --- a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureCheckVersion.cs +++ b/Assets/GameMain/Scripts/GameProcedure/ProcedureCheckVersion.cs @@ -29,7 +29,7 @@ namespace TEngine.Runtime UILoadMgr.Show(UIDefine.UILoadUpdate); } - protected internal override void OnEnter(IFsm procedureOwner) + protected override void OnEnter(IFsm procedureOwner) { base.OnEnter(procedureOwner); m_CheckVersionComplete = false; @@ -163,7 +163,7 @@ namespace TEngine.Runtime return data; } - protected internal override void OnUpdate(IFsm procedureOwner, float elapseSeconds, float realElapseSeconds) + protected override void OnUpdate(IFsm procedureOwner, float elapseSeconds, float realElapseSeconds) { base.OnUpdate(procedureOwner, elapseSeconds, realElapseSeconds); if (m_result == null || !m_result.isDone) diff --git a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureCheckVersion.cs.meta b/Assets/GameMain/Scripts/GameProcedure/ProcedureCheckVersion.cs.meta similarity index 100% rename from Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureCheckVersion.cs.meta rename to Assets/GameMain/Scripts/GameProcedure/ProcedureCheckVersion.cs.meta diff --git a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureCodeInit.cs b/Assets/GameMain/Scripts/GameProcedure/ProcedureCodeInit.cs similarity index 50% rename from Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureCodeInit.cs rename to Assets/GameMain/Scripts/GameProcedure/ProcedureCodeInit.cs index f52bb72b..12b4c6b1 100644 --- a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureCodeInit.cs +++ b/Assets/GameMain/Scripts/GameProcedure/ProcedureCodeInit.cs @@ -1,5 +1,7 @@ -using System.Linq; +using System.Collections.Generic; +using System.Linq; using System.Reflection; +using HybridCLR; using UnityEngine; namespace TEngine.Runtime @@ -9,6 +11,39 @@ namespace TEngine.Runtime /// public class ProcedureCodeInit : ProcedureBase { + + public static List AOTMetaAssemblyNames { get; } = new List() + { + "mscorlib.dll", + "System.dll", + "System.Core.dll", + }; + + /// + /// 为aot assembly加载原始metadata， 这个代码放aot或者热更新都行。 + /// 一旦加载后，如果AOT泛型函数对应native实现不存在，则自动替换为解释模式执行 + /// + private static void LoadMetadataForAOTAssemblies() + { + // 可以加载任意aot assembly的对应的dll。但要求dll必须与unity build过程中生成的裁剪后的dll一致，而不能直接使用原始dll。 + // 我们在BuildProcessors里添加了处理代码，这些裁剪后的dll在打包时自动被复制到 {项目目录}/HybridCLRData/AssembliesPostIl2CppStrip/{Target} 目录。 + + // 注意，补充元数据是给AOT dll补充元数据，而不是给热更新dll补充元数据。 + // 热更新dll不缺元数据，不需要补充，如果调用LoadMetadataForAOTAssembly会返回错误 + foreach (var aotDllName in AOTMetaAssemblyNames) + { + byte[] dllBytes = TResources.Load(aotDllName).bytes; + if (dllBytes == null) + { + Log.Fatal($"{aotDllName} is null"); + continue; + } + // 加载assembly对应的dll，会自动为它hook。一旦aot泛型函数的native函数不存在，用解释器版本代码 + LoadImageErrorCode err = RuntimeApi.LoadMetadataForAOTAssembly(dllBytes); + Log.Info($"LoadMetadataForAOTAssembly:{aotDllName}. ret:{err}"); + } + } + /// /// 是否需要加载热更新DLL /// @@ -16,7 +51,7 @@ namespace TEngine.Runtime private IFsm m_procedureOwner; - protected internal override void OnEnter(IFsm procedureOwner) + protected override void OnEnter(IFsm procedureOwner) { base.OnEnter(procedureOwner); @@ -28,8 +63,10 @@ namespace TEngine.Runtime return; } + LoadMetadataForAOTAssemblies(); + #if UNITY_EDITOR - Assembly hotfixAssembly = System.AppDomain.CurrentDomain.GetAssemblies().First(assembly => assembly.GetName().Name == "HotFix"); + Assembly hotfixAssembly = System.AppDomain.CurrentDomain.GetAssemblies().First(assembly => assembly.GetName().Name == "Assembly-CSharp"); StartHotfix(hotfixAssembly); #else TResources.LoadAsync("Dll/HotFix.dll.bytes", (data => @@ -57,7 +94,7 @@ namespace TEngine.Runtime private void OnLoadAssetSuccess(TextAsset asset) { TextAsset dll = (TextAsset)asset; - Assembly hotfixAssembly = Assembly.Load(dll.bytes); + Assembly hotfixAssembly = System.Reflection.Assembly.Load(dll.bytes); Log.Info("Load hotfix dll OK."); StartHotfix(hotfixAssembly); } diff --git a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureCodeInit.cs.meta b/Assets/GameMain/Scripts/GameProcedure/ProcedureCodeInit.cs.meta similarity index 100% rename from Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureCodeInit.cs.meta rename to Assets/GameMain/Scripts/GameProcedure/ProcedureCodeInit.cs.meta diff --git a/Assets/GameMain/Scripts/GameProcedure/ProcedureLaunch.cs b/Assets/GameMain/Scripts/GameProcedure/ProcedureLaunch.cs new file mode 100644 index 00000000..e3783381 --- /dev/null +++ b/Assets/GameMain/Scripts/GameProcedure/ProcedureLaunch.cs @@ -0,0 +1,15 @@ +namespace TEngine.Runtime +{ + /// + /// 流程加载器 - 开始起点 + /// + public class ProcedureLaunch : ProcedureBase + { + + protected override void OnUpdate(IFsm procedureOwner, float elapseSeconds, float realElapseSeconds) + { + base.OnUpdate(procedureOwner, elapseSeconds, realElapseSeconds); + ChangeState(procedureOwner); + } + } +} \ No newline at end of file diff --git a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureLaunch.cs.meta b/Assets/GameMain/Scripts/GameProcedure/ProcedureLaunch.cs.meta similarity index 100% rename from Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureLaunch.cs.meta rename to Assets/GameMain/Scripts/GameProcedure/ProcedureLaunch.cs.meta diff --git a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureResourcesInit.cs b/Assets/GameMain/Scripts/GameProcedure/ProcedureResourcesInit.cs similarity index 65% rename from Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureResourcesInit.cs rename to Assets/GameMain/Scripts/GameProcedure/ProcedureResourcesInit.cs index 8af25bc3..eeed1040 100644 --- a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureResourcesInit.cs +++ b/Assets/GameMain/Scripts/GameProcedure/ProcedureResourcesInit.cs @@ -9,12 +9,7 @@ namespace TEngine.Runtime { private bool m_initResourceComplete = false; - protected internal override void OnInit(IFsm procedureOwner) - { - base.OnInit(procedureOwner); - } - - protected internal override void OnEnter(IFsm procedureOwner) + protected override void OnEnter(IFsm procedureOwner) { base.OnEnter(procedureOwner); @@ -26,7 +21,7 @@ namespace TEngine.Runtime }),new WaitForSeconds(1f)); } - protected internal override void OnUpdate(IFsm procedureOwner, float elapseSeconds, float realElapseSeconds) + protected override void OnUpdate(IFsm procedureOwner, float elapseSeconds, float realElapseSeconds) { base.OnUpdate(procedureOwner, elapseSeconds, realElapseSeconds); @@ -37,17 +32,12 @@ namespace TEngine.Runtime } - protected internal override void OnLeave(IFsm procedureOwner, bool isShutdown) + protected override void OnLeave(IFsm procedureOwner, bool isShutdown) { base.OnLeave(procedureOwner, isShutdown); GameEventMgr.Instance.RemoveEventListener("OnInitResourceComplete", OnInitResourceComplete); } - protected internal override void OnDestroy(IFsm procedureOwner) - { - base.OnDestroy(procedureOwner); - } - private void OnInitResourceComplete() { m_initResourceComplete = true; diff --git a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureResourcesInit.cs.meta b/Assets/GameMain/Scripts/GameProcedure/ProcedureResourcesInit.cs.meta similarity index 100% rename from Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureResourcesInit.cs.meta rename to Assets/GameMain/Scripts/GameProcedure/ProcedureResourcesInit.cs.meta diff --git a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureResourcesUpdate.cs b/Assets/GameMain/Scripts/GameProcedure/ProcedureResourcesUpdate.cs similarity index 98% rename from Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureResourcesUpdate.cs rename to Assets/GameMain/Scripts/GameProcedure/ProcedureResourcesUpdate.cs index e3164d5e..e731f9a0 100644 --- a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureResourcesUpdate.cs +++ b/Assets/GameMain/Scripts/GameProcedure/ProcedureResourcesUpdate.cs @@ -14,7 +14,7 @@ namespace TEngine.Runtime private IFsm _procedureOwner; private bool _dllLoad = false; - protected internal override void OnEnter(IFsm procedureOwner) + protected override void OnEnter(IFsm procedureOwner) { base.OnEnter(procedureOwner); diff --git a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureResourcesUpdate.cs.meta b/Assets/GameMain/Scripts/GameProcedure/ProcedureResourcesUpdate.cs.meta similarity index 100% rename from Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureResourcesUpdate.cs.meta rename to Assets/GameMain/Scripts/GameProcedure/ProcedureResourcesUpdate.cs.meta diff --git a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureResourcesVerify.cs b/Assets/GameMain/Scripts/GameProcedure/ProcedureResourcesVerify.cs similarity index 60% rename from Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureResourcesVerify.cs rename to Assets/GameMain/Scripts/GameProcedure/ProcedureResourcesVerify.cs index a6e4139f..e543c24f 100644 --- a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureResourcesVerify.cs +++ b/Assets/GameMain/Scripts/GameProcedure/ProcedureResourcesVerify.cs @@ -8,17 +8,7 @@ namespace TEngine.Runtime { private bool m_VerifyResourcesComplete = false; - protected internal override void OnEnter(IFsm procedureOwner) - { - base.OnEnter(procedureOwner); - } - - protected internal override void OnLeave(IFsm procedureOwner, bool isShutdown) - { - base.OnLeave(procedureOwner, isShutdown); - } - - protected internal override void OnUpdate(IFsm procedureOwner, float elapseSeconds, float realElapseSeconds) + protected override void OnUpdate(IFsm procedureOwner, float elapseSeconds, float realElapseSeconds) { base.OnUpdate(procedureOwner, elapseSeconds, realElapseSeconds); diff --git a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureResourcesVerify.cs.meta b/Assets/GameMain/Scripts/GameProcedure/ProcedureResourcesVerify.cs.meta similarity index 100% rename from Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureResourcesVerify.cs.meta rename to Assets/GameMain/Scripts/GameProcedure/ProcedureResourcesVerify.cs.meta diff --git a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureSplash.cs b/Assets/GameMain/Scripts/GameProcedure/ProcedureSplash.cs similarity index 61% rename from Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureSplash.cs rename to Assets/GameMain/Scripts/GameProcedure/ProcedureSplash.cs index 4036ecda..a480dd0d 100644 --- a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureSplash.cs +++ b/Assets/GameMain/Scripts/GameProcedure/ProcedureSplash.cs @@ -11,17 +11,18 @@ namespace TEngine.Runtime /// public class ProcedureSplash : ProcedureBase { - protected internal override void OnInit(IFsm procedureOwner) + protected override void OnInit(IFsm procedureOwner) { base.OnInit(procedureOwner); } - protected internal override void OnEnter(IFsm procedureOwner) + protected override void OnEnter(IFsm procedureOwner) { base.OnEnter(procedureOwner); } - protected internal override void OnUpdate(IFsm procedureOwner, float elapseSeconds, float realElapseSeconds) + protected override void OnUpdate(IFsm procedureOwner, float elapseSeconds, + float realElapseSeconds) { base.OnUpdate(procedureOwner, elapseSeconds, realElapseSeconds); @@ -38,15 +39,5 @@ namespace TEngine.Runtime ChangeState(procedureOwner); } } - - protected internal override void OnLeave(IFsm procedureOwner, bool isShutdown) - { - base.OnLeave(procedureOwner, isShutdown); - } - - protected internal override void OnDestroy(IFsm procedureOwner) - { - base.OnDestroy(procedureOwner); - } } -} +} \ No newline at end of file diff --git a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureSplash.cs.meta b/Assets/GameMain/Scripts/GameProcedure/ProcedureSplash.cs.meta similarity index 100% rename from Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureSplash.cs.meta rename to Assets/GameMain/Scripts/GameProcedure/ProcedureSplash.cs.meta diff --git a/Assets/GameMain/Scripts/GameProcedure/ProcedureStartGame.cs b/Assets/GameMain/Scripts/GameProcedure/ProcedureStartGame.cs new file mode 100644 index 00000000..081af4ff --- /dev/null +++ b/Assets/GameMain/Scripts/GameProcedure/ProcedureStartGame.cs @@ -0,0 +1,19 @@ +namespace TEngine.Runtime +{ + public static partial class TEngineEvent + { + public static readonly int OnStartGame = StringId.StringToHash("TEngineEvent.OnStartGame"); + } + + /// + /// 流程加载器 - 终点StartGame + /// + public class ProcedureStartGame : ProcedureBase + { + protected override void OnEnter(IFsm procedureOwner) + { + base.OnEnter(procedureOwner); + GameEventMgr.Instance.Send(TEngineEvent.OnStartGame); + } + } +} \ No newline at end of file diff --git a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureStartGame.cs.meta b/Assets/GameMain/Scripts/GameProcedure/ProcedureStartGame.cs.meta similarity index 100% rename from Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureStartGame.cs.meta rename to Assets/GameMain/Scripts/GameProcedure/ProcedureStartGame.cs.meta diff --git a/Assets/TEngine.Demo/Demo/TEngine.Demo.asmdef b/Assets/TEngine.Demo/Demo/TEngine.Demo.asmdef deleted file mode 100644 index e4f6891b..00000000 --- a/Assets/TEngine.Demo/Demo/TEngine.Demo.asmdef +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "TEngine.Demo", - "rootNamespace": "", - "references": [ - "GUID:f4ecd6f7bd8993043b6cec60dd0cf2b2" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureLaunch.cs b/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureLaunch.cs deleted file mode 100644 index 32d5f868..00000000 --- a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureLaunch.cs +++ /dev/null @@ -1,24 +0,0 @@ -namespace TEngine.Runtime -{ - /// - /// 流程加载器 - 开始起点 - /// - public class ProcedureLaunch : ProcedureBase - { - protected internal override void OnInit(IFsm procedureOwner) - { - base.OnInit(procedureOwner); - } - - protected internal override void OnEnter(IFsm procedureOwner) - { - base.OnEnter(procedureOwner); - } - - protected internal override void OnUpdate(IFsm procedureOwner, float elapseSeconds, float realElapseSeconds) - { - base.OnUpdate(procedureOwner, elapseSeconds, realElapseSeconds); - ChangeState(procedureOwner); - } - } -} \ No newline at end of file diff --git a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureStartGame.cs b/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureStartGame.cs deleted file mode 100644 index 2b7f0b8d..00000000 --- a/Assets/TEngine/Scripts/Runtime/GameProcedure/ProcedureStartGame.cs +++ /dev/null @@ -1,34 +0,0 @@ -namespace TEngine.Runtime -{ - public static partial class TEngineEvent - { - public static readonly int OnStartGame = StringId.StringToHash("TEngineEvent.OnStartGame"); - } - - /// - /// 流程加载器 - 终点StartGame - /// - public class ProcedureStartGame : ProcedureBase - { - protected internal override void OnInit(IFsm procedureOwner) - { - base.OnInit(procedureOwner); - } - - protected internal override void OnEnter(IFsm procedureOwner) - { - base.OnEnter(procedureOwner); - GameEventMgr.Instance.Send(TEngineEvent.OnStartGame); - } - - protected internal override void OnLeave(IFsm procedureOwner, bool isShutdown) - { - base.OnLeave(procedureOwner, isShutdown); - } - - protected internal override void OnDestroy(IFsm procedureOwner) - { - base.OnDestroy(procedureOwner); - } - } -} \ No newline at end of file diff --git a/Assets/TEngine/Scripts/Runtime/HotUpdate/Scripts/UI/LoadText.cs b/Assets/TEngine/Scripts/Runtime/HotUpdate/Scripts/UI/LoadText.cs index 710afed5..e7dcc5ab 100644 --- a/Assets/TEngine/Scripts/Runtime/HotUpdate/Scripts/UI/LoadText.cs +++ b/Assets/TEngine/Scripts/Runtime/HotUpdate/Scripts/UI/LoadText.cs @@ -73,7 +73,7 @@ namespace TEngine.Runtime.HotUpdate get { return _instance ?? (_instance = new LoadText()); } } - internal void InitConfigData(TextAsset asset) + public void InitConfigData(TextAsset asset) { if (asset == null) return;