update: 尝试修复 #165 问题

chenxuuu · Jun 25, 2024 · d677619 · d677619
1 parent 46d7b3e
commit d677619
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/llcom/LuaEnv/LuaEnv.cs b/llcom/LuaEnv/LuaEnv.cs
@@ -7,6 +7,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace llcom.LuaEnv
 {
@@ -28,8 +29,9 @@ public class LuaEnv : IDisposable
         private bool stop = false;//是否停止运行
         private ConcurrentDictionary<int, CancellationTokenSource> timerPool =
                 new ConcurrentDictionary<int, CancellationTokenSource>();//timer取消标志池子
-        private static ConcurrentBag<LuaTaskData> toRun = new ConcurrentBag<LuaTaskData>();//待运行的池子
+        private ConcurrentBag<LuaTaskData> toRun = new ConcurrentBag<LuaTaskData>();//待运行的池子
         private readonly object taskLock = new object();
+        private XLua.LuaFunction triggerCB = null;
 
         /// <summary>
         /// 发出报错信息
@@ -83,8 +85,7 @@ private void runTask()
                     {
                         LuaTaskData task;
                         toRun.TryTake(out task);//取出来一个任务
-                        var cb = lua.Global.Get<XLua.LuaTable>("sys").Get<XLua.LuaFunction>("tiggerCB");
-                        cb.Call(task.id, task.type, task.data);//跑
+                        triggerCB.Call(task.id, task.type, task.data);//跑
                     }
                     catch (Exception e)
                     {
@@ -187,6 +188,7 @@ public LuaEnv(object input = null)
             if (input != null)
                 lua.Global.SetInPath("lua", input);//传递输入值
             lock (taskLock) lua.DoString(sysCode);
+            triggerCB = lua.Global.Get<XLua.LuaTable>("sys").Get<XLua.LuaFunction>("tiggerCB");
             lua.Global.SetInPath("@this", this);//自己传给自己
 
             //加上需要require的路径

diff --git a/llcom/LuaEnv/LuaRunEnv.cs b/llcom/LuaEnv/LuaRunEnv.cs
@@ -7,6 +7,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace llcom.LuaEnv
 {
@@ -18,6 +19,7 @@ class LuaRunEnv
         private static ConcurrentDictionary<int, CancellationTokenSource> pool = 
             new ConcurrentDictionary<int, CancellationTokenSource>();//timer回调池子
         private static ConcurrentBag<LuaPool> toRun = new ConcurrentBag<LuaPool>();//待运行的池子
+        private static XLua.LuaFunction triggerCB = null;
 
         public static bool isRunning = false;
         public static bool canRun = false;
@@ -71,10 +73,7 @@ private static void runTigger()
                             {
                                 LuaPool temp;
                                 toRun.TryTake(out temp);
-                                XLua.LuaFunction f = null;
-                                //while (f == null)
-                                    f = lua.Global.Get<XLua.LuaFunction>("tiggerCB");
-                                f.Call(temp.id, temp.type, temp.data);
+                                triggerCB.Call(temp.id, temp.type, temp.data);
                             }
                             catch (Exception le)
                             {
@@ -190,6 +189,7 @@ public static void New(string file)
                     {
                         lua.Global.SetInPath("runType", "script");//一次性处理标志
                         LuaLoader.Initial(lua);
+                        triggerCB = lua.Global.Get<XLua.LuaFunction>("tiggerCB");
                         lua.DoString($"require '{file.Replace("/", ".").Substring(0, file.Length - 4)}'");
                     }
                 }