Merge branch 'master' into develop

xuyanghuang-tencent · xuyanghuang-tencent · commit 049d3e70a623 · 2023-02-02T18:35:32.000+08:00
diff --git a/Plugins/UnLua/Source/UnLuaDefaultParamCollector/Private/UnLuaDefaultParamCollector.cpp b/Plugins/UnLua/Source/UnLuaDefaultParamCollector/Private/UnLuaDefaultParamCollector.cpp
@@ -343,7 +343,10 @@ class FUnLuaDefaultParamCollectorModule : public IScriptGeneratorPluginInterface
                     else if (Property->IsA(FBoolProperty::StaticClass())) // boolean
                     {
                         PreAddProperty(Class, Function);
-                        GeneratedFileContent += FString::Printf(TEXT("PC->Parameters.Add(TEXT(\"%s\"), SharedBool_%s);\r\n"), *Property->GetName(), *ValueStr.ToUpper());
+						if(ValueStr.IsEmpty())
+							GeneratedFileContent += FString::Printf(TEXT("PC->Parameters.Add(TEXT(\"%s\"), SharedBool_FALSE);\r\n"), *Property->GetName());
+						else
+							GeneratedFileContent += FString::Printf(TEXT("PC->Parameters.Add(TEXT(\"%s\"), SharedBool_%s);\r\n"), *Property->GetName(), *ValueStr.ToUpper());
                     }
                     else if (Property->IsA(FNameProperty::StaticClass())) // FName
                     {

Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,10 @@ class FUnLuaDefaultParamCollectorModule : public IScriptGeneratorPluginInterface`
`343`	`343`	`else if (Property->IsA(FBoolProperty::StaticClass())) // boolean`
`344`	`344`	`{`
`345`	`345`	`PreAddProperty(Class, Function);`
`346`		`- GeneratedFileContent += FString::Printf(TEXT("PC->Parameters.Add(TEXT(\"%s\"), SharedBool_%s);\r\n"), Property->GetName(), ValueStr.ToUpper());`
	`346`	`+ if(ValueStr.IsEmpty())`
	`347`	`+ GeneratedFileContent += FString::Printf(TEXT("PC->Parameters.Add(TEXT(\"%s\"), SharedBool_FALSE);\r\n"), *Property->GetName());`
	`348`	`+ else`
	`349`	`+ GeneratedFileContent += FString::Printf(TEXT("PC->Parameters.Add(TEXT(\"%s\"), SharedBool_%s);\r\n"), Property->GetName(), ValueStr.ToUpper());`
`347`	`350`	`}`
`348`	`351`	`else if (Property->IsA(FNameProperty::StaticClass())) // FName`
`349`	`352`	`{`