iOS 真机

Signed-off-by: wang-yichun <wang-yichun@meyougames.com>
develop on osx

Signed-off-by: wang-yichun <wang-yichun@meyougames.com>
Merge branch 'refs/heads/master' into develop

Signed-off-by: wang-yichun <wang-yichun@meyougames.com>

Conflicts:
	proj.ios/.DS_Store
fix bug.

Signed-off-by: wang-yichun <wang-yichun@meyougames.com>
iOS env. test

Signed-off-by: wang-yichun <wang-yichun@meyougames.com>