mainmenuscene modify
Merge pull request #38 from Wu-Hao/master

Refactor Actor, added Knight (to replace warrior), removed logs
pack apk
Enemy is not enmey
remove repeate resource
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	src/Warrior.lua
Merge pull request #42 from zaojiahua/master

pack apk and remove repeate resource
add keystore and remove publish dir.
Modify battlefield ui
Merge pull request #43 from RaoZiJian/master

Modify battlefield ui
support attack effect
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