keep trace of reskin.
Merge branch 'master' of github.com:fusijie/FantasyWarrior3D

Conflicts:
	src/ChooseRoleScene.lua
Merge pull request #116 from RaoZiJian/master

Target, Down
Merge branch 'master' of github.com:fusijie/FantasyWarrior3D
Add knight dead effect
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D