this is a test file
Merge branch '3d-extension' of github.com:zhukaixy/cocos2d-x into 3d-extension
Merge branch '3d-extension' of github.com:zhukaixy/cocos2d-x into 3d-extension
代码合并：本地可以编译通过