Update BaseTree_Test : While Fix

Dumble009 · Jul 19, 2020 · a0189ad · a0189ad
1 parent 97941a2
commit a0189ad
Show file tree

Hide file tree

Showing 13 changed files with 167 additions and 506 deletions.
diff --git a/BaseTreeGraph/BaseTree.asset b/BaseTreeGraph/BaseTree.asset
@@ -1206,6 +1206,54 @@ MonoBehaviour:
   nodeName: setParameterInt1
   isInherited: 0
   defaultValue: 0
+--- !u!114 &-7936917054130338714
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 28d8043bc7dda5e45b2b731386ce8267, type: 3}
+  m_Name: Set Parameter
+  m_EditorClassIdentifier: 
+  graph: {fileID: 11400000}
+  position: {x: 2824, y: 1960}
+  ports:
+    keys:
+    - input
+    - output
+    values:
+    - _fieldName: input
+      _node: {fileID: -7936917054130338714}
+      _typeQualifiedName: System.String, mscorlib, Version=4.0.0.0, Culture=neutral,
+        PublicKeyToken=b77a5c561934e089
+      connections:
+      - fieldName: output
+        node: {fileID: 2269840328548040439}
+        reroutePoints: []
+      _direction: 0
+      _connectionType: 0
+      _typeConstraint: 0
+      _dynamic: 0
+    - _fieldName: output
+      _node: {fileID: -7936917054130338714}
+      _typeQualifiedName: System.String, mscorlib, Version=4.0.0.0, Culture=neutral,
+        PublicKeyToken=b77a5c561934e089
+      connections:
+      - fieldName: input
+        node: {fileID: -5532124105605350900}
+        reroutePoints: []
+      _direction: 1
+      _connectionType: 1
+      _typeConstraint: 0
+      _dynamic: 0
+  nodeName: 
+  input: 
+  output: 
+  parameterName: case4
+  value: true
 --- !u!114 &-7846854536229318980
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3053,7 +3101,7 @@ MonoBehaviour:
         PublicKeyToken=b77a5c561934e089
       connections:
       - fieldName: output
-        node: {fileID: 2269840328548040439}
+        node: {fileID: -7936917054130338714}
         reroutePoints: []
       _direction: 0
       _connectionType: 0
@@ -4361,7 +4409,7 @@ MonoBehaviour:
         PublicKeyToken=b77a5c561934e089
       connections:
       - fieldName: output
-        node: {fileID: -2845028421067366818}
+        node: {fileID: 1172496307923025923}
         reroutePoints: []
       _direction: 0
       _connectionType: 0
@@ -5020,7 +5068,7 @@ MonoBehaviour:
         PublicKeyToken=b77a5c561934e089
       connections:
       - fieldName: input
-        node: {fileID: -3621715164021348294}
+        node: {fileID: 1172496307923025923}
         reroutePoints: []
       _direction: 1
       _connectionType: 1
@@ -8051,6 +8099,8 @@ MonoBehaviour:
   - {fileID: -8847406172416887088}
   - {fileID: 2269840328548040439}
   - {fileID: 2754617040056551374}
+  - {fileID: 1172496307923025923}
+  - {fileID: -7936917054130338714}
 --- !u!114 &7310885914860216
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -9330,6 +9380,54 @@ MonoBehaviour:
   input: 
   output: 
   targetNodeName: timerTestEx1
