Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5f63d08

Browse files
committed
3.6.33
1 parent1f8184a commit5f63d08

File tree

45 files changed

+178
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+178
-70
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ cmake_minimum_required (VERSION 2.8)
3131
# set(CMAKE_CONFIGURATION_TYPES "Debug;Release;Profile" CACHE STRING "" FORCE)
3232
set(CMAKE_CONFIGURATION_TYPES"Debug;Release"CACHESTRING"" FORCE)
3333

34-
set (BEHAVIAC_PACKAGE_VERSION 3.6.32)
34+
set (BEHAVIAC_PACKAGE_VERSION 3.6.33)
3535

3636
#option( BUILD_SHARED_LIBS "set to OFF to build static libraries" ON )
3737
SET(BUILD_SHARED_LIBSONCACHEBOOL"set to OFF to build static libraries")

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://github.com/Tencent/behaviac/blob/master/license.txt)
2-
[![Release Version](https://img.shields.io/badge/release-3.6.32-red.svg)](https://github.com/Tencent/behaviac/releases)
2+
[![Release Version](https://img.shields.io/badge/release-3.6.33-red.svg)](https://github.com/Tencent/behaviac/releases)
33
[![Updates](https://img.shields.io/badge/Platform-%20iOS%20%7C%20OS%20X%20%7C%20Android%20%7C%20Windows%20%7C%20Linux%20-brightgreen.svg)](https://github.com/Tencent/behaviac/blob/master/history.txt)
44
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/behaviac/pulls)
55

‎docs/behaviac.chm‎

-22 Bytes
Binary file not shown.

‎history.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2017-5-4 3.6.33
2+
Remove the inheritance for the agent type of the referenced behaviors.
3+
Fix a bug for the Parallel node.
4+
Fix a bug for the IfElse node.
5+
16
2017-4-26 3.6.32
27
Support resetting the children for the SelectorLoop node.
38
Add the tutorial_13.

‎inc/behaviac/common/_config.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
#defineBEHAVIAC_RELEASE 0
1212
#endif
1313

14-
#defineBEHAVIAC_VERSION_STRING "3.6.32"
14+
#defineBEHAVIAC_VERSION_STRING "3.6.33"
1515

‎integration/demo_running/behaviac/Base/Utils.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1800,7 +1800,7 @@ public static string RemoveQuot(string str)
18001800

18011801
if(ret.StartsWith(kQuotStr))
18021802
{
1803-
Debug.Check(ret.EndsWith(kQuotStr));
1803+
//Debug.Check(ret.EndsWith(kQuotStr));
18041804
ret=ret.Replace(kQuotStr,"\"");
18051805
}
18061806

‎integration/demo_running/behaviac/BehaviorTree/Nodes/Composites/Ifelse.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ protected override void onexit(Agent pAgent, EBTStatus s)
9999

100100
protectedoverrideEBTStatusupdate(AgentpAgent,EBTStatuschildStatus)
101101
{
102+
Debug.Check(childStatus!=EBTStatus.BT_INVALID);
102103
Debug.Check(this.m_children.Count==3);
103104

104105
EBTStatusconditionResult=EBTStatus.BT_INVALID;
@@ -109,7 +110,7 @@ protected override EBTStatus update(Agent pAgent, EBTStatus childStatus)
109110
conditionResult=childStatus;
110111
}
111112

112-
if(this.m_activeChildIndex==CompositeTask.InvalidChildIndex||conditionResult!=EBTStatus.BT_INVALID)
113+
if(this.m_activeChildIndex==CompositeTask.InvalidChildIndex)
113114
{
114115
BehaviorTaskpCondition=this.m_children[0];
115116

@@ -130,6 +131,10 @@ protected override EBTStatus update(Agent pAgent, EBTStatus childStatus)
130131
this.m_activeChildIndex=2;
131132
}
132133
}
134+
else
135+
{
136+
returnchildStatus;
137+
}
133138

134139
if(this.m_activeChildIndex!=CompositeTask.InvalidChildIndex)
135140
{

‎integration/demo_running/behaviac/BehaviorTree/Nodes/Composites/Parallel.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,14 @@ protected override bool onenter(Agent pAgent)
307307
{
308308
Debug.Check(this.m_activeChildIndex==CompositeTask.InvalidChildIndex);
309309

310+
// reset the status cache of the children
311+
for(inti=0;i<this.m_children.Count;++i)
312+
{
313+
BehaviorTaskpChild=this.m_children[i];
314+
315+
pChild.reset(pAgent);
316+
}
317+
310318
returntrue;
311319
}
312320

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.32
1+
3.6.33

‎integration/unity/Assets/Scripts/behaviac/runtime/Base/Utils.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1800,7 +1800,7 @@ public static string RemoveQuot(string str)
18001800

18011801
if(ret.StartsWith(kQuotStr))
18021802
{
1803-
Debug.Check(ret.EndsWith(kQuotStr));
1803+
//Debug.Check(ret.EndsWith(kQuotStr));
18041804
ret=ret.Replace(kQuotStr,"\"");
18051805
}
18061806

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp