增加用户单日征服和挑战次数的计算
Merge branch 'master' of github.com:MacDino/fightgame