Skip to content

修复与继承相关的绑定导致的崩溃和无限循环问题 #719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BaconVN wants to merge 1 commit into
base: master
Choose a base branch
from
Open

修复与继承相关的绑定导致的崩溃和无限循环问题 #719

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions Plugins/UnLua/Source/UnLua/Private/LuaFunction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,18 @@ DEFINE_FUNCTION(ULuaFunction::execCallLua)
// PIE 结束时可能已经没有Lua环境了
return;
}

// 如果调用的 ULuaFunction 来自父类，且与对象的 UClass 不是同一个类。
// 这就是为什么我们跳过调用 Lua 端，而是调用被重写的函数，以防止继承相关的 bugs
if (LuaFunction->GetOverriddenUClass() != Context->GetClass())
{
const auto Overridden = LuaFunction->GetOverridden();
if (Overridden)
{
Context->CallFunction(Stack, RESULT_PARAM, Overridden);
}
return;
}
Env->GetFunctionRegistry()->Invoke(LuaFunction, Context, Stack, RESULT_PARAM);
}

Expand All @@ -46,6 +58,18 @@ DEFINE_FUNCTION(ULuaFunction::execScriptCallLua)
// PIE 结束时可能已经没有Lua环境了
return;
}

// 如果调用的 ULuaFunction 来自父类，且与对象的 UClass 不是同一个类。
// 这就是为什么我们跳过调用 Lua 端，而是调用被重写的函数，以防止继承相关的 bugs
if (LuaFunction->GetOverriddenUClass() != Context->GetClass())
{
const auto Overridden = LuaFunction->GetOverridden();
if (Overridden)
{
Context->CallFunction(Stack, RESULT_PARAM, Overridden);
}
return;
}
Env->GetFunctionRegistry()->Invoke(LuaFunction, Context, Stack, RESULT_PARAM);
}

Expand Down