Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D
fixed a bug when receive message 'SPECIAL_PERSPECTIVE'
Merge pull request #102 from zaojiahua/master

modify dropblood to hpcounter and fix button bugs
completed archer reskin.
Merge branch 'master' of github.com:fusijie/FantasyWarrior3D

Conflicts:
	frameworks/cocos2d-x/cocos/custom/EffectSprite3D.cpp
	src/main.lua
1 add critical attack
2  decrease special attack chance
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	src/actors/Piglet.lua
Merge pull request #103 from calfjohn/master

2 commits
Add hp drop effects
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	src/BattleScene.lua
	src/actors/Actor.lua
	src/actors/Knight.lua
Refactor audio in hurt
Merge pull request #104 from RaoZiJian/master

	Add hp drop effects
Add avatars shake effects
Merge pull request #105 from RaoZiJian/master

Add avatars shake effects
add bag function on chooserolescene