Merge pull request #7841 from pandamicro/3.2-cocos-engine-PR

Migrate some changes from Cocos2d-JS to -x
update version