Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5686 from chengstory/ChangeConditionJudgeRule 

Fix a logical error in 'TriggerObj::detect()'.
This commit is contained in:
James Chen 2014-03-12 09:47:54 +08:00
parent 1a5e816285 59aa17ea05
commit 675a821189
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/editor-support/cocostudio/TriggerObj.cpp
View File

@ -115,11 +115,11 @@ bool TriggerObj::detect()
return true;
}
bool ret = true;
bool ret = false;
for (const auto& con : _cons)
{
ret = ret && con->detect();
ret = ret || con->detect();
}
return ret;