+--- !u!114 &1172496307923025923
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 28d8043bc7dda5e45b2b731386ce8267, type: 3}
+  m_Name: Set Parameter
+  m_EditorClassIdentifier: 
+  graph: {fileID: 11400000}
+  position: {x: 648, y: 1960}
+  ports:
+    keys:
+    - input
+    - output
+    values:
+    - _fieldName: input
+      _node: {fileID: 1172496307923025923}
+      _typeQualifiedName: System.String, mscorlib, Version=4.0.0.0, Culture=neutral,
+        PublicKeyToken=b77a5c561934e089
+      connections:
+      - fieldName: output
+        node: {fileID: -2845028421067366818}
+        reroutePoints: []
+      _direction: 0
+      _connectionType: 0
+      _typeConstraint: 0
+      _dynamic: 0
+    - _fieldName: output
+      _node: {fileID: 1172496307923025923}
+      _typeQualifiedName: System.String, mscorlib, Version=4.0.0.0, Culture=neutral,
+        PublicKeyToken=b77a5c561934e089
+      connections:
+      - fieldName: input
+        node: {fileID: -3621715164021348294}
+        reroutePoints: []
+      _direction: 1
+      _connectionType: 1
+      _typeConstraint: 0
+      _dynamic: 0
+  nodeName: 
+  input: 
+  output: 
+  parameterName: case4
+  value: false
 --- !u!114 &1181289638074368072
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -10233,7 +10331,7 @@ MonoBehaviour:
         PublicKeyToken=b77a5c561934e089
       connections:
       - fieldName: input
-        node: {fileID: -5532124105605350900}
+        node: {fileID: -7936917054130338714}
         reroutePoints: []
       _direction: 1
       _connectionType: 1

diff --git a/Script/BehaviourTree/BehaviourTree.cs b/Script/BehaviourTree/BehaviourTree.cs
@@ -1,5 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
+
 namespace BT
 {
 	public class BehaviourTree

diff --git a/TestCodeEditor/TestCodeCompiler.cs → ...haviourTree/Compilers/TestCodeCompiler.cs b/TestCodeEditor/TestCodeCompiler.cs → ...haviourTree/Compilers/TestCodeCompiler.cs
diff --git a/TestCodeEditor/TestCodeCompiler.cs.meta → ...urTree/Compilers/TestCodeCompiler.cs.meta b/TestCodeEditor/TestCodeCompiler.cs.meta → ...urTree/Compilers/TestCodeCompiler.cs.meta
diff --git a/Test/Editor/BaseTree_Test.cs b/Test/Editor/BaseTree_Test.cs
@@ -26,6 +26,7 @@ public class BaseTree_Test
 public bool case11 = false;[UnityEngine.SerializeField]
 public bool setParameterBool1 = false;[UnityEngine.SerializeField]
 public bool setParameterBool2 = true;[UnityEngine.SerializeField]
+public bool while_bool2 = false;[UnityEngine.SerializeField]
 public UnityEngine.Events.UnityEvent first_ev = new UnityEngine.Events.UnityEvent();
 [UnityEngine.SerializeField]
 public UnityEngine.Events.UnityEvent itr_ev = new UnityEngine.Events.UnityEvent();
@@ -86,6 +87,8 @@ public class BaseTree_Test
 [UnityEngine.SerializeField]
 public UnityEngine.Events.UnityEvent setParameterEv7 = new UnityEngine.Events.UnityEvent();
 [UnityEngine.SerializeField]
+public UnityEngine.Events.UnityEvent while_ev3 = new UnityEngine.Events.UnityEvent();
+[UnityEngine.SerializeField]
 public float if_float1 = 100.5f;[UnityEngine.SerializeField]
 public float setParameterFloat1 = 0f;[UnityEngine.SerializeField]
 public float setParameterFloat2 = 0f;[UnityEngine.SerializeField]
@@ -111,6 +114,7 @@ void InitParameters()
 case11 =  false;
 setParameterBool1 =  false;
 setParameterBool2 =  true;
+while_bool2 =  false;
 if_float1 =  100.5f;
 setParameterFloat1 =  0f;
 setParameterFloat2 =  0f;
@@ -207,6 +211,8 @@ public void Init()
 BT_Execute SetFloat2 = new BT_Execute();
 BT_If setParameterIf7 = new BT_If();
 BT_Execute setParameterEx7 = new BT_Execute();
+BT_While while2 = new BT_While();
+BT_Execute whileEx3 = new BT_Execute();
 firstEx.AddEvent(()=>{
 	first_ev.Invoke();
 });
@@ -247,6 +253,13 @@ public void Init()
 ifEx3.AddEvent(()=>{
 	if_ev3.Invoke();
 });
+while2.SetCondition(()=>{
+	return while_bool2;
+});
+while2.AddChild(whileEx3);
+whileEx3.AddEvent(()=>{
+	while_ev3.Invoke();
+});
 while1.SetCondition(()=>{
 	return while_bool1;
 });
@@ -263,6 +276,7 @@ public void Init()
 whileEx2.AddEvent(()=>{
 	while_ev2.Invoke();
 });
+whileEx2.AddChild(while2);
 selectorIf1.SetCondition(()=>{
 	return selector_bool1;
 });
@@ -275,13 +289,13 @@ public void Init()
 });
 behaviourTree.AddInterrupt(SelectorTest);
 SelectorTest.AddChild(selector1);
