From 346bd84d8be21797d73075849c6f445ca2a44d67 Mon Sep 17 00:00:00 2001
From: taoria <445625470@qq.com>
Date: Sat, 20 Aug 2022 16:37:04 +0800
Subject: [PATCH] feature:add a watcher to monitor the iteration situation

---
 Samples/AddNode.cs                            |   7 +-
 Samples/New HelloGraph.asset                  | 156 ++++++++++++++++--
 TNodeCore/Editor/GraphWatcher.meta            |   3 +
 TNodeCore/Editor/GraphWatcher/GraphWatcher.cs |  11 ++
 .../Editor/GraphWatcher/GraphWatcher.cs.meta  |   3 +
 .../NodeGraphView/IBaseDataGraphView.cs       |   3 +-
 TNodeCore/Editor/Resources/GraphEditor.uxml   |   4 +-
 TNodeCore/Runtime/Components/RuntimeGraph.cs  |   9 +-
 .../Runtime/Extensions/NodeDataExtensions.cs  |  10 ++
 .../Extensions/NodeDataExtensions.cs.meta     |   3 +
 .../RuntimeModels/IRuntimeNodeGraph.cs        |  11 +-
 .../Runtime/RuntimeModels/StaticGraph.cs      |  29 ++--
 TNodeCore/Runtime/Tools/GraphTool.cs          |  26 ++-
 .../Editor/GraphWatcherView.meta              |   3 +
 .../GraphWatcherView/GraphWatcherView.cs      |  58 +++++++
 .../GraphWatcherView/GraphWatcherView.cs.meta |   3 +
 .../Editor/Inspector/NodeInspectorInNode.cs   |  29 +---
 .../Editor/NodeGraphView/DataGraphView.cs     | 109 +++++++-----
 .../NodeGraphView/SimpleGraphSubWindow.cs     |   6 -
 .../Editor/Resources/GraphWatcher.uxml        |  21 +++
 .../Editor/Resources/GraphWatcher.uxml.meta   |   3 +
 .../Editor/Resources/GraphWatcherStyle.uss    |   3 +
 .../Resources/GraphWatcherStyle.uss.meta      |   3 +
 .../Editor/Resources/NodeViewHighlight.uss    |   4 +
 .../Resources/NodeViewHighlight.uss.meta      |   3 +
 Tests.meta                                    |   8 +
 Tests/NodePortTest.cs                         |  59 +++++++
 Tests/NodePortTest.cs.meta                    |  11 ++
 Tests/StaticGraphTest.cs                      |  10 +-
 Tests/Tests.asmdef                            |  26 +++
 Tests/Tests.asmdef.meta                       |   7 +
 31 files changed, 514 insertions(+), 127 deletions(-)
 create mode 100644 TNodeCore/Editor/GraphWatcher.meta
 create mode 100644 TNodeCore/Editor/GraphWatcher/GraphWatcher.cs
 create mode 100644 TNodeCore/Editor/GraphWatcher/GraphWatcher.cs.meta
 create mode 100644 TNodeCore/Runtime/Extensions/NodeDataExtensions.cs
 create mode 100644 TNodeCore/Runtime/Extensions/NodeDataExtensions.cs.meta
 create mode 100644 TNodeGraphViewImpl/Editor/GraphWatcherView.meta
 create mode 100644 TNodeGraphViewImpl/Editor/GraphWatcherView/GraphWatcherView.cs
 create mode 100644 TNodeGraphViewImpl/Editor/GraphWatcherView/GraphWatcherView.cs.meta
 create mode 100644 TNodeGraphViewImpl/Editor/Resources/GraphWatcher.uxml
 create mode 100644 TNodeGraphViewImpl/Editor/Resources/GraphWatcher.uxml.meta
 create mode 100644 TNodeGraphViewImpl/Editor/Resources/GraphWatcherStyle.uss
 create mode 100644 TNodeGraphViewImpl/Editor/Resources/GraphWatcherStyle.uss.meta
 create mode 100644 TNodeGraphViewImpl/Editor/Resources/NodeViewHighlight.uss
 create mode 100644 TNodeGraphViewImpl/Editor/Resources/NodeViewHighlight.uss.meta
 create mode 100644 Tests.meta
 create mode 100644 Tests/NodePortTest.cs
 create mode 100644 Tests/NodePortTest.cs.meta
 create mode 100644 Tests/Tests.asmdef
 create mode 100644 Tests/Tests.asmdef.meta

diff --git a/Samples/AddNode.cs b/Samples/AddNode.cs
index 50f284d..4b651fc 100644
--- a/Samples/AddNode.cs
+++ b/Samples/AddNode.cs
@@ -16,15 +16,10 @@ namespace Samples{
         public Vector2 B{ get; set; }
         [Output]
         public Vector3 Res{ get; set; }
-
-        [Output(Group = true)] public List<Vector3> OutputList => new List<Vector3>{new Vector3(),new Vector3()};
         
-    
-
         public override void Process(){
             Res = A + (Vector3)B;
-            Debug.Log(Res);
-            this.Log(Res.ToString());
+            this.Log($"{Res}");
         }
     }
 }
\ No newline at end of file
diff --git a/Samples/New HelloGraph.asset b/Samples/New HelloGraph.asset
index cc4a8b8..b4c5b29 100644
--- a/Samples/New HelloGraph.asset	
+++ b/Samples/New HelloGraph.asset	
@@ -15,48 +15,172 @@ MonoBehaviour:
   nodeList:
   - id: 0
   - id: 1
+  - id: 2
+  - id: 3
+  - id: 4
+  - id: 5
+  - id: 6
   nodeLinks:
+  - inPort:
+      portEntryName: B
+      nodeDataId: 94327133-34e1-47bb-a365-0782120c581e
+    outPort:
+      portEntryName: Value
+      nodeDataId: 07c1f545-719b-4f9b-9f4c-dc3883c02423
+  - inPort:
+      portEntryName: A
+      nodeDataId: 94327133-34e1-47bb-a365-0782120c581e
+    outPort:
+      portEntryName: Value
+      nodeDataId: 72477a0c-2399-47c1-ba04-495add218335
   - inPort:
       portEntryName: A
+      nodeDataId: 134adf78-f8ba-4888-8362-4a2ca0df2c69
+    outPort:
+      portEntryName: Res
       nodeDataId: 94327133-34e1-47bb-a365-0782120c581e
