Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-10 c6bc396fe264cd53ba594e7430011c623cc26c4a

 System/Login/LoginModel.cs

@@ -278,8 +278,8 @@
                    send.Extra = "";

                    break;

                case VersionAuthority.Release:

                    send.ExtraLen = 0;

                    send.Extra = "";

                    send.Extra = VersionConfig.Get().SpID;

                    send.ExtraLen = (byte)send.Extra.Length;

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

                    {

                        send.IDType = 1;

@@ -291,8 +291,11 @@
                    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.Extra += ("|" + SDKUtility.Instance.FreePlatformInfo.sessionID);

                        send.ExtraLen = (byte)send.Extra.Length;

                    }else if(SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Js)

                    {

                        send.IDType = 4;

                    }

                    send.AccID = sdkLoginResult.account;

                    send.Password = sdkLoginResult.token;

@@ -301,7 +304,7 @@
                    send.LineNO = 255;

                    send.AppID = VersionConfig.Get().appId;

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

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

                    send.TokenExpire = sdkLoginResult.tokenExpire;

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

                    {

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