xlua custom loader

Author: coding2233

Assets/Game/Scripts/State/LoadHotfixState.cs

@@ -16,19 +16,14 @@ namespace GameFramework.Taurus
 	[GameState]
 	public class LoadHotfixState:GameState
 	{
-		#region 属性
-		private string _luaScriptPath = "Assets/Game/HotFix/Main.lua.txt";
-		#endregion
-
-
+		
 		public override void OnInit()
 		{
 		}
 
 		public override void OnEnter(params object[] parameters)
 		{
-			string luaScript = GameMode.Resource.LoadAsset<TextAsset>("hotfix", _luaScriptPath).text;
-			GameMode.HotFix.LoadHotFix(luaScript);
+			GameMode.HotFix.LoadHotFix();
 		}
 
 		public override void OnExit()

Assets/GameFramework/HotFix/HotFixManager.cs

@@ -10,6 +10,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using UnityEngine;
 using XLua;
 
 namespace GameFramework.Taurus
@@ -20,12 +21,34 @@ public sealed class HotFixManager:GameFrameworkModule,IUpdate
 		private LuaEnv _luaEnv = new LuaEnv();
 		private LuaTable _scriptEnv;
 
+		//资源管理器
+		private ResourceManager _resource;
+		//lua assetbundle 名称
+		private string _luaAssetBundle;
+		//lua脚本前缀
+		private string _luaPathPrefix;
+		//lua脚本扩展名
+		private string _luaPathExtension;
+
 		Action _start;
 		Action _update;
 		Action _close;
 
-		public void LoadHotFix(string luaScript)
+		/// <summary>
+		/// 加载热更新脚本
+		/// </summary>
+		/// <param name="assetBundle"></param>
+		/// <param name="luaScript"></param>
+		/// <param name="luaPathPrefix"></param>
+		/// <param name="luaPathExtension"></param>
+		public void LoadHotFix(string assetBundle="hotfix",string luaScript="main",
+			string luaPathPrefix="Assets/Game/HotFix",string luaPathExtension=".lua.txt")
 		{
+			_resource = GameFrameworkMode.GetModule<ResourceManager>();
+			_luaAssetBundle = assetBundle;
+			_luaPathPrefix = luaPathPrefix;
+			_luaPathExtension = luaPathExtension;
+
 			_scriptEnv = _luaEnv.NewTable();
 
 			// 为每个脚本设置一个独立的环境，可一定程度上防止脚本间全局变量、函数冲突
@@ -35,14 +58,22 @@ public void LoadHotFix(string luaScript)
 			meta.Dispose();
 
 			_scriptEnv.Set("self", this);
-			_luaEnv.DoString(luaScript, "HotFixManager", _scriptEnv);
+			_luaEnv.AddLoader(CustomLoader);
+			_luaEnv.DoString($"require '{luaScript}'", "LuaHotFix", _scriptEnv);
 			_scriptEnv.Get("Start", out _start);
 			_scriptEnv.Get("Update", out _update);
 			_scriptEnv.Get("Close", out _close);
 
 			_start?.Invoke();
 		}
 
+		//自定义加载
+		private byte[] CustomLoader(ref string filePath)
+		{
+			string path = System.IO.Path.Combine(_luaPathPrefix, $"{filePath}.lua.txt");
+			return _resource.LoadAsset<TextAsset>(_luaAssetBundle,path).bytes;
+		}
+
 		public void OnUpdate()
 		{
 			_update?.Invoke();
@@ -51,6 +82,7 @@ public void OnUpdate()
 		public override void OnClose()
 		{
 			_close?.Invoke();
+			//_luaEnv?.Dispose();
 		}
 	}
 }