Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D
camera position, new scene model, water
Merge pull request #35 from RaoZiJian/master

Add main menu BGM
command
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D
Merge pull request #36 from calfjohn/master

command
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	src/BattleScene.lua
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

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

camera position, new scene model, water
mainmenuscene modify
base3d -> Actor, blood -> hp
blood -> hp
removed logs, refactored Actor, added a knight class to replace warrior soon
finished template for Actor
add knight class
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D
added cooldown so does not break out of attack
Merge pull request #38 from Wu-Hao/master

Refactor Actor, added Knight (to replace warrior), removed logs
pack apk
remove repeate resource