Signed-off-by: weihongchang <328261560@qq.com>
Merge branch 'master' of github.com:weihongchang/cocos2d-x