hexiaojie/Client @ 6bbd0ec62f07c581d719fc35664b41003a67d39b

hexiaojie 6bbd0ec62f Merge remote-tracking branch 'remotes/origin/master' into ios_test		1 rok temu
..
.idea	2a1945c843 IOS合并master代码后修复bug	1 rok temu
Assets	6bbd0ec62f Merge remote-tracking branch 'remotes/origin/master' into ios_test	1 rok temu
Packages	02dc468525 Merge remote-tracking branch 'origin/UIAdaption' into ios	1 rok temu
ProjectSettings	c04c04cb1f 更改一下打包配置	1 rok temu
TapTap	104e6766cb 提交douYou分支保存	1 rok temu
UserSettings	624ed7b55b ios	1 rok temu
GameClient.sln.DotSettings.user	d1474409ea ios分支的一些内购包引用	1 rok temu
README.md	97e448c6e1 初始化	3 lat temu
gfg.keystore	1bbbe522be Squashed commit of the following:	1 rok temu
wjy.keystore	9fed3001e6 加入分享sdk	1 rok temu

#gfgclient