王振修改 受伤害者 怪物 碰撞 怪物控制器
Merge branch 'master' of github.com:yanxin59/CarrotFantasy

Conflicts:
	Classes/CollisionManager.cpp