+  - inPort:
+      portEntryName: B
+      nodeDataId: 134adf78-f8ba-4888-8362-4a2ca0df2c69
+    outPort:
+      portEntryName: Value
+      nodeDataId: 9b6e59e3-cc30-4697-a310-8f1195631ec9
+  - inPort:
+      portEntryName: A
+      nodeDataId: 8d01abf2-f69a-4884-a6a1-99903ed96b7a
+    outPort:
+      portEntryName: Value
+      nodeDataId: 72477a0c-2399-47c1-ba04-495add218335
+  - inPort:
+      portEntryName: B
+      nodeDataId: 8d01abf2-f69a-4884-a6a1-99903ed96b7a
+    outPort:
+      portEntryName: Value
+      nodeDataId: 07c1f545-719b-4f9b-9f4c-dc3883c02423
+  - inPort:
+      portEntryName: A
+      nodeDataId: d4ff4eb9-dd02-4712-90dc-898223d1758f
+    outPort:
+      portEntryName: Res
+      nodeDataId: 8d01abf2-f69a-4884-a6a1-99903ed96b7a
+  - inPort:
+      portEntryName: B
+      nodeDataId: d4ff4eb9-dd02-4712-90dc-898223d1758f
     outPort:
-      portEntryName: OutputList:1
-      nodeDataId: 8289b5d6-f55f-480e-8c16-ae3af7a282dd
+      portEntryName: Value
+      nodeDataId: 07c1f545-719b-4f9b-9f4c-dc3883c02423
   blackboardData:
-    id: 2
+    id: 7
   sceneReference: 
   editorModels: []
   graphViewModel:
-    id: 3
+    id: 8
   references:
     version: 1
     00000000:
+      type: {class: BlackboardDragNode, ns: TNodeCore.Runtime.Models, asm: Taoria.TNodeCore.Runtime}
+      data:
+        positionInView:
+          serializedVersion: 2
+          x: 550
+          y: 218
+          width: 0
+          height: 0
+        id: 72477a0c-2399-47c1-ba04-495add218335
+        nodeName: 
+        entryPoint: 0
+        isTest: 0
+        blackboardDragTypeString: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0,
+          Culture=neutral, PublicKeyToken=null
+        blackDragData: V3S.0
+        isListElement: 1
+    00000001:
       type: {class: AddNode, ns: Samples, asm: Assembly-CSharp}
       data:
         positionInView:
           serializedVersion: 2
-          x: 396
-          y: 215
+          x: 906
+          y: 29
           width: 0
           height: 0
-        id: 8289b5d6-f55f-480e-8c16-ae3af7a282dd
+        id: d4ff4eb9-dd02-4712-90dc-898223d1758f
         nodeName: AddNode
         entryPoint: 0
         isTest: 0
-    00000001:
+    00000002:
+      type: {class: BlackboardDragNode, ns: TNodeCore.Runtime.Models, asm: Taoria.TNodeCore.Runtime}
+      data:
+        positionInView:
+          serializedVersion: 2
+          x: 574
+          y: 306
+          width: 0
+          height: 0
+        id: 07c1f545-719b-4f9b-9f4c-dc3883c02423
+        nodeName: 
+        entryPoint: 0
+        isTest: 0
+        blackboardDragTypeString: UnityEngine.Vector2, UnityEngine.CoreModule, Version=0.0.0.0,
+          Culture=neutral, PublicKeyToken=null
+        blackDragData: V2S.0
+        isListElement: 1
+    00000003:
+      type: {class: AddNode, ns: Samples, asm: Assembly-CSharp}
+      data:
+        positionInView:
+          serializedVersion: 2
+          x: 733
+          y: 52
+          width: 0
+          height: 0
+        id: 8d01abf2-f69a-4884-a6a1-99903ed96b7a
+        nodeName: AddNode
+        entryPoint: 0
+        isTest: 0
+    00000004:
+      type: {class: BlackboardDragNode, ns: TNodeCore.Runtime.Models, asm: Taoria.TNodeCore.Runtime}
+      data:
+        positionInView:
+          serializedVersion: 2
+          x: 817
+          y: 387
+          width: 0
+          height: 0
+        id: 9b6e59e3-cc30-4697-a310-8f1195631ec9
+        nodeName: 
+        entryPoint: 0
+        isTest: 0
+        blackboardDragTypeString: UnityEngine.Vector2, UnityEngine.CoreModule, Version=0.0.0.0,
+          Culture=neutral, PublicKeyToken=null
+        blackDragData: V2S.0
+        isListElement: 1
+    00000005:
       type: {class: AddNode, ns: Samples, asm: Assembly-CSharp}
       data:
         positionInView:
           serializedVersion: 2
-          x: 569
-          y: 215
+          x: 669.5
+          y: 198.5
           width: 0
           height: 0
         id: 94327133-34e1-47bb-a365-0782120c581e
         nodeName: AddNode
         entryPoint: 0
         isTest: 0
-    00000002:
+    00000006:
+      type: {class: AddNode, ns: Samples, asm: Assembly-CSharp}
+      data:
+        positionInView:
+          serializedVersion: 2
+          x: 1007
+          y: 199
+          width: 0
+          height: 0
+        id: 134adf78-f8ba-4888-8362-4a2ca0df2c69
+        nodeName: AddNode
+        entryPoint: 0
+        isTest: 0
+    00000007:
       type: {class: HelloBlackboard, ns: TNode.Samples, asm: Assembly-CSharp}
       data:
         positionInView:
@@ -68,9 +192,11 @@ MonoBehaviour:
         id: 
         HelloString: 
         HelloGameObject: {fileID: 0}
-        V3S: []
-        V2S: []
-    00000003:
+        V3S:
+        - {x: 0, y: 0, z: 0}
+        V2S:
+        - {x: 4, y: 4}
+    00000008:
       type: {class: GraphViewModel, ns: TNode.TNodeCore.Editor.Models, asm: Taoria.TNodeCore.Runtime}
       data:
         positionInView:
@@ -81,5 +207,5 @@ MonoBehaviour:
           height: 0
         id: 
         persistScale: 1
-        persistOffset: {x: 0, y: 0}
+        persistOffset: {x: -169, y: 62}
         isBlackboardOn: 1
