Add music effect
Merge remote-tracking branch 'origin/master'

Conflicts:
	LoriFight/src/actor/Sisi.js
nothing
Merge branch 'newmaster' of https://github.com/RaoZiJian/LoriFight into newmaster

Conflicts:
	LoriFight/src/resource.js
Add attack effect.