微小的bug

yomunsam · Jul 16, 2019 · 992c409 · 992c409
1 parent 9e1be60
commit 992c409
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/Assets/TinaX/Core/System/Lua/Editor/LuaBuildConst.cs b/Assets/TinaX/Core/System/Lua/Editor/LuaBuildConst.cs
@@ -119,10 +119,10 @@ public static List<Type> LuaCallCSharpNestedTypes
 
             #region 第三方依赖
 
-            //thirdParty
+            ////thirdParty
 
-            typeof(SuperScrollView.LoopListView2),
-            typeof(SuperScrollView.LoopListViewItem2),
+            //typeof(SuperScrollView.LoopListView2),
+            //typeof(SuperScrollView.LoopListViewItem2),
 
 
             //Unirx
@@ -145,9 +145,9 @@ public static List<Type> LuaCallCSharpNestedTypes
             typeof(Action<Collision>),
             typeof(Action<UnityEngine.Object>),
 
-            //thirdparty
-            typeof(System.Func<SuperScrollView.LoopListView2, int, SuperScrollView.LoopListViewItem2>),
-            typeof(Action<SuperScrollView.LoopListViewItem2,object>),
+            ////thirdparty
+            //typeof(System.Func<SuperScrollView.LoopListView2, int, SuperScrollView.LoopListViewItem2>),
+            //typeof(Action<SuperScrollView.LoopListViewItem2,object>),
 
         };
 

diff --git a/Assets/TinaX/Core/System/Lua/Editor/ProjectSetting/PSLuaConfig.cs b/Assets/TinaX/Core/System/Lua/Editor/ProjectSetting/PSLuaConfig.cs
@@ -5,7 +5,7 @@ namespace TinaX.Lua.ProjectSetting
 {
     static class PSLuaConfig
     {
-
+#if TinaX_CA_LuaRuntime_Enable
         private static Lua.LuaConfig mConfig;
         private static SerializedObject mSer_Config;
 
@@ -22,7 +22,7 @@ static class PSLuaConfig
         private static SerializedProperty mConf_Debug_LuaPerfact_Enable; //LuaPerfact enable
         private static SerializedProperty mConf_Debug_LuaPerfact_Addr; //
         private static SerializedProperty mConf_Debug_LuaPerfact_Port; //
-        
+#endif
 
 
         [SettingsProvider]
@@ -33,7 +33,7 @@ public static SettingsProvider Projects_VFS()
                 label = "Lua Script",
                 activateHandler = (searchContext, rootElement) =>
                 {
-
+#if TinaX_CA_LuaRuntime_Enable
                     mTitle.normal.textColor = TinaX.Core.XEditorStyleDefine.Color_Blue;
                     mTitle.fontSize = 15;
 
@@ -60,13 +60,14 @@ public static SettingsProvider Projects_VFS()
                         }
 
                     }
+#endif
 
                 },
                 guiHandler = (searchContext) =>
                 {
 #if !TinaX_CA_LuaRuntime_Enable
                     GUILayout.Label("您似乎未启用TinaX Framework的 Lua 功能，请先在宏定义设置中启用.");
-#endif
+#else
                     if (mSer_Config != null && mConfig != null)
                     {
                         EditorGUILayout.BeginVertical(GUILayout.MaxWidth(500));
@@ -116,7 +117,7 @@ public static SettingsProvider Projects_VFS()
 
                         mSer_Config.ApplyModifiedProperties();
                     }
-
+#endif
                 },
                 deactivateHandler = () =>
                 {