diff --git a/TNodeCore/Editor/GraphWatcher.meta b/TNodeCore/Editor/GraphWatcher.meta
new file mode 100644
index 0000000..6f92ec7
--- /dev/null
+++ b/TNodeCore/Editor/GraphWatcher.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f530d96c0a1b4f3482c773cc8666a5e9
+timeCreated: 1660970766
\ No newline at end of file
diff --git a/TNodeCore/Editor/GraphWatcher/GraphWatcher.cs b/TNodeCore/Editor/GraphWatcher/GraphWatcher.cs
new file mode 100644
index 0000000..b80a603
--- /dev/null
+++ b/TNodeCore/Editor/GraphWatcher/GraphWatcher.cs
@@ -0,0 +1,11 @@
+using TNodeCore.Runtime.RuntimeModels;
+
+namespace TNodeCore.Editor.GraphWatcher{
+    /// <summary>
+    /// Graph watcher is a tool watch the process of a graph.it don't modify the state.
+    /// </summary>
+    public class GraphWatcher{
+        public IRuntimeNodeGraph WatchedGraph;
+
+    }
+}
\ No newline at end of file
diff --git a/TNodeCore/Editor/GraphWatcher/GraphWatcher.cs.meta b/TNodeCore/Editor/GraphWatcher/GraphWatcher.cs.meta
new file mode 100644
index 0000000..4454b4f
--- /dev/null
+++ b/TNodeCore/Editor/GraphWatcher/GraphWatcher.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 43ac53b5c1a049869c57eec0f69abf59
+timeCreated: 1660970756
\ No newline at end of file
diff --git a/TNodeCore/Editor/NodeGraphView/IBaseDataGraphView.cs b/TNodeCore/Editor/NodeGraphView/IBaseDataGraphView.cs
index 1540f7c..814fc2e 100644
--- a/TNodeCore/Editor/NodeGraphView/IBaseDataGraphView.cs
+++ b/TNodeCore/Editor/NodeGraphView/IBaseDataGraphView.cs
@@ -2,6 +2,7 @@
 using TNodeCore.Runtime;
 using TNodeCore.Runtime.Components;
 using TNodeCore.Runtime.Models;
