Merge pull request #50 from Wu-Hao/master

implemented ranged collider, added more feature to attackmanager
dropblood finish
Merge pull request #51 from zaojiahua/master

dropblood finish
Piglet test
Merge pull request #52 from RaoZiJian/master

Piglet test
1020
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	src/BattleScene.lua
using pig model