fix old codes
Merge branch 'develop' of github.com:edwardandy/kylinProject into develop
modify fight core logic