Merge pull request #1 from lightszero/master

merge
Merge pull request #2 from lightszero/master

update
根据u3d提示,清理一些编译warning
Merge pull request #3 from seewindcn/master

clear of warning