Solve conflict
Angry Animation
Enemy
nothing
Merge branch 'newmaster' of https://github.com/RaoZiJian/LoriFight into newmaster

Conflicts:
	LoriFight/src/resource.js
Add attack effect.
new map generated
Merge branch 'newmaster' of https://github.com/RaoZiJian/LoriFight into newmaster
Merge branch 'newmaster' of https://github.com/RaoZiJian/LoriFight