adjust Fence size
Merge branch 'iosmiao' of http://github.com/liyonghelpme/mywangguo into tmx
why Shadow first Label shadow be cutted ? in ios contentSize not right
Store cpp code adjust offset padding
add New Cat angela size 0.64 ax ay defaultvalue
fix 5 view
Merge branch 'tmx' of http://github.com/liyonghelpme/mywangguo into iosmiao
Farm People
Merge branch 'tmx' of http://github.com/liyonghelpme/mywangguo into iosmiao
Store goods
Merge branch 'tmx' of http://github.com/liyonghelpme/mywangguo into iosmiao
why merchant not buy goods
before my Test branch
fix demo
Merge branch 'tmx' of http://github.com/liyonghelpme/mywangguo into iosmiao
change map
change map
Merge branch 'tmx' of http://github.com/liyonghelpme/mywangguo into iosmiao
wangguo dialogBanner
use wangguo DialogController