[unreal]恢复edit_on_instance装饰器支持 (#1949)

Signed-off-by: morirain <[email protected]>
Tencent · Dec 18, 2024 · 31f6dd5 · 31f6dd5
1 parent 7116a53
commit 31f6dd5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/unreal/Puerts/Content/JavaScript/PuertsEditor/CodeAnalyze.js b/unreal/Puerts/Content/JavaScript/PuertsEditor/CodeAnalyze.js
diff --git a/unreal/Puerts/Content/JavaScript/PuertsEditor/CodeAnalyze.js.map b/unreal/Puerts/Content/JavaScript/PuertsEditor/CodeAnalyze.js.map
diff --git a/unreal/Puerts/PuertsEditor/CodeAnalyze.ts b/unreal/Puerts/PuertsEditor/CodeAnalyze.ts
@@ -1058,10 +1058,12 @@ function watch(configFilePath:string) {
                                             }
                                         });
                                     }
-                                    //if (!hasDecorator(symbol.valueDeclaration, "edit_on_instance")) {
-                                    //    flags = flags | BigInt(PropertyFlags.CPF_DisableEditOnInstance);
-                                    //}
-
+                                    if (hasDecorator(symbol.valueDeclaration, "edit_on_instance")) {
+                                        flags &= ~BigInt(PropertyFlags.CPF_DisableEditOnInstance);
+                                    } else {
+                                        flags |= BigInt(PropertyFlags.CPF_DisableEditOnInstance);
+                                    }
+
                                     // bp.AddMemberVariable(symbol.getName(), propPinType.pinType, propPinType.pinValueType, Number(flags & 0xffffffffn), Number(flags >> 32n), cond);
                                     bp.AddMemberVariableWithMetaData(symbol.getName(), propPinType.pinType, propPinType.pinValueType, Number(flags & 0xffffffffn), Number(flags >> 32n), cond, uemeta.compilePropertyMetaData(symbol));
                                 }

diff --git a/unreal/Puerts/Source/PuertsEditor/Private/PEBlueprintAsset.cpp b/unreal/Puerts/Source/PuertsEditor/Private/PEBlueprintAsset.cpp
@@ -1152,7 +1152,7 @@ void UPEBlueprintAsset::AddMemberVariable(FName NewVarName, FPEGraphPinType InGr
 
         // The following code recalculates the final flags.
         // Variables added to the blueprint via FBlueprintEditorUtils::AddMemberVariable come with some default flags.
-        InFlags |= CPF_Edit | CPF_BlueprintVisible | CPF_DisableEditOnInstance;
+        InFlags |= CPF_Edit | CPF_BlueprintVisible;
 
         if (Blueprint->NewVariables[VarIndex].VarType.PinCategory == UEdGraphSchema_K2::PC_MCDelegate)
         {