Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/Login/LoginModel.cs

@@ -286,6 +286,8 @@
                    else if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Sp)

                    {

                        send.IDType = 3;

                        send.ExtraLen = (byte)SDKUtility.Instance.FreePlatformInfo.sessionID.Length;

                        send.Extra = SDKUtility.Instance.FreePlatformInfo.sessionID;

                    }

                    send.AccID = sdkLoginResult.account;

                    send.Password = sdkLoginResult.token;

@@ -295,6 +297,10 @@
                    send.AppID = VersionConfig.Get().appId;

                    send.AccountID = (uint)sdkLoginResult.accountID;// 内部登陆的时候的id

                    send.TokenExpire = sdkLoginResult.tokenExpire;// 内部登陆的时长,无所谓的

                    if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Sp)

                    {

                        send.TokenExpire = SDKUtility.Instance.FreePlatformInfo.timeStamp;

                    }

                    send.Phone = (byte)sdkLoginResult.phone;

                    send.ServerID = (uint)ServerListCenter.Instance.currentServer.region_flag;

                    if (sdkIDCheckIDAuthentication.type == "1")