Skip to content

Commit 662813a

Browse files
committed
Fix bugs, modify the namespace name of the built-in examples.
1 parent 7a497ad commit 662813a

File tree

7 files changed

+24
-12
lines changed

7 files changed

+24
-12
lines changed

Editor/Scripts/Examples/CodeExecutorInjectorCSharp.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using UnityEditor;
44
using UnityEngine;
55

6-
namespace ChenPipi.CodeExecutor.Example
6+
namespace ChenPipi.CodeExecutor.Examples
77
{
88

99
/// <summary>

Editor/Scripts/Examples/CodeExecutorInjectorXLua.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using UnityEditor;
44
using UnityEngine;
55

6-
namespace ChenPipi.CodeExecutor.Example
6+
namespace ChenPipi.CodeExecutor.Examples
77
{
88

99
/// <summary>

Editor/Scripts/Examples/CodeExecutorInjectorXLuaCustom.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using UnityEditor;
44
using UnityEngine;
55

6-
namespace ChenPipi.CodeExecutor.Example
6+
namespace ChenPipi.CodeExecutor.Examples
77
{
88

99
/// <summary>
@@ -13,12 +13,13 @@ public static class CodeExecutorInjectorXLuaCustom
1313
{
1414

1515
/// <summary>
16-
/// 注册
16+
/// 注册 CodeExecutor 执行模式
1717
/// </summary>
1818
[CodeExecutorRegistration(5)]
1919
private static void Register()
2020
{
21-
if (!CodeExecutorSettings.enableBuiltinExecModeXLua)
21+
// 依赖 XLua (Standalone)
22+
if (!CodeExecutorSettings.enableBuiltinExecModeXLua || !CodeExecutorSettings.enableBuiltinExecModeXLuaCustom)
2223
{
2324
return;
2425
}

Editor/Scripts/Examples/InjectHelperCSharp.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.CodeDom.Compiler;
88
using Microsoft.CSharp;
99

10-
namespace ChenPipi.CodeExecutor.Example
10+
namespace ChenPipi.CodeExecutor.Examples
1111
{
1212

1313
/// <summary>

Editor/Scripts/Examples/InjectHelperXLua.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Text;
66
using UnityEngine;
77

8-
namespace ChenPipi.CodeExecutor.Example
8+
namespace ChenPipi.CodeExecutor.Examples
99
{
1010

1111
/// <summary>
@@ -29,8 +29,11 @@ public static void Init(string assemblyName = DefaultAssemblyName)
2929
{
3030
assemblyName = string.IsNullOrEmpty(assemblyName) ? DefaultAssemblyName : assemblyName;
3131
Assembly assembly = Assembly.Load(assemblyName);
32-
s_LuaEnvType = assembly.GetType("XLua.LuaEnv", true);
33-
s_LuaTableType = assembly.GetType("XLua.LuaTable", true);
32+
if (assembly != null)
33+
{
34+
s_LuaEnvType = assembly.GetType("XLua.LuaEnv", true);
35+
s_LuaTableType = assembly.GetType("XLua.LuaTable", true);
36+
}
3437
}
3538
catch (Exception e)
3639
{
@@ -39,7 +42,7 @@ public static void Init(string assemblyName = DefaultAssemblyName)
3942

4043
if (s_LuaEnvType == null || s_LuaTableType == null)
4144
{
42-
Debug.LogError("[CodeExecutor] Unable to reach \'XLua\', make sure you specify the correct assembly name!");
45+
Debug.LogError("[CodeExecutor] Unable to reach 'XLua', make sure you specify the correct assembly name!");
4346
}
4447
}
4548

Editor/Scripts/Examples/ReflectionAPI.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Text;
66
using UnityEngine;
77

8-
namespace ChenPipi.CodeExecutor.Example
8+
namespace ChenPipi.CodeExecutor.Examples
99
{
1010

1111
/// <summary>

Editor/Scripts/Window/CodeExecutorWindowMenu.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ public void AddItemsToMenu(GenericMenu menu)
1515
{
1616
menu.AddItem(new GUIContent("Built-in Execution Mode/C#"), CodeExecutorSettings.enableBuiltinExecModeCSharp, Menu_EnableBuiltinExecutionModeCSharp);
1717
menu.AddItem(new GUIContent("Built-in Execution Mode/XLua (Standalone)"), CodeExecutorSettings.enableBuiltinExecModeXLua, Menu_EnableBuiltinExecutionModeXLua);
18-
menu.AddItem(new GUIContent("Built-in Execution Mode/XLua (Custom)"), CodeExecutorSettings.enableBuiltinExecModeXLuaCustom, Menu_EnableBuiltinExecutionModeXLuaCustom);
18+
menu.AddItem(
19+
new GUIContent("Built-in Execution Mode/XLua (Custom)"),
20+
(CodeExecutorSettings.enableBuiltinExecModeXLua && CodeExecutorSettings.enableBuiltinExecModeXLuaCustom),
21+
Menu_EnableBuiltinExecutionModeXLuaCustom
22+
);
1923
menu.AddItem(new GUIContent("Document: How to register execution mode?"), false, Menu_Document);
2024
menu.AddSeparator(string.Empty);
2125
menu.AddItem(new GUIContent("Reload"), false, Menu_Reload);
@@ -44,6 +48,10 @@ private void Menu_EnableBuiltinExecutionModeXLua()
4448

4549
private void Menu_EnableBuiltinExecutionModeXLuaCustom()
4650
{
51+
if (!CodeExecutorSettings.enableBuiltinExecModeXLua)
52+
{
53+
return;
54+
}
4755
CodeExecutorSettings.enableBuiltinExecModeXLuaCustom = !CodeExecutorSettings.enableBuiltinExecModeXLuaCustom;
4856
UnityEditor.Compilation.CompilationPipeline.RequestScriptCompilation();
4957
}

0 commit comments

Comments
 (0)