ghyg
Merge branch 'master' of https://github.com/bin8673853/Game

Conflicts:

proj.ios_mac/ddgame.xcodeproj/project.xcworkspace/xcuserdata/mimix.xcuse
rdatad/UserInterfaceState.xcuserstate