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

Change && to || in conditions judge.

This commit is contained in:
chengstory 2014-03-11 22:02:55 +08:00
parent 86219dd7f4
commit 59aa17ea05
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; return true;
} }
bool ret = true; bool ret = false;
for (const auto& con : _cons) for (const auto& con : _cons)
{ {
ret = ret && con->detect(); ret = ret || con->detect();
} }
return ret; return ret;