adj.

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

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

Conflicts:
	proj.ios/.DS_Store
	proj.ios/GravityMapCreater.xcodeproj/project.xcworkspace/xcuserdata/meyougamesp3.xcuserdatad/UserInterfaceState.xcuserstate
reflesh ignore

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

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

Conflicts:
	proj.ios/.DS_Store