fix bugs
Merge branch 'newmaster' of https://github.com/RaoZiJian/LoriFight into newmaster