Enemy is not enmey
Merge pull request #43 from RaoZiJian/master

Modify battlefield ui
support attack effect
updated actor and attack manager
fix function call
Merge pull request #44 from Wu-Hao/master

updated actor and attack manager
fixed Knight bug.
Merge branch 'master' of github.com:fusijie/FantasyWarrior3D
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
Merge branch 'master' of github.com:fusijie/FantasyWarrior3D
1019
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	src/BattleScene.lua
	src/Mage.lua
Merge pull request #46 from Wu-Hao/master

1019