fix state
Merge branch 'lopv2' of https://github.com/tungha/DiamondTest

Conflicts:
	DiamondTest/src/com/cnc/diamond/battle/animations/StateAttack.java
	DiamondTest/src/com/cnc/diamond/battle/animations/StateBack.java
	DiamondTest/src/com/cnc/diamond/battle/animations/StateBeAttacked.java