Merge pull request #1 from cocos2d/v3

update
fix C4129 warning
Merge pull request #2 from cocos2d/v3

update project
Merge pull request #9224 from pjc0247/v3

fix C4129 warning