Wait for 二维码！！！！！！
shit
Merge branch 'master' of https://github.com/ZGCZ/JoyPlus-Client-SpriteKit

Conflicts:

JoyPlus.xcodeproj/project.xcworkspace/xcuserdata/Ciel.xcuserdatad/UserIn
terfaceState.xcuserstate
lala