合并 3个游戏的Bug修改

Conflicts:
ShanghaiNaturalHistoryMuseum/DataManager.m
ShanghaiNaturalHistoryMuseum/DataManagerTest.m