diff --git a/Library/FlowNode/MethodDetails.cs b/Library/FlowNode/MethodDetails.cs index 9e9169f..b9be200 100644 --- a/Library/FlowNode/MethodDetails.cs +++ b/Library/FlowNode/MethodDetails.cs @@ -31,7 +31,7 @@ namespace Serein.Library /// - /// 是否保护参数(目前仅视觉效果参数,不影响运行实现,后续将设置作用在运行逻辑中) + /// 是否保护参数 /// [PropertyInfo(IsNotification = true)] private bool _isProtectionParameter; diff --git a/Library/FlowNode/NodeModelBaseFunc.cs b/Library/FlowNode/NodeModelBaseFunc.cs index 10f6583..ac7fd69 100644 --- a/Library/FlowNode/NodeModelBaseFunc.cs +++ b/Library/FlowNode/NodeModelBaseFunc.cs @@ -106,6 +106,9 @@ namespace Serein.Library ParameterData = parameterData.ToArray(), ErrorNodes = errorNodes.ToArray(), Position = Position, + IsProtectionParameter = this.MethodDetails.IsProtectionParameter, + IsInterrupt = this.DebugSetting.IsInterrupt, + IsEnable = this.DebugSetting.IsEnable, }; nodeInfo = SaveCustomData(nodeInfo); return nodeInfo; @@ -130,6 +133,10 @@ namespace Serein.Library this.Guid = nodeInfo.Guid; this.Position = nodeInfo.Position ?? new PositionOfUI(0, 0);// 加载位置信息 var md = this.MethodDetails; // 当前节点的方法说明 + this.MethodDetails.IsProtectionParameter = nodeInfo.IsProtectionParameter; // 保护参数 + this.DebugSetting.IsInterrupt = nodeInfo.IsInterrupt; // 是否中断 + this.DebugSetting.IsEnable = nodeInfo.IsEnable; // 是否使能 + if (md != null) { if(md.ParameterDetailss == null) diff --git a/Library/FlowNode/SereinProjectData.cs b/Library/FlowNode/SereinProjectData.cs index e1d3a51..ba3054c 100644 --- a/Library/FlowNode/SereinProjectData.cs +++ b/Library/FlowNode/SereinProjectData.cs @@ -241,10 +241,23 @@ namespace Serein.Library public PositionOfUI Position { get; set; } + /// - /// 是否选中(暂时无效) + /// 是否中断 /// - public bool IsSelect { get; set; } + public bool IsInterrupt { get; set; } + + /// + /// 是否使能 + /// + public bool IsEnable { get; set; } + + /// + /// 是否保护参数 + /// + public bool IsProtectionParameter { get; set; } + + /// /// 自定义数据 diff --git a/WorkBench/App.xaml.cs b/WorkBench/App.xaml.cs index 6a239b5..1e08f20 100644 --- a/WorkBench/App.xaml.cs +++ b/WorkBench/App.xaml.cs @@ -16,7 +16,7 @@ namespace Serein.Workbench { #if DEBUG - if (1 == 11) + if (1 == 1) { // 这里是我自己的测试代码,你可以删除 string filePath; diff --git a/WorkBench/Node/View/ActionNodeControl.xaml b/WorkBench/Node/View/ActionNodeControl.xaml index 4b6698e..e5fc3b4 100644 --- a/WorkBench/Node/View/ActionNodeControl.xaml +++ b/WorkBench/Node/View/ActionNodeControl.xaml @@ -109,23 +109,24 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/WorkBench/Node/View/FlipflopNodeControl.xaml b/WorkBench/Node/View/FlipflopNodeControl.xaml index 5715eb2..1a445b9 100644 --- a/WorkBench/Node/View/FlipflopNodeControl.xaml +++ b/WorkBench/Node/View/FlipflopNodeControl.xaml @@ -86,23 +86,24 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/WorkBench/Serein.WorkBench.csproj b/WorkBench/Serein.WorkBench.csproj index 5b4501c..91f5532 100644 --- a/WorkBench/Serein.WorkBench.csproj +++ b/WorkBench/Serein.WorkBench.csproj @@ -56,9 +56,9 @@ - +