Merge pull request #12 from AserSayHi/master

添加shopper_2角色动画
更新角色素材
update
Merge pull request #13 from AserSayHi/master

更新货架总货架栏数为23
Revert "更新角色素材"

This reverts commit f7e3a6cf1736ba7b01514bde1e0cf93f08292c66.
更新素材等
Merge pull request #14 from AserSayHi/master

bug修改
更新
Merge branch 'master' of https://github.com/Pamakids/FounderLib

Conflicts:
	src/view/unit/Remover.as