From 62de0d44f8440a7d32d5225c5d4dfe3bcb1f98ea Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 25 五月 2019 15:07:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Lua/CSharpCallLua.cs | 46 ++++++++++++++++++++++++++++++----------------
1 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/Lua/CSharpCallLua.cs b/Lua/CSharpCallLua.cs
index 96ade0f..6dd0d66 100644
--- a/Lua/CSharpCallLua.cs
+++ b/Lua/CSharpCallLua.cs
@@ -18,8 +18,6 @@
[CSharpCallLua]
public delegate void GeneralDelegate();
- static GeneralDelegate configInit;
- static GeneralDelegate modelInit;
static GeneralDelegate beforePlayerDataInitialize;
static GeneralDelegate afterPlayerDataInitialize;
@@ -35,7 +33,7 @@
static boolReturnedValueDelegate isLuaDailyQuest;
static boolReturnedValueDelegate gotoLuaDailyQuest;
- public static void Init()
+ public static void RegisterLuaEvent()
{
LuaUtility.DoString("protocol.manager.LuaProtocalRegister");
onRecieveLuaNetPackage = LuaUtility.Global.Get<LuaNetPackage>("OnRecieveNetPackage");
@@ -65,14 +63,6 @@
LuaUtility.DoString("interface.DailyQuestInterface");
isLuaDailyQuest = LuaUtility.Global.Get<boolReturnedValueDelegate>("IsLuaDailyQuest");
gotoLuaDailyQuest = LuaUtility.Global.Get<boolReturnedValueDelegate>("GotoDailyQuest");
-
- LuaUtility.DoString("config.ConfigInit");
- configInit = LuaUtility.Global.Get<GeneralDelegate>("ConfigInit");
- if (configInit != null)
- {
- configInit();
- }
-
}
@@ -178,13 +168,37 @@
}
}
- public static void ModelInit()
+ public static void LaunchStart()
{
- LuaUtility.DoString("manager.ModelCenter");
- modelInit = LuaUtility.Global.Get<GeneralDelegate>("ModelInit");
- if (modelInit != null)
+ LuaUtility.DoString("manager.Launch");
+ var launchAction = LuaUtility.Global.Get<GeneralDelegate>("LaunchStart");
+ if (launchAction != null)
{
- modelInit();
+ launchAction();
+ }
+
+#if !UNITY_EDITOR
+ Do("hotfix.hotfix");
+#endif
+ }
+
+ public static void LaunchPostProcess()
+ {
+ LuaUtility.DoString("manager.Launch");
+ var action = LuaUtility.Global.Get<GeneralDelegate>("LaunchPostProcess");
+ if (action != null)
+ {
+ action();
+ }
+ }
+
+ public static void ConfigInit()
+ {
+ LuaUtility.DoString("config.ConfigInit");
+ var configInit = LuaUtility.Global.Get<GeneralDelegate>("ConfigInit");
+ if (configInit != null)
+ {
+ configInit();
}
}
--
Gitblit v1.8.0