Combo Show
Combo number fixed
Merge branch 'battleEffect' of https://github.com/tungha/DiamondTest

Conflicts:
	DiamondTest/src/com/cnc/diamond/battle/BattleStat.java
	DiamondTest/src/com/cnc/diamond/battle/Character.java