Enemy is not enmey
support attack effect
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	src/BattleScene.lua
fixed a bug
Merge pull request #45 from calfjohn/master

support attack effect