3.6.21

Tencent · Feb 27, 2017 · 64e9427 · 64e9427
1 parent 220bb5b
commit 64e9427
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@ cmake_minimum_required (VERSION 2.8)
 # set(CMAKE_CONFIGURATION_TYPES "Debug;Release;Profile" CACHE STRING "" FORCE) 
 set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE) 
 
-set (BEHAVIAC_PACKAGE_VERSION 3.6.20)
+set (BEHAVIAC_PACKAGE_VERSION 3.6.21)
 
 #option( BUILD_SHARED_LIBS "set to OFF to build static libraries" ON )
 SET(BUILD_SHARED_LIBS ON CACHE BOOL "set to OFF to build static libraries")

diff --git a/docs/behaviac.chm b/docs/behaviac.chm
diff --git a/history.txt b/history.txt
@@ -1,3 +1,6 @@
+2017-2-27  3.6.21
+    Fix a bug for adding and removing the properties of the struct.
+
 2017-2-24  3.6.20
     Fix a bug for renaming the agent and setting its base class.
 

diff --git a/inc/behaviac/common/_config.h b/inc/behaviac/common/_config.h
@@ -11,5 +11,5 @@
 	#define BEHAVIAC_RELEASE 		0
 #endif
 
-#define BEHAVIAC_VERSION_STRING 	"3.6.20"
+#define BEHAVIAC_VERSION_STRING 	"3.6.21"
 
diff --git a/integration/demo_running/behaviac/BehaviorTree/Nodes/Composites/Selector.cs b/integration/demo_running/behaviac/BehaviorTree/Nodes/Composites/Selector.cs
@@ -104,7 +104,7 @@ public EBTStatus SelectorUpdate(Agent pAgent, EBTStatus childStatus, ref int act
                     s = pBehavior.exec(pAgent);
                 }
 
-                // If the child fails, or keeps running, do the same.
+                // If the child succeeds, or keeps running, do the same.
                 if (s != EBTStatus.BT_FAILURE)
                 {
                     return s;

diff --git a/integration/demo_running/behaviac/version.txt b/integration/demo_running/behaviac/version.txt
@@ -1 +1 @@
-3.6.20 
+3.6.21 
diff --git a/integration/unity/Assets/Scripts/behaviac/runtime/BehaviorTree/Nodes/Composites/Selector.cs b/integration/unity/Assets/Scripts/behaviac/runtime/BehaviorTree/Nodes/Composites/Selector.cs
@@ -104,7 +104,7 @@ public EBTStatus SelectorUpdate(Agent pAgent, EBTStatus childStatus, ref int act
                     s = pBehavior.exec(pAgent);
                 }
 
-                // If the child fails, or keeps running, do the same.
+                // If the child succeeds, or keeps running, do the same.
                 if (s != EBTStatus.BT_FAILURE)
                 {
                     return s;

diff --git a/integration/unity/Assets/Scripts/behaviac/runtime/version.txt b/integration/unity/Assets/Scripts/behaviac/runtime/version.txt
@@ -1 +1 @@
-3.6.20 
+3.6.21 
diff --git a/src/behaviortree/nodes/composites/selector.cpp b/src/behaviortree/nodes/composites/selector.cpp
@@ -89,7 +89,7 @@ namespace behaviac {
                 s = pBehavior->exec(pAgent);
             }
 
-            // If the child fails, or keeps running, do the same.
+            // If the child succeeds, or keeps running, do the same.
             if (s != BT_FAILURE) {
                 return s;
             }

diff --git a/tools/designer/BehaviacDesigner/MetaStoreDock.cs b/tools/designer/BehaviacDesigner/MetaStoreDock.cs
@@ -1527,7 +1527,7 @@ private void addMember()
 
                                 if (prop != null)
                                 {
-                                    structType.Properties.Add(prop);
+                                    structType.AddProperty(prop);
 
                                     this.memberListBox.Items.Add(Member_Str + prop.DisplayName);
                                     this.memberListBox.SelectedIndex = this.memberListBox.Items.Count - 1;
@@ -2138,7 +2138,7 @@ private void removeSelectedMember()
 
                             if (structType.CanBeRemoved())
                             {
-                                structType.Properties.RemoveAt(memberIndex);
+                                structType.RemoveProperty(structType.Properties[memberIndex].BasicName);
 
                                 _lastSelectedType = structType.Name;
                             }

diff --git a/tools/designer/BehaviacDesigner/Properties/AssemblyInfo.cs b/tools/designer/BehaviacDesigner/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.6.20")]
-[assembly: AssemblyFileVersion("3.6.20")]
+[assembly: AssemblyVersion("3.6.21")]
+[assembly: AssemblyFileVersion("3.6.21")]
diff --git a/tutorials/CsTutorials/behaviac/runtime/BehaviorTree/Nodes/Composites/Selector.cs b/tutorials/CsTutorials/behaviac/runtime/BehaviorTree/Nodes/Composites/Selector.cs
@@ -104,7 +104,7 @@ public EBTStatus SelectorUpdate(Agent pAgent, EBTStatus childStatus, ref int act
                     s = pBehavior.exec(pAgent);
                 }
 
-                // If the child fails, or keeps running, do the same.
+                // If the child succeeds, or keeps running, do the same.
                 if (s != EBTStatus.BT_FAILURE)
                 {
                     return s;

diff --git a/tutorials/CsTutorials/behaviac/runtime/version.txt b/tutorials/CsTutorials/behaviac/runtime/version.txt
@@ -1 +1 @@
-3.6.20 
+3.6.21 
diff --git a/...utorial_1/unity/Assets/Scripts/behaviac/runtime/BehaviorTree/Nodes/Composites/Selector.cs b/...utorial_1/unity/Assets/Scripts/behaviac/runtime/BehaviorTree/Nodes/Composites/Selector.cs
@@ -104,7 +104,7 @@ public EBTStatus SelectorUpdate(Agent pAgent, EBTStatus childStatus, ref int act
                     s = pBehavior.exec(pAgent);
                 }
 
-                // If the child fails, or keeps running, do the same.
+                // If the child succeeds, or keeps running, do the same.
                 if (s != EBTStatus.BT_FAILURE)
                 {
                     return s;

diff --git a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/version.txt b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/version.txt
@@ -1 +1 @@
-3.6.20 
+3.6.21 
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-3.6.20 
+3.6.21