+selectorEx2.AddEvent(()=>{
+	selector_ev2.Invoke();
+});
 
 selector1.AddChild(selectorIf1);
 selector1.AddChild(selectorEx2);
 selector1.AddChild(selectorEx3);
-selectorEx2.AddEvent(()=>{
-	selector_ev2.Invoke();
-});
 selectorEx3.AddEvent(()=>{
 	selector_ev3.Invoke();
 });
@@ -597,6 +611,9 @@ public void Init()
 });calledFlag.Add("setParameterEx7", false);
 setParameterEv7.AddListener(()=>{
 	calledFlag["setParameterEx7"] = true;
+});calledFlag.Add("whileEx3", false);
+while_ev3.AddListener(()=>{
+	calledFlag["whileEx3"] = true;
 });
 }
 
@@ -661,12 +678,55 @@ public void WhileTest()
 }
 Assert.AreEqual(true, calledFlag["whileEx1"]);
 Assert.AreEqual(false, calledFlag["whileEx2"]);
+Assert.AreEqual(false, calledFlag["whileEx3"]);
 ResetCalledFlag();
 while_bool1 = true;
 for(int __i__ = 0; __i__ < 1; __i__++){
 	behaviourTree.Tick();
 }
 Assert.AreEqual(true, calledFlag["whileEx1"]);
+Assert.AreEqual(true, calledFlag["whileEx2"]);
+Assert.AreEqual(false, calledFlag["whileEx3"]);
+ResetCalledFlag();
+while_bool2 = true;
+case4 = false;
+for(int __i__ = 0; __i__ < 1; __i__++){
+	behaviourTree.Tick();
+}
+Assert.AreEqual(false, calledFlag["whileEx1"]);
+Assert.AreEqual(true, calledFlag["whileEx2"]);
+Assert.AreEqual(true, calledFlag["whileEx3"]);
+ResetCalledFlag();
+for(int __i__ = 0; __i__ < 1; __i__++){
+	behaviourTree.Tick();
+}
+Assert.AreEqual(false, calledFlag["whileEx1"]);
+Assert.AreEqual(false, calledFlag["whileEx2"]);
+Assert.AreEqual(true, calledFlag["whileEx3"]);
+ResetCalledFlag();
+while_bool2 = false;
+for(int __i__ = 0; __i__ < 1; __i__++){
+	behaviourTree.Tick();
+}
+Assert.AreEqual(false, calledFlag["whileEx1"]);
+Assert.AreEqual(true, calledFlag["whileEx2"]);
+Assert.AreEqual(false, calledFlag["whileEx3"]);
+ResetCalledFlag();
+for(int __i__ = 0; __i__ < 1; __i__++){
+	behaviourTree.Tick();
+}
+Assert.AreEqual(false, calledFlag["whileEx1"]);
+Assert.AreEqual(true, calledFlag["whileEx2"]);
+Assert.AreEqual(false, calledFlag["whileEx3"]);
+ResetCalledFlag();
+while_bool1 = false;
+case4 = true;
+for(int __i__ = 0; __i__ < 1; __i__++){
+	behaviourTree.Tick();
+}
+Assert.AreEqual(true, calledFlag["whileEx1"]);
+Assert.AreEqual(false, calledFlag["whileEx2"]);
+Assert.AreEqual(false, calledFlag["whileEx3"]);
 
 ResetCalledFlag();
 }[Test]

diff --git a/TestCodeEditor.meta b/TestCodeEditor.meta
diff --git a/TestCodeEditor/Editor.meta b/TestCodeEditor/Editor.meta