cocostudio test
MapCreateScene

change some widgets name.
add a btn.
no func now..
upgrade MapCreateScene

file(layer) rename in cocostudio
3 status btn x2 and their action
do a change on map will be next.
amend
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>
adj.

Signed-off-by: wang-yichun <wang-yichun@meyougames.com>
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