bug fix
Merge branch 'mergecocos3.0' of github.com:houguohua/cocos3d-x into mergecocos3.0