Merge pull request #519 from zjhongxian/master

fixed many bugs
Tencent · May 26, 2023 · d8cfa38 · d8cfa38
2 parents fc35ebf + 68744ec
commit d8cfa38
Show file tree

Hide file tree

Showing 28 changed files with 132 additions and 411 deletions.
diff --git a/Content/Lua/TestMap.lua b/Content/Lua/TestMap.lua
@@ -63,4 +63,8 @@ function TestMap:ReceiveBeginPlay()
     test()
 end
 
+function TestMap:update()
+
+end
+
 return Class(ni, nil, TestMap)
diff --git a/Plugins/slua_unreal/Source/slua_unreal/Private/LuaActor.cpp b/Plugins/slua_unreal/Source/slua_unreal/Private/LuaActor.cpp
@@ -7,14 +7,6 @@ ALuaActor::ALuaActor(const FObjectInitializer& ObjectInitializer)
 {
 }
 
-void ALuaActor::PostInitializeComponents()
-{
-    Super::PostInitializeComponents();
-
-    CallReceivePreRep(LuaFilePath);
-    TryHookActorComponents();
-}
-
 void ALuaActor::EndPlay(const EEndPlayReason::Type EndPlayReason)
 {
     Super::EndPlay(EndPlayReason);
@@ -30,6 +22,12 @@ FString ALuaActor::GetLuaFilePath_Implementation() const
     return LuaFilePath;
 }
 