+using TNodeCore.Runtime.RuntimeModels;
 using UnityEngine;
 
 namespace TNodeCore.Editor.NodeGraphView{
@@ -65,7 +66,7 @@ namespace TNodeCore.Editor.NodeGraphView{
         /// Null if it is not a runtime graph
         /// </summary>
         /// <returns></returns>
-        public RuntimeGraph GetRuntimeGraph();
+        public IRuntimeNodeGraph GetRuntimeNodeGraph();
         /// <summary>
         /// Edit a graph data.
         /// </summary>
diff --git a/TNodeCore/Editor/Resources/GraphEditor.uxml b/TNodeCore/Editor/Resources/GraphEditor.uxml
index 0a2e40f..5d3257e 100644
--- a/TNodeCore/Editor/Resources/GraphEditor.uxml
+++ b/TNodeCore/Editor/Resources/GraphEditor.uxml
@@ -1,3 +1,5 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance"
+         engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" 
+         editor-extension-mode="True">
 
 </ui:UXML>
diff --git a/TNodeCore/Runtime/Components/RuntimeGraph.cs b/TNodeCore/Runtime/Components/RuntimeGraph.cs
index bdc50fd..3159915 100644
--- a/TNodeCore/Runtime/Components/RuntimeGraph.cs
+++ b/TNodeCore/Runtime/Components/RuntimeGraph.cs
@@ -175,7 +175,7 @@ namespace TNodeCore.Runtime.Components{
         }
 
         public NodeData CurrentNode(){
-            return _runtimeNodeEnumerator.Current?.NodeData;
+            return CurrentRuntimeNode().NodeData;
         }
 
         public RuntimeNode MoveNext(){
@@ -184,6 +184,9 @@ namespace TNodeCore.Runtime.Components{
         }
 
         public RuntimeNode CurrentRuntimeNode(){
+            if (_runtimeNodeEnumerator.Current == null){
+                _runtimeNodeEnumerator.MoveNext();
+            }
             return _runtimeNodeEnumerator.Current;
         }
 
@@ -283,6 +286,10 @@ namespace TNodeCore.Runtime.Components{
             return null;
         }
 
+        public BlackboardData GetBlackboardData(){
+            return runtimeBlackboardData;
+        }
+
         public List<RuntimeNode> GetRuntimeNodes(){
             return RuntimeNodes.Values.ToList();
         }
diff --git a/TNodeCore/Runtime/Extensions/NodeDataExtensions.cs b/TNodeCore/Runtime/Extensions/NodeDataExtensions.cs
new file mode 100644
index 0000000..a21e1eb
--- /dev/null
+++ b/TNodeCore/Runtime/Extensions/NodeDataExtensions.cs
@@ -0,0 +1,10 @@
+using System.Linq;
+using TNodeCore.Runtime.Models;
+
+namespace TNodeCore.Runtime.Extensions{
+    public static  class NodeDataExtensions{
+        public static  string[] GetDependentNodesId(this RuntimeNode runtimeNode){
+            return runtimeNode.InputLinks.Select(x => x.outPort.nodeDataId).ToArray();
+        }
+    }
+}
\ No newline at end of file
diff --git a/TNodeCore/Runtime/Extensions/NodeDataExtensions.cs.meta b/TNodeCore/Runtime/Extensions/NodeDataExtensions.cs.meta
new file mode 100644
index 0000000..c463c8f
--- /dev/null
+++ b/TNodeCore/Runtime/Extensions/NodeDataExtensions.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 251253baee3d4aa49bc739b8661b637a
+timeCreated: 1660983683
\ No newline at end of file
diff --git a/TNodeCore/Runtime/RuntimeModels/IRuntimeNodeGraph.cs b/TNodeCore/Runtime/RuntimeModels/IRuntimeNodeGraph.cs
index c591c6b..fcce0b4 100644
--- a/TNodeCore/Runtime/RuntimeModels/IRuntimeNodeGraph.cs
+++ b/TNodeCore/Runtime/RuntimeModels/IRuntimeNodeGraph.cs
@@ -6,7 +6,7 @@ namespace TNodeCore.Runtime.RuntimeModels{
     public interface IRuntimeNodeGraph{
         public RuntimeNode GetRuntimeNode(NodeData nodeData);
         public RuntimeNode GetRuntimeNode(string id);
-
+        public BlackboardData GetBlackboardData();
         public List<RuntimeNode> GetRuntimeNodes();
         public Dictionary<string,RuntimeNode> GetRuntimeNodesDictionary();
 
@@ -19,11 +19,10 @@ namespace TNodeCore.Runtime.RuntimeModels{
         /// </summary>
         /// <returns></returns>
         public void ResetState();
-        public NodeData CurrentNode();
 
-        public RuntimeNode MoveNext();
-        public RuntimeNode CurrentRuntimeNode();
-        
-       
+
+        RuntimeNode MoveNext();
+        NodeData CurrentNode();
+        RuntimeNode CurrentRuntimeNode();
     }
 }
\ No newline at end of file
diff --git a/TNodeCore/Runtime/RuntimeModels/StaticGraph.cs b/TNodeCore/Runtime/RuntimeModels/StaticGraph.cs
index a5bac35..e184151 100644
--- a/TNodeCore/Runtime/RuntimeModels/StaticGraph.cs
+++ b/TNodeCore/Runtime/RuntimeModels/StaticGraph.cs
@@ -8,8 +8,10 @@ using TNodeCore.Runtime.Models;
 namespace TNodeCore.Runtime.RuntimeModels{
     public class StaticGraph:IRuntimeNodeGraph{
         private Dictionary<string,RuntimeNode> _nodes;
-        private GraphTool _graphTool;
-        private IEnumerator<RuntimeNode> BreathFirstEnumerator;
+        private IEnumerator<RuntimeNode> _breathFirstEnumerator;
+        
+        private readonly GraphTool _graphTool;
+        private readonly GraphData _originalData;
 
         private void ModifyLinks(NodeLink linkData){
             var outNodeId = linkData.outPort.nodeDataId;
@@ -19,7 +21,10 @@ namespace TNodeCore.Runtime.RuntimeModels{
             var inNode = _nodes[inNodeId];
             inNode.InputLinks.Add(linkData);
         }
-        public StaticGraph(List<NodeData> nodes,List<NodeLink> links){
+        public StaticGraph(GraphData graphData){
+            _originalData = graphData;
+            var nodes = graphData.NodeDictionary.Values.ToList();
+            var links = graphData.NodeLinks;
             _nodes = new Dictionary<string, RuntimeNode>();
     
 
@@ -42,11 +47,11 @@ namespace TNodeCore.Runtime.RuntimeModels{
                 ModifyLinks(link);
             }
             _graphTool = new GraphTool(this);
-            BreathFirstEnumerator = _graphTool.BreathFirstSearch();
+            _breathFirstEnumerator = _graphTool.BreathFirstSearch();
         }
 
         public void ResetState(){
-            BreathFirstEnumerator = _graphTool.BreathFirstSearch();
+            _breathFirstEnumerator = _graphTool.BreathFirstSearch();
         }
 
         public RuntimeNode GetRuntimeNode(NodeData nodeData){
@@ -57,6 +62,10 @@ namespace TNodeCore.Runtime.RuntimeModels{
             return _nodes[id];
         }
 
+        public BlackboardData GetBlackboardData(){
+            return _originalData.blackboardData;
+        }
+
         public List<RuntimeNode> GetRuntimeNodes(){
             return _nodes.Values.ToList();
         }
@@ -83,15 +92,15 @@ namespace TNodeCore.Runtime.RuntimeModels{
         }
 
         public RuntimeNode MoveNext(){
-           BreathFirstEnumerator.MoveNext();
-           return BreathFirstEnumerator.Current;
+           _breathFirstEnumerator.MoveNext();
+           return _breathFirstEnumerator.Current;
         }
 
         public RuntimeNode CurrentRuntimeNode(){
-            if (BreathFirstEnumerator.Current == null){
-                BreathFirstEnumerator.MoveNext();
+            if (_breathFirstEnumerator.Current == null){
+                _breathFirstEnumerator.MoveNext();
             }
-            return BreathFirstEnumerator.Current;
+            return _breathFirstEnumerator.Current;
         }
     }
 
diff --git a/TNodeCore/Runtime/Tools/GraphTool.cs b/TNodeCore/Runtime/Tools/GraphTool.cs
index ba628b0..392a6a5 100644
--- a/TNodeCore/Runtime/Tools/GraphTool.cs
+++ b/TNodeCore/Runtime/Tools/GraphTool.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using TNodeCore.Runtime;
 using TNodeCore.Runtime.Components;
+using TNodeCore.Runtime.Extensions;
 using TNodeCore.Runtime.Models;
 using TNodeCore.Runtime.RuntimeModels;
 using UnityEngine;
@@ -81,23 +82,27 @@ namespace TNode.TNodeCore.Runtime.Tools{
         }
         public IEnumerator<RuntimeNode> BreathFirstSearch(){
             Queue<RuntimeNode> queue = new Queue<RuntimeNode>();
+            HashSet<RuntimeNode> alreadyContained = new HashSet<RuntimeNode>();
+            HashSet<RuntimeNode> visited = new HashSet<RuntimeNode>();
             foreach (var runtimeNode in NonDependencyNode){
                 queue.Enqueue(runtimeNode);
+                alreadyContained.Add(runtimeNode);
             }
             while (queue.Count > 0){
                 var node = queue.Dequeue();
+                visited.Add(node);
                 if (node is ConditionalRuntimeNode conditionalRuntimeNode){
                     var ids = conditionalRuntimeNode.GetConditionalNextIds();
                     
                     var nextNodes =  ids.Select(id=>RuntimeNodes[id]).ToList();
                     
                     foreach (var runtimeNode in nextNodes){
-                        queue.Enqueue(runtimeNode);
+                        AddNodeToQueueIfMeetCondition(alreadyContained, runtimeNode, queue);
                     }
                 }
                 else{
                     foreach (var runtimeNode in node.OutputLinks.Select(link => RuntimeNodes[link.inPort.nodeDataId])){
-                        queue.Enqueue(runtimeNode);
+                        AddNodeToQueueIfMeetCondition(alreadyContained, runtimeNode, queue);
                     }
                     node.OutputLinks.ForEach(HandlingLink);
                 }
@@ -105,9 +110,22 @@ namespace TNode.TNodeCore.Runtime.Tools{
                 yield return node;
             }
         }
-        
-        
 
+        private void AddNodeToQueueIfMeetCondition(HashSet<RuntimeNode> alreadyContained, RuntimeNode runtimeNode, Queue<RuntimeNode> queue){
+            //Check if the node is already contained in the queue
+            if (alreadyContained.Contains(runtimeNode)) return;
+            
+            //Check if the visited node has all previous node of the node
+            var dependentNodes = runtimeNode.GetDependentNodesId().Select(x => RuntimeNodes[x]);
+            var allDependenciesVisited = dependentNodes.Aggregate(true, (a, b) =>
+                alreadyContained.Contains(b) && a
+            );
+            if (allDependenciesVisited == false) return;
+            
+            //If all conditions are met, add the node to the queue
+            queue.Enqueue(runtimeNode);
+            alreadyContained.Add(runtimeNode);
+        }
 
 
         /// <summary>
diff --git a/TNodeGraphViewImpl/Editor/GraphWatcherView.meta b/TNodeGraphViewImpl/Editor/GraphWatcherView.meta
new file mode 100644
index 0000000..6193a33
--- /dev/null
+++ b/TNodeGraphViewImpl/Editor/GraphWatcherView.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4a1dbd79f6d746ee830b851f2934c445
+timeCreated: 1660972144
\ No newline at end of file
diff --git a/TNodeGraphViewImpl/Editor/GraphWatcherView/GraphWatcherView.cs b/TNodeGraphViewImpl/Editor/GraphWatcherView/GraphWatcherView.cs
new file mode 100644
index 0000000..11812ea
--- /dev/null
+++ b/TNodeGraphViewImpl/Editor/GraphWatcherView/GraphWatcherView.cs
@@ -0,0 +1,58 @@
+using System.Linq;
+using TNodeCore.Editor.NodeGraphView;
+using TNodeGraphViewImpl.Editor.NodeGraphView;
+using TNodeGraphViewImpl.Editor.NodeViews;
+using UnityEditor.Experimental.GraphView;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace TNodeGraphViewImpl.Editor.GraphWatcherView{
+    public class GraphWatcherView:SimpleGraphSubWindow{
+        private Node _highlightedNode;
+
+        public GraphWatcherView() : base(Resources.Load<VisualTreeAsset>("GraphWatcher")){
+            styleSheets.Add(Resources.Load<StyleSheet>("GraphWatcherStyle"));
+            var button = this.Q<Button>("Next");
+            var button2 = this.Q<Button>("Reset");
+            var label = this.Q<Label>();
+            button.clicked += () => {
+                var graphView = GetFirstAncestorOfType<IBaseDataGraphView>();
+                var runtimeNodeGraph = graphView.GetRuntimeNodeGraph();
+                runtimeNodeGraph.MoveNext();
+                label.text = runtimeNodeGraph.CurrentNode().id;
+                if (graphView is GraphView gv){
+                    if (_highlightedNode != null){
+                        _highlightedNode.RemoveFromClassList("highlightNode");
+                        _highlightedNode.style.borderBottomWidth = _highlightedNode.style.borderLeftWidth =
+                            _highlightedNode.style.borderRightWidth = _highlightedNode.style.borderTopWidth = 0;
+                    }
+                    var baseNodeViews = gv.nodes.ToList().Select(x=>(IBaseNodeView)x);
+                    var node = baseNodeViews.First(x=>x.GetNodeData().id==runtimeNodeGraph.CurrentNode().id);
+                    Debug.Log(node.GetNodeData().id);
+                    var nodeView = (Node)node;
+                    _highlightedNode = nodeView;
+                    _highlightedNode.AddToClassList("highlightNode");
+                    _highlightedNode.style.borderBottomWidth 
+                        = _highlightedNode.style.borderLeftWidth
+                            = _highlightedNode.style.borderRightWidth 
+                                = _highlightedNode.style.borderTopWidth = 2;
+                }
+            };
+
+            button2.clicked += () => {
+                var graphView = GetFirstAncestorOfType<IBaseDataGraphView>();
+                var runtimeNodeGraph = graphView.GetRuntimeNodeGraph();
+                label.text = runtimeNodeGraph.CurrentNode().id;
+                if (graphView is GraphView gv){
+                    if (_highlightedNode != null){
+                        _highlightedNode.RemoveFromClassList("highlightNode");
+                        _highlightedNode.style.borderBottomWidth = _highlightedNode.style.borderLeftWidth =
+                            _highlightedNode.style.borderRightWidth = _highlightedNode.style.borderTopWidth = 0;
+                    }
+                    runtimeNodeGraph.ResetState();
+                }
+            };
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/TNodeGraphViewImpl/Editor/GraphWatcherView/GraphWatcherView.cs.meta b/TNodeGraphViewImpl/Editor/GraphWatcherView/GraphWatcherView.cs.meta
new file mode 100644
index 0000000..4ed4031
--- /dev/null
+++ b/TNodeGraphViewImpl/Editor/GraphWatcherView/GraphWatcherView.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 66a72db7130f42e08e54ca06a5017bbf
+timeCreated: 1660972154
\ No newline at end of file
diff --git a/TNodeGraphViewImpl/Editor/Inspector/NodeInspectorInNode.cs b/TNodeGraphViewImpl/Editor/Inspector/NodeInspectorInNode.cs
index 026b707..4d70cbb 100644
--- a/TNodeGraphViewImpl/Editor/Inspector/NodeInspectorInNode.cs
+++ b/TNodeGraphViewImpl/Editor/Inspector/NodeInspectorInNode.cs
@@ -2,6 +2,7 @@
 using TNodeCore.Editor.NodeGraphView;
 using TNodeCore.Editor.Serialization;
 using TNodeCore.Runtime.Attributes;
+using TNodeCore.Runtime.Components;
 using TNodeCore.Runtime.Models;
 using UnityEditor;
 using UnityEditor.UIElements;
@@ -66,34 +67,6 @@ namespace TNodeGraphViewImpl.Editor.Inspector{
                 drawer.Bind(serializedObject);
                 Add(drawer);
             }
-
-            var globalTest = GetFirstAncestorOfType<IBaseDataGraphView>()?.AutoUpdate;
-            if(globalTest??false){
-                CreateTestButton();
-            }
-            else if (_data.isTest){
-                //Add a test button for the node
-                CreateTestButton();
-            }
-        }
-
-        private void CreateTestButton(){
-            var testButton = new Button(() => {
-                var test = GetFirstAncestorOfType<IBaseDataGraphView>();
-                if (test != null){
-                    if(!test.IsRuntimeGraph) return;
-                    var runtimeGraph = test.GetRuntimeGraph();
-                    if (runtimeGraph != null){
-                       var res = runtimeGraph.RunOnDependency(_data);
-                    }
-                    _data.OnTest();
-                }
-            }){
-                text = "Test"
-            };
-
-            Add(testButton);
-     
         }
     }
 }
\ No newline at end of file
diff --git a/TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs b/TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs
index d6e4413..90d2fe4 100644
--- a/TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs
+++ b/TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs
@@ -15,6 +15,7 @@ using TNodeCore.Editor.Tools.NodeCreator;
 using TNodeCore.Runtime.Components;
 using TNodeCore.Runtime.Models;
 using TNodeCore.Runtime.RuntimeCache;
+using TNodeCore.Runtime.RuntimeModels;
 using TNodeGraphViewImpl.Editor.Cache;
 using TNodeGraphViewImpl.Editor.GraphBlackboard;
 using TNodeGraphViewImpl.Editor.Inspector;
@@ -35,15 +36,16 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
         #endregion
         #region variables and properties
         private T _data;
-        private RuntimeGraph _runtimeGraph;
+        private bool _loaded;
         private bool _isInspectorOn;
+        private IRuntimeNodeGraph _runtimeNodeGraph;
         private NodeSearchWindowProvider _nodeSearchWindowProvider;
         private NodeInspector _nodeInspector;
         private Dictionary<string,Node> _nodeDict = new Dictionary<string,Node>();
         private IBlackboardView _blackboard;
-        private bool _loaded;
         private GraphViewModel _graphViewModel;
         private List<Comment> _comments;
+        private GraphWatcherView.GraphWatcherView _graphWatcher;
 
         public T Data{
             get{ return _data; }
@@ -70,6 +72,7 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
         #region construct default behaviour
         public BaseDataGraphView(){
             styleSheets.Add(Resources.Load<StyleSheet>("GraphViewBackground"));
+            styleSheets.Add(Resources.Load<StyleSheet>("NodeViewHighlight"));
             var grid = new GridBackground();
             Insert(0,grid);
             grid.StretchToParentSize();
@@ -85,13 +88,13 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
         /// <summary>
         /// Probably reusable in later GTFs version
         /// </summary>
-        private void WaitingForAGraph(){
+        private void WaitingForAGraphDragOnView(){
             VisualElement visualElement = new VisualElement();
             //Set background color to white
             visualElement.style.backgroundColor = new StyleColor(new Color(0.1f, 0.1f, 0.1f, 1));
             
             visualElement.StretchToParentSize();
-            visualElement.name = "WaitingForAGraph";
+            visualElement.name = "WaitingForAGraphDragOnView";
             Add(visualElement);
             visualElement.BringToFront();
         
@@ -110,19 +113,18 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
                     if (obj is T graphData){
                         IsRuntimeGraph = false;
                         Data = graphData;
+                        _runtimeNodeGraph = new StaticGraph(Data);
                     }
                     else{
-                        if (obj is GameObject gameObject){
-                            if (gameObject.GetComponent<RuntimeGraph>() != null){
-                                if (gameObject.GetComponent<RuntimeGraph>().graphData != null){
-                                    _runtimeGraph = gameObject.GetComponent<RuntimeGraph>();
-                                    IsRuntimeGraph = true;
-                                    BuildRuntimeGraphBehaviour();
-                                    Data = gameObject.GetComponent<RuntimeGraph>().graphData as T;
-                                    if(Data==null){
-                                        Debug.LogError($"Dragged a wrong graph model to editor,expected {typeof(T)} but got {gameObject.GetComponent<RuntimeGraph>().graphData.GetType()}");
-                                    }
-                                }
+                        if (obj is GameObject gameObject 
+                            && gameObject.GetComponent<RuntimeGraph>() != null
+                            && gameObject.GetComponent<RuntimeGraph>().graphData != null){
+                            _runtimeNodeGraph = gameObject.GetComponent<RuntimeGraph>();
+                            IsRuntimeGraph = true;
+                            BuildRuntimeGraphBehaviour();
+                            Data = gameObject.GetComponent<RuntimeGraph>().graphData as T;
+                            if(Data==null){
+                                Debug.LogError($"Dragged a wrong graph model to editor,expected {typeof(T)} but got {gameObject.GetComponent<RuntimeGraph>().graphData.GetType()}");
                             }
                         }
                     }
@@ -164,9 +166,9 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
             
             while (_loaded){
                 await Task.Delay(TimeSpan.FromSeconds(RefreshRate));
-                if(_runtimeGraph != null){
-                    if (AutoUpdate){
-                        _runtimeGraph.TraverseAll();
+                if(_runtimeNodeGraph != null){
+                    if (AutoUpdate && _runtimeNodeGraph is RuntimeGraph runtimeGraph){
+                        runtimeGraph.TraverseAll();
                         AfterGraphResolved?.Invoke();
                     }
                 }
@@ -175,25 +177,27 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
  
         private void CheckDataAfterInit(){
             if(Data == null){
-                WaitingForAGraph();
+                WaitingForAGraphDragOnView();
             }
         }
 
-        private void ConstructDefaultBehaviour(){
+        private void ConstructView(){
             //Register a right click context menu
-            ConstructViewContextualMenu();
+            ConstructContextMenu();
         }
 
-        public void ConstructViewContextualMenu(){
+        public void ConstructContextMenu(){
             RegisterCallback<ContextualMenuPopulateEvent>(evt => {
                 Vector2 editorPosition = Owner==null?Vector2.zero:Owner.position.position;
                 //Remove all the previous menu items
                 evt.menu.MenuItems().Clear();
                 evt.menu.AppendAction("CreateProp Node", dma => {
                     var dmaPos = dma.eventInfo.mousePosition+editorPosition;
-                    SearchWindowContext searchWindowContext = new SearchWindowContext(dmaPos,200,200);
                     var searchWindow = ScriptableObject.CreateInstance<NodeSearchWindowProvider>();
                     var targetPos = this.viewTransform.matrix.inverse.MultiplyPoint(dma.eventInfo.localMousePosition);
+                    
+                    SearchWindowContext searchWindowContext = new SearchWindowContext(dmaPos,200,200);
+
                     searchWindow.Setup(typeof(T),this,Owner,targetPos);
              
                     Debug.Log(targetPos);
@@ -201,10 +205,10 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
                 });
                 evt.menu.AppendAction("CreateProp PlacematModel",dma=> {
                     //find placemat container 
-                    var placematContainer = GetPlacematContainer();
+                    var container = GetPlacematContainer();
                     var targetPos = this.viewTransform.matrix.inverse.MultiplyPoint(dma.eventInfo.localMousePosition);
                     var dmaPosRect = new Rect(targetPos,new Vector2(500,500));
-                    var placemat = placematContainer.CreatePlacemat<PlacematView>(dmaPosRect,1,"Title");
+                    var placemat = container.CreatePlacemat<PlacematView>(dmaPosRect,1,"Title");
                     var placematData = new PlacematModel{
                         title = "Title",
                         positionInView = dmaPosRect
@@ -213,7 +217,7 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
                     AddPlacemat(placematData);
 
                 });
-                if (this.selection.Any()){
+                if (selection.Any()){
                     evt.menu.AppendAction("Comment", dma => {
                         BuildCommentForSelected();
                     });
@@ -229,9 +233,7 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
             var selection  = this.selection.OfType<IBaseNodeView>().ToList();
             foreach (var baseNodeView in selection){
                 var comment = new CommentView();
-                comment.Bind(new Comment(){
-                    
-                });
+                comment.Bind(new Comment());
                 ((GraphElement)baseNodeView).Add(comment);
                 comment.Data.CommentedModel = baseNodeView.GetNodeData();
                 this._data.EditorModels.Add(comment.Data);
@@ -257,17 +259,19 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
         }
 
         private void OnInit(){
-            ConstructDefaultBehaviour();
+            ConstructView();
             
             CheckDataAfterInit();
             
             OnGraphViewCreate();
 
             BuildUndo();
+            
+            SetDetachedFromPanel();
 
             _loaded = true;
 
-            SetDetachedFromPanel();
+            
             
         }
 
@@ -290,10 +294,12 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
         }
         
         protected void CreateMenu(){
+            
             if (this.Q("TopMenu") != null) return;
             var visualElement = new VisualElement{
                 name = "TopMenu"
             };
+            visualElement.Clear();
             visualElement.style.position = Position.Absolute;
             visualElement.style.top = 0;
             visualElement.style.backgroundColor = new StyleColor(new Color(0.1f, 0.1f, 0.1f, 1));
@@ -323,9 +329,9 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
             };
             runButton.RegisterCallback<ClickEvent>(evt => {
          
-                if (IsRuntimeGraph){
+                if (IsRuntimeGraph && _runtimeNodeGraph is RuntimeGraph runtimeGraph){
                 
-                    _runtimeGraph.TraverseAll();
+                    runtimeGraph.TraverseAll();
                     AfterGraphResolved?.Invoke();
                 }
             });
@@ -340,8 +346,25 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
                     CreateBlackboard();
             });
             visualElement.Add(blackboardButton);
+            
+            //Add a button to toggle the GraphWatcher
+            var graphWatcherButton = new Button{
+                name = "graphWatcherButton",
+                text = "Graph Watcher"
+            };
+            graphWatcherButton.RegisterCallback<ClickEvent>(evt => {
+                if(_graphWatcher==null)
+                    CreateGraphWatcher();
+            });
+            
+            visualElement.Add(graphWatcherButton);
         }
-        
+
+        private void CreateGraphWatcher(){
+            _graphWatcher = new GraphWatcherView.GraphWatcherView();
+            this.AddElement(_graphWatcher);
+        }
+
         public void RegisterDragEvent(){
             RegisterCallback<DragUpdatedEvent>(OnDragUpdated);
             RegisterCallback<DragPerformEvent>(OnDragPerform);
@@ -440,7 +463,7 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
                     }
                     else{
             
-                        var node = _runtimeGraph.GetRuntimeNode(runtimeNodeData.id).NodeData as SceneNode;
+                        var node = _runtimeNodeGraph.GetRuntimeNode(runtimeNodeData.id).NodeData as SceneNode;
                         AddPersistentNode(node);
                     }
                 }
@@ -480,6 +503,10 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
                     node.Add(res);
                 }
             }
+
+            if (IsRuntimeGraph == false){
+                _runtimeNodeGraph = new StaticGraph(_data);
+            }
             _nodeDict.Clear();
         }
 
@@ -656,7 +683,6 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
             }
             else{
                 var inputPorts = ports.ToList().Where(x => x.direction == Direction.Input).ToList();
-                
                 foreach (var inputPort in inputPorts){
                     //check if start port could implicitly convert to input port type
                     if (HasImplicitConversion(startPort.portType,inputPort.portType)){
@@ -669,11 +695,6 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
                 }
             }
             
-            
-   
-            
-            
-            
             return compatiblePorts;
 
 
@@ -803,15 +824,15 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
 
         public BlackboardData GetBlackboardData(){
             if (IsRuntimeGraph){
-                return _runtimeGraph.runtimeBlackboardData;
+                return _runtimeNodeGraph.GetBlackboardData();
             }
             return _data.blackboardData;
         }
 
         public bool IsRuntimeGraph{ get; set; }
 
-        public RuntimeGraph GetRuntimeGraph(){
-            return _runtimeGraph;
+        public IRuntimeNodeGraph GetRuntimeNodeGraph(){
+            return _runtimeNodeGraph;
         }
 
         public void SetGraphData(GraphData graph){
diff --git a/TNodeGraphViewImpl/Editor/NodeGraphView/SimpleGraphSubWindow.cs b/TNodeGraphViewImpl/Editor/NodeGraphView/SimpleGraphSubWindow.cs
index c6ec020..0dc791e 100644
--- a/TNodeGraphViewImpl/Editor/NodeGraphView/SimpleGraphSubWindow.cs
+++ b/TNodeGraphViewImpl/Editor/NodeGraphView/SimpleGraphSubWindow.cs
@@ -32,12 +32,6 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{
             ConstructWindowBasicSetting();
             BuildWindow(visualTreeAsset);
         }
-
-        public string GetPersistenceId(){
-            throw new System.NotImplementedException();
-        }
-
-
     }
 
 
diff --git a/TNodeGraphViewImpl/Editor/Resources/GraphWatcher.uxml b/TNodeGraphViewImpl/Editor/Resources/GraphWatcher.uxml
new file mode 100644
index 0000000..d0d42d0
--- /dev/null
+++ b/TNodeGraphViewImpl/Editor/Resources/GraphWatcher.uxml
@@ -0,0 +1,21 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" 
+         xmlns:uie="UnityEditor.UIElements" 
+         xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         engine="UnityEngine.UIElements" 
+         editor="UnityEditor.UIElements" 
+         noNamespaceSchemaLocation="../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+    <ui:VisualElement name="GraphWatcher" style="height: 300px; width: 300px; background-color: rgb(65, 65, 65);">
+        <ui:VisualElement name="GraphOptions" >
+        <ui:Button name="Next" text="Next">
+            
+        </ui:Button>
+        <ui:Button name="Reset" text="Reset">
+
+        </ui:Button>
+        </ui:VisualElement>
+        <ui:Label name="CurrentNode">
+
+        </ui:Label>
+    </ui:VisualElement>
+    
+</ui:UXML>
\ No newline at end of file
diff --git a/TNodeGraphViewImpl/Editor/Resources/GraphWatcher.uxml.meta b/TNodeGraphViewImpl/Editor/Resources/GraphWatcher.uxml.meta
new file mode 100644
index 0000000..48265e4
--- /dev/null
+++ b/TNodeGraphViewImpl/Editor/Resources/GraphWatcher.uxml.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 208b885f8b1f43b790dd400dd9ee32bb
+timeCreated: 1660972278
\ No newline at end of file
diff --git a/TNodeGraphViewImpl/Editor/Resources/GraphWatcherStyle.uss b/TNodeGraphViewImpl/Editor/Resources/GraphWatcherStyle.uss
new file mode 100644
index 0000000..1005a3e
--- /dev/null
+++ b/TNodeGraphViewImpl/Editor/Resources/GraphWatcherStyle.uss
@@ -0,0 +1,3 @@
+#GraphOptions{
+    flex-direction: row;
+}
\ No newline at end of file
diff --git a/TNodeGraphViewImpl/Editor/Resources/GraphWatcherStyle.uss.meta b/TNodeGraphViewImpl/Editor/Resources/GraphWatcherStyle.uss.meta
new file mode 100644
index 0000000..a8ccb1b
--- /dev/null
+++ b/TNodeGraphViewImpl/Editor/Resources/GraphWatcherStyle.uss.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 26717cfb931940c9ae019876e9ba1293
+timeCreated: 1660980852
\ No newline at end of file
diff --git a/TNodeGraphViewImpl/Editor/Resources/NodeViewHighlight.uss b/TNodeGraphViewImpl/Editor/Resources/NodeViewHighlight.uss
new file mode 100644
index 0000000..b3e8b15
--- /dev/null
+++ b/TNodeGraphViewImpl/Editor/Resources/NodeViewHighlight.uss
@@ -0,0 +1,4 @@
+.highlightNode{
+    border-color: lightseagreen;
+    border-width: 2;
+}
\ No newline at end of file
diff --git a/TNodeGraphViewImpl/Editor/Resources/NodeViewHighlight.uss.meta b/TNodeGraphViewImpl/Editor/Resources/NodeViewHighlight.uss.meta
new file mode 100644
index 0000000..46f1af2
--- /dev/null
+++ b/TNodeGraphViewImpl/Editor/Resources/NodeViewHighlight.uss.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 289aee0d98d04cf5851bf92411e326e1
+timeCreated: 1660975039
\ No newline at end of file
diff --git a/Tests.meta b/Tests.meta
new file mode 100644
index 0000000..f937873
--- /dev/null
+++ b/Tests.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 61d88b1f3fc14972aa28c22a5afaa53e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/NodePortTest.cs b/Tests/NodePortTest.cs
new file mode 100644
index 0000000..e5bdd7e
--- /dev/null
+++ b/Tests/NodePortTest.cs
@@ -0,0 +1,59 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using TNodeCore.Editor.Tools.NodeCreator;
+using TNodeCore.Runtime;
+using TNodeCore.Runtime.Attributes;
+using TNodeCore.Runtime.Attributes.Ports;
+using TNodeCore.Runtime.Models;
+using TNodeGraphViewImpl.Editor.NodeGraphView;
+using UnityEngine;
+using UnityEngine.TestTools;
+
+namespace Tests{
+    public class NodePortTest
+    {
+        internal class GraphDataForTest:GraphData{
+            
+        }
+        [GraphUsage(typeof(GraphDataForTest))]
+        internal class PortNameNodeData:NodeData{
+            [Input(Group = true)]
+            public List<string> Inputs{
+                get => _inputs;
+                set => _inputs = value;
+            }
+
+            private List<string> _inputs = new List<string>{"Input1", "Input2"};
+        }
+        [Test]
+        public void TestWithPortName(){
+            var graphView = new BaseDataGraphView<GraphData>();
+            var node = NodeCreator.InstantiateNodeData<PortNameNodeData>();
+            graphView.AddTNode(node,new Rect());
+            Assert.AreEqual(graphView.nodes.ToList().Count, 1);
+            Assert.AreEqual(graphView.ports.ToList().Count, 2);
+            Debug.Log(graphView.ports.ToList().Aggregate("",(total,port)=> total + port.name));
+        }
+
+        [Test]
+        public void TestWithRuntimeNodeAccessPort(){
+            var node = NodeCreator.InstantiateNodeData<PortNameNodeData>();
+            RuntimeNode runtimeNode = new RuntimeNode(node);
+            runtimeNode.SetInput("Inputs:0", "Hello");
+            Assert.AreEqual("Hello",node.Inputs[0]);
+        }
+
+
+        // A UnityTest behaves like a coroutine in Play Mode. In Edit Mode you can use
+        // `yield return null;` to skip a frame.
+        [UnityTest]
+        public IEnumerator NodeViewTestWithEnumeratorPasses()
+        {
+            // Use the Assert class to test conditions.
+            // Use yield to skip a frame.
+            yield return null;
+        }
+    }
+}
diff --git a/Tests/NodePortTest.cs.meta b/Tests/NodePortTest.cs.meta
new file mode 100644
index 0000000..a5512e1
--- /dev/null
+++ b/Tests/NodePortTest.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6acca7b72bb21204d8eaa67ccd45bf4a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/StaticGraphTest.cs b/Tests/StaticGraphTest.cs
index c56c808..e498dab 100644
--- a/Tests/StaticGraphTest.cs
+++ b/Tests/StaticGraphTest.cs
@@ -38,7 +38,7 @@ namespace Tests{
             graphData.NodeDictionary.Add(node.id,node);
             Assert.AreEqual(1,graphData.NodeDictionary.Count);
             
-            var staticGraph = new StaticGraph(graphData.NodeDictionary.Values.ToList(),graphData.NodeLinks);
+            var staticGraph = new StaticGraph(graphData);
             Assert.NotNull(staticGraph);
             Assert.AreEqual(1,staticGraph.GetRuntimeNodes().Count);
         }
@@ -50,7 +50,7 @@ namespace Tests{
             graphData.NodeDictionary.Add(node.id,node);
           
             
-            var staticGraph = new StaticGraph(graphData.NodeDictionary.Values.ToList(),graphData.NodeLinks);
+            var staticGraph = new StaticGraph(graphData);
 
             
             Assert.AreEqual(staticGraph.GetRuntimeNodes().First(),staticGraph.CurrentRuntimeNode());
@@ -97,7 +97,7 @@ namespace Tests{
             
 
 
-            var staticGraph = new StaticGraph(graphData.NodeDictionary.Values.ToList(),graphData.NodeLinks);
+            var staticGraph = new StaticGraph(graphData);
             
             Assert.AreEqual(node1,staticGraph.CurrentNode());
             staticGraph.MoveNext();
@@ -157,7 +157,7 @@ namespace Tests{
 
             node3.TestCondition = true;
             
-            var staticGraph = new StaticGraph(graphData.NodeDictionary.Values.ToList(),graphData.NodeLinks);
+            var staticGraph = new StaticGraph(graphData);
             Assert.AreEqual(node1,staticGraph.CurrentNode());
             staticGraph.MoveNext();
             Assert.AreEqual(node4,staticGraph.CurrentNode());
@@ -172,7 +172,7 @@ namespace Tests{
             
             node3.TestCondition = false;
             
-            var staticGraph2 = new StaticGraph(graphData.NodeDictionary.Values.ToList(),graphData.NodeLinks);
+            var staticGraph2 = new StaticGraph(graphData);
             Assert.AreEqual(node1,staticGraph2.CurrentNode());
             staticGraph2.MoveNext();
             Assert.AreEqual(node4,staticGraph2.CurrentNode());
diff --git a/Tests/Tests.asmdef b/Tests/Tests.asmdef
new file mode 100644
index 0000000..55302b4
--- /dev/null
+++ b/Tests/Tests.asmdef
@@ -0,0 +1,26 @@
+{
+    "name": "Tests",
+    "rootNamespace": "",
+    "references": [
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner",
+        "TNodeGraphViewImpl",
+        "Taoria.TNodeCore.Runtime",
+        "Taoria.TNodeCore.Editor"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "nunit.framework.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [
+        "UNITY_INCLUDE_TESTS"
+    ],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/Tests/Tests.asmdef.meta b/Tests/Tests.asmdef.meta
new file mode 100644
index 0000000..3a70b8e
--- /dev/null
+++ b/Tests/Tests.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8a8ac2349fdacb047b9081e8a9e533f9
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: