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

Commit72c6510

Browse files
committed
3.6.34
1 parentf10f013 commit72c6510

File tree

20 files changed

+88
-100
lines changed

20 files changed

+88
-100
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.33)
34+
set (BEHAVIAC_PACKAGE_VERSION 3.6.34)
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.33-red.svg)](https://github.com/Tencent/behaviac/releases)
2+
[![Release Version](https://img.shields.io/badge/release-3.6.34-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‎

-762 KB
Binary file not shown.

‎history.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2017-5-15 3.6.34
2+
Fix a bug for the Parallel node.
3+
14
2017-5-4 3.6.33
25
Remove the inheritance for the agent type of the referenced behaviors.
36
Fix a bug for the Parallel node.

‎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.33"
14+
#defineBEHAVIAC_VERSION_STRING "3.6.34"
1515

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -308,12 +308,12 @@ protected override bool onenter(Agent pAgent)
308308
Debug.Check(this.m_activeChildIndex==CompositeTask.InvalidChildIndex);
309309

310310
// reset the status cache of the children
311-
for(inti=0;i<this.m_children.Count;++i)
312-
{
313-
BehaviorTaskpChild=this.m_children[i];
311+
//for (int i = 0; i < this.m_children.Count; ++i)
312+
//{
313+
// BehaviorTask pChild = this.m_children[i];
314314

315-
pChild.reset(pAgent);
316-
}
315+
// pChild.reset(pAgent);
316+
//}
317317

318318
returntrue;
319319
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.33
1+
3.6.34

‎integration/unity/Assets/Scripts/behaviac/runtime/BehaviorTree/Nodes/Composites/Parallel.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -308,12 +308,12 @@ protected override bool onenter(Agent pAgent)
308308
Debug.Check(this.m_activeChildIndex==CompositeTask.InvalidChildIndex);
309309

310310
// reset the status cache of the children
311-
for(inti=0;i<this.m_children.Count;++i)
312-
{
313-
BehaviorTaskpChild=this.m_children[i];
311+
//for (int i = 0; i < this.m_children.Count; ++i)
312+
//{
313+
// BehaviorTask pChild = this.m_children[i];
314314

315-
pChild.reset(pAgent);
316-
}
315+
// pChild.reset(pAgent);
316+
//}
317317

318318
returntrue;
319319
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.33
1+
3.6.34

‎src/behaviortree/behaviortree.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ namespace behaviac {
190190
if (pPrecond !=NULL) {
191191
Precondition::EPhase ph = pPrecond->GetPhase();
192192

193-
if (phase == Precondition::E_BOTH ||ph == Precondition::E_BOTH || ph == phase) {
193+
if (ph == Precondition::E_BOTH || ph == phase) {
194194
bool taskBoolean = pPrecond->Evaluate((Agent*)pAgent);
195195

196196
CombineResults(firstValidPrecond, lastCombineValue, pPrecond, taskBoolean);

0 commit comments

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