+void ALuaActor::PostInitializeComponents()
+{
+    Super::PostInitializeComponents();
+    ILuaOverriderInterface::PostLuaHook();
+}
+
 void ALuaActor::RegistLuaTick(float TickInterval)
 {
     EnableLuaTick = true;

diff --git a/Plugins/slua_unreal/Source/slua_unreal/Private/LuaActorComponent.cpp b/Plugins/slua_unreal/Source/slua_unreal/Private/LuaActorComponent.cpp
@@ -8,13 +8,6 @@ ULuaActorComponent::ULuaActorComponent(const FObjectInitializer& ObjectInitializ
     bWantsInitializeComponent = true;
 }
 
-void ULuaActorComponent::InitializeComponent()
-{
-    Super::InitializeComponent();
-
-    CallReceivePreRep(LuaFilePath);
-}
-
 void ULuaActorComponent::EndPlay(const EEndPlayReason::Type EndPlayReason)
 {
     Super::EndPlay(EndPlayReason);
@@ -42,6 +35,13 @@ void ULuaActorComponent::UnRegistLuaTick()
     state->unRegistLuaTick(this);
 }
 
+void ULuaActorComponent::InitializeComponent()
+{
+    Super::InitializeComponent();
+
+    TryHook();
+}
+
 void ULuaActorComponent::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>& OutLifetimeProps) const
 {
     Super::GetLifetimeReplicatedProps(OutLifetimeProps);

diff --git a/Plugins/slua_unreal/Source/slua_unreal/Private/LuaFunctionAccelerator.cpp b/Plugins/slua_unreal/Source/slua_unreal/Private/LuaFunctionAccelerator.cpp
@@ -35,19 +35,19 @@ namespace NS_SLUA
             FProperty* prop = *it;
             uint64 propflag = prop->GetPropertyFlags();
 
-            FOutParmRec* out = nullptr;
             if (prop->HasAnyPropertyFlags(CPF_OutParm))
             {
                 outParmRecProps.Add(prop);
             }
 
-            FCheckerInfo checkerInfo = {false, false, false, propIndex, prop->GetOffset_ForInternal(), prop};
+            FCheckerInfo checkerInfo = {false, false, false, false, propIndex, prop->GetOffset_ForInternal(), prop};
             FCheckerInfo* checkerRef = &checkerInfo;
-            if (!prop->HasAnyPropertyFlags(CPF_NoDestructor) &&
-                !(IsReferenceParam(prop->PropertyFlags, func) && LuaObject::getReferencer(prop)))
+            if (!prop->HasAnyPropertyFlags(CPF_NoDestructor))
             {
                 checkerInfo.bInit = true;
+                checkerInfo.bReference = IsReferenceParam(prop->PropertyFlags, func) && LuaObject::getReferencer(prop);
                 paramsChecker.Add(checkerInfo);
+
                 checkerRef = &paramsChecker.Top();
             }
 
@@ -152,8 +152,8 @@ namespace NS_SLUA
         auto funcPtr = cache.Find(inFunc);
         if (funcPtr)
         {
-            cache.Remove(inFunc);
             delete *funcPtr;
+            cache.Remove(inFunc);
             return true;
         }
 
@@ -230,7 +230,7 @@ namespace NS_SLUA
         for (auto& checkerInfo : paramsChecker)
         {
             auto prop = checkerInfo.prop;
-            if (checkerInfo.bInit && (lua_type(L, i) == LUA_TUSERDATA))
+            if (checkerInfo.bInit && !(checkerInfo.bReference && (lua_type(L, i) == LUA_TUSERDATA)))
             {
                 if (!prop->HasAnyPropertyFlags(CPF_ZeroConstructor))
                 {
@@ -353,7 +353,7 @@ namespace NS_SLUA
         for (auto& checkerInfo : paramsChecker)
         {
             auto prop = checkerInfo.prop;
-            if (checkerInfo.bInit && (lua_type(L, i) == LUA_TUSERDATA))
+            if (checkerInfo.bInit && !(checkerInfo.bReference && (lua_type(L, i) == LUA_TUSERDATA)))
             {
                 if (!prop->HasAnyPropertyFlags(CPF_ZeroConstructor))
                 {

diff --git a/Plugins/slua_unreal/Source/slua_unreal/Private/LuaGameMode.cpp b/Plugins/slua_unreal/Source/slua_unreal/Private/LuaGameMode.cpp
@@ -9,11 +9,3 @@ FString ALuaGameMode::GetLuaFilePath_Implementation() const
 {
     return LuaFilePath;
 }
-
-void ALuaGameMode::PostInitializeComponents()
-{
-    Super::PostInitializeComponents();
-
-    CallReceivePreRep(LuaFilePath);
-    TryHookActorComponents();
-}
diff --git a/Plugins/slua_unreal/Source/slua_unreal/Private/LuaGameState.cpp b/Plugins/slua_unreal/Source/slua_unreal/Private/LuaGameState.cpp
@@ -11,14 +11,6 @@ FString ALuaGameState::GetLuaFilePath_Implementation() const
     return LuaFilePath;
 }
 
-void ALuaGameState::PostInitializeComponents()
-{
-    Super::PostInitializeComponents();
-
-    CallReceivePreRep(LuaFilePath);
-    TryHookActorComponents();
-}
-
 void ALuaGameState::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>& OutLifetimeProps) const
 {
     Super::GetLifetimeReplicatedProps(OutLifetimeProps);

diff --git a/Plugins/slua_unreal/Source/slua_unreal/Private/LuaInstancedActorComponent.cpp b/Plugins/slua_unreal/Source/slua_unreal/Private/LuaInstancedActorComponent.cpp
diff --git a/Plugins/slua_unreal/Source/slua_unreal/Private/LuaLevelScriptActor.cpp b/Plugins/slua_unreal/Source/slua_unreal/Private/LuaLevelScriptActor.cpp
@@ -24,7 +24,7 @@ void ALuaLevelScriptActor::onLuaStateInit(NS_SLUA::lua_State* L)
 {
     if (!HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject))
     {
-        NS_SLUA::LuaState::hookObject(nullptr, this);
+        NS_SLUA::LuaState::hookObject(nullptr, this, true);
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,4 +63,8 @@ function TestMap:ReceiveBeginPlay() @@
         test()
     end
+    function TestMap:update()
+    end
     return Class(ni, nil, TestMap)