删除game.log
Merge remote-tracking branch 'origin/master'
db修改