玩家可爱死；发生发顺丰阿萨帝发生地方上敌法收到上敌法
Merge branch 'master' of https://github.com/momoplan/gameiphone

Conflicts:
	GameGroup/Images.xcassets/AppIcon.appiconset/Contents.json