紧急修改人物死亡，崩溃的问题
Merge branch 'fight_branch' of https://github.com/fangzhoudalu/fangzhoudalu into fight_branch