finish the fight interface ,but it is not drawed by the system now.
Merge branch 'master' of github.com:yiyangdefeng/Slade_of_the_Country

Conflicts:
	src/com/example/slade_of_the_country/MyView.java
revise the fight interface