From 5a82b911518d7fa8491dffa6bf7786da47e20c9f Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 25 五月 2019 17:41:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Lua/CSharpCallLua.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Lua/CSharpCallLua.cs b/Lua/CSharpCallLua.cs
index 6dd0d66..dd77cbc 100644
--- a/Lua/CSharpCallLua.cs
+++ b/Lua/CSharpCallLua.cs
@@ -10,6 +10,8 @@
{
[CSharpCallLua]
public delegate void LuaNetPackage(ushort cmd, byte[] bytes);
+ [CSharpCallLua]
+ public delegate void OnAssetLoadFinished(bool isOk, UnityEngine.Object asset);
static LuaNetPackage onRecieveLuaNetPackage;
[CSharpCallLua]
@@ -177,9 +179,10 @@
launchAction();
}
-#if !UNITY_EDITOR
- Do("hotfix.hotfix");
-#endif
+ if (!Application.isEditor)
+ {
+ LuaUtility.Do("hotfix.hotfix");
+ }
}
public static void LaunchPostProcess()
--
Gitblit v1.8.0