MacEditor支持

leinlin · Jan 13, 2023 · a3d6667 · a3d6667
1 parent ee6f0ae
commit a3d6667
Show file tree

Hide file tree

Showing 26 changed files with 29 additions and 26 deletions.
diff --git a/LuaProfiler/Runtime/Common/Setting/LuaDeepProfilerSetting.cs b/LuaProfiler/Runtime/Common/Setting/LuaDeepProfilerSetting.cs
@@ -36,7 +36,7 @@
 using System;
 using System.IO;
 
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 namespace MikuLuaProfiler
 {
     using System.Collections.Generic;

diff --git a/LuaProfiler/Runtime/Common/Setting/LuaProfilerPrecompileSetting.cs b/LuaProfiler/Runtime/Common/Setting/LuaProfilerPrecompileSetting.cs
@@ -33,7 +33,7 @@
 * ==============================================================================
 */
 
-#if UNITY_EDITOR_WIN
+#if UNITY_EDITOR
 namespace MikuLuaProfiler
 {
     using System;

diff --git a/LuaProfiler/Runtime/Common/Struct/List.cs b/LuaProfiler/Runtime/Common/Struct/List.cs
@@ -33,7 +33,7 @@
 * ==============================================================================
 */
 
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/LuaProfiler/Runtime/Common/Struct/ObjectPool.cs b/LuaProfiler/Runtime/Common/Struct/ObjectPool.cs
@@ -36,7 +36,7 @@
 /*
  * 对象池
  */
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 using System;
 using System.Collections.Generic;
 

diff --git a/LuaProfiler/Runtime/Common/Struct/Sample.cs b/LuaProfiler/Runtime/Common/Struct/Sample.cs
@@ -33,7 +33,7 @@
 * ==============================================================================
 */
 
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 using System;
 using System.Collections.Generic;
 using System.IO;

diff --git a/LuaProfiler/Runtime/Core/Driver/Hook/AndroidHook/AndroidNativeHooker.cs b/LuaProfiler/Runtime/Core/Driver/Hook/AndroidHook/AndroidNativeHooker.cs
@@ -1,4 +1,4 @@
-#if UNITY_EDITOR_WIN || (USE_LUA_PROFILER && UNITY_ANDROID)
+#if UNITY_EDITOR || (USE_LUA_PROFILER && UNITY_ANDROID)
 using System;
 using System.Runtime.InteropServices;
 using UnityEngine;

diff --git a/LuaProfiler/Runtime/Core/Driver/Hook/WindowsHook/LDasm.cs b/LuaProfiler/Runtime/Core/Driver/Hook/WindowsHook/LDasm.cs
@@ -1,6 +1,6 @@
 using System;
 
-#if UNITY_EDITOR_WIN || (USE_LUA_PROFILER && UNITY_STANDALONE_WIN)
+#if UNITY_EDITOR || (USE_LUA_PROFILER && UNITY_STANDALONE_WIN)
 namespace MikuLuaProfiler
 {
 	/// <summary>

diff --git a/LuaProfiler/Runtime/Core/Driver/Hook/WindowsHook/NativeHelper.cs b/LuaProfiler/Runtime/Core/Driver/Hook/WindowsHook/NativeHelper.cs
@@ -32,7 +32,7 @@
 * Purpose:  
 * ==============================================================================
 */
-#if UNITY_EDITOR_WIN || (USE_LUA_PROFILER && UNITY_STANDALONE_WIN)
+#if UNITY_EDITOR || (USE_LUA_PROFILER && UNITY_STANDALONE_WIN)
 namespace MikuLuaProfiler
 {
     using System;

diff --git a/LuaProfiler/Runtime/Core/Driver/Hook/WindowsHook/WindowsNativeHooker.cs b/LuaProfiler/Runtime/Core/Driver/Hook/WindowsHook/WindowsNativeHooker.cs
@@ -1,4 +1,4 @@
-#if UNITY_EDITOR_WIN || (USE_LUA_PROFILER && UNITY_STANDALONE_WIN)
+#if UNITY_EDITOR || (USE_LUA_PROFILER && UNITY_STANDALONE_WIN)
 using System;
 using System.Runtime.InteropServices;
 

diff --git a/LuaProfiler/Runtime/Core/Driver/LuaDLL.cs b/LuaProfiler/Runtime/Core/Driver/LuaDLL.cs
@@ -33,7 +33,7 @@
 * ==============================================================================
 */
 
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;

diff --git a/LuaProfiler/Runtime/Core/Driver/LuaProfiler.cs b/LuaProfiler/Runtime/Core/Driver/LuaProfiler.cs
@@ -33,7 +33,7 @@
 * ==============================================================================
 */
 
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 using System;
 using System.Collections.Generic;
 using System.IO;

diff --git a/LuaProfiler/Runtime/Core/Driver/NativeHelper/INativeHooker.cs b/LuaProfiler/Runtime/Core/Driver/NativeHelper/INativeHooker.cs
@@ -1,4 +1,4 @@
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 using System;
 
 namespace MikuLuaProfiler

diff --git a/LuaProfiler/Runtime/Core/Driver/Parse/Common.cs b/LuaProfiler/Runtime/Core/Driver/Parse/Common.cs
@@ -33,7 +33,7 @@
 * ==============================================================================
 */
 
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 namespace MikuLuaProfiler
 {
     public static class LuaConf

diff --git a/LuaProfiler/Runtime/Core/Driver/Parse/LLex.cs b/LuaProfiler/Runtime/Core/Driver/Parse/LLex.cs
@@ -32,7 +32,7 @@
 * Purpose:  
 * ==============================================================================
 */
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 using System;
 using System.Collections.Generic;
 using System.Text;

diff --git a/LuaProfiler/Runtime/Core/Driver/Parse/Parse.cs b/LuaProfiler/Runtime/Core/Driver/Parse/Parse.cs
@@ -32,7 +32,7 @@
 * Purpose:  
 * ==============================================================================
 */
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 using System;
 using System.Collections.Generic;
 

diff --git a/LuaProfiler/Runtime/Core/Driver/Parse/Util.cs b/LuaProfiler/Runtime/Core/Driver/Parse/Util.cs
@@ -33,7 +33,7 @@
 * ==============================================================================
 */
 
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 #define API_CHECK
 #define UNILUA_ASSERT
 

diff --git a/LuaProfiler/Runtime/Core/LuaHookSetup.cs b/LuaProfiler/Runtime/Core/LuaHookSetup.cs
@@ -33,7 +33,7 @@
 * ==============================================================================
 */
 
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -71,6 +71,9 @@ public static void RegisterAction(Action a)
 #endif
         public static void OnStartGame()
         {
+#if UNITY_EDITOR_OSX
+            return;
+#endif
 #if UNITY_EDITOR
             if (!Application.isPlaying) return;
 #endif

diff --git a/LuaProfiler/Runtime/Core/NetWork/MBinaryReader.cs b/LuaProfiler/Runtime/Core/NetWork/MBinaryReader.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Text;
 
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 namespace MikuLuaProfiler
 {
     public class MBinaryReader : BinaryReader

diff --git a/LuaProfiler/Runtime/Core/NetWork/MBinaryWriter.cs b/LuaProfiler/Runtime/Core/NetWork/MBinaryWriter.cs
@@ -1,4 +1,4 @@
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 using System.Collections.Generic;
 using System.IO;
 using System.Text;

diff --git a/LuaProfiler/Runtime/Core/NetWork/NetWorkMgr.Server.cs b/LuaProfiler/Runtime/Core/NetWork/NetWorkMgr.Server.cs
@@ -1,4 +1,4 @@
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 
 using System;
 using System.Net;

diff --git a/LuaProfiler/Runtime/Core/NetWork/NetWorkMgr.cs b/LuaProfiler/Runtime/Core/NetWork/NetWorkMgr.cs
@@ -1,4 +1,4 @@
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 
 using System;
 using System.Collections.Generic;

diff --git a/LuaProfiler/Runtime/Core/NetWork/Packet/LuaRefInfo.cs b/LuaProfiler/Runtime/Core/NetWork/Packet/LuaRefInfo.cs
@@ -1,4 +1,4 @@
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 using System;
 using System.IO;
 

diff --git a/LuaProfiler/Runtime/Core/NetWork/Packet/PKGDisconnect.cs b/LuaProfiler/Runtime/Core/NetWork/Packet/PKGDisconnect.cs
@@ -1,4 +1,4 @@
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 namespace MikuLuaProfiler
 {
     [PacketMsg(MsgHead.DisConnect)]

diff --git a/LuaProfiler/Runtime/Core/NetWork/Packet/PKGHeartBeat.cs b/LuaProfiler/Runtime/Core/NetWork/Packet/PKGHeartBeat.cs
@@ -1,4 +1,4 @@
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 namespace MikuLuaProfiler
 {
     [PacketMsg(MsgHead.HeartBeat)]

diff --git a/LuaProfiler/Runtime/Core/NetWork/Packet/PacketBase.cs b/LuaProfiler/Runtime/Core/NetWork/Packet/PacketBase.cs
@@ -1,4 +1,4 @@
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 using System;
 using System.Collections.Generic;
 using System.IO;

diff --git a/LuaProfiler/Runtime/Core/NetWork/Packet/Sample.cs b/LuaProfiler/Runtime/Core/NetWork/Packet/Sample.cs
@@ -1,4 +1,4 @@
-#if UNITY_EDITOR_WIN || USE_LUA_PROFILER
+#if UNITY_EDITOR || USE_LUA_PROFILER
 using System;
 using System.Collections.Generic;
 using System.IO;