From a82a222a5b5748de55494ec61115cc880b1eeec1 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 20 二月 2019 11:22:14 +0800
Subject: [PATCH] Merge branch 'master' into ItemReconstruction
---
System/Login/LoginModel.cs | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/System/Login/LoginModel.cs b/System/Login/LoginModel.cs
index 9f1bff2..5312a63 100644
--- a/System/Login/LoginModel.cs
+++ b/System/Login/LoginModel.cs
@@ -16,7 +16,8 @@
public SDKUtility.FP_LoginOk sdkLoginResult;
public SDKUtility.FP_CheckIDAuthentication sdkIDCheckIDAuthentication;
- public string localSaveAccountName {
+ public string localSaveAccountName
+ {
get { return LocalSave.GetString(USER_ACCOUNT); }
set { LocalSave.SetString(USER_ACCOUNT, value); }
}
@@ -25,19 +26,22 @@
public event Action accountBindOkEvent;
bool m_ReconnecBackGround = false;
- public bool reconnectBackGround {
+ public bool reconnectBackGround
+ {
get { return m_ReconnecBackGround; }
set { m_ReconnecBackGround = value; }
}
bool m_OnCreateRole = false;
- public bool onCreateRole {
+ public bool onCreateRole
+ {
get { return m_OnCreateRole; }
set { m_OnCreateRole = value; }
}
bool m_Busy = false;
- public bool busy {
+ public bool busy
+ {
get { return m_Busy; }
set { m_Busy = value; }
}
@@ -329,8 +333,27 @@
{
send.IDType = 6;
}
+ else if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Xn)
+ {
+ send.IDType = 7;
+ send.Extra += ("|" + SDKUtility.Yj_AppID + "|" + SDKUtility.Yj_Version);
+ send.ExtraLen = (byte)send.Extra.Length;
+ }
+ else if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Cjm)
+ {
+ send.IDType = 8;
+ send.Extra += ("|" + SDKUtility.Yj_AppID + "|" + SDKUtility.Instance.FreePlatformInfo.token);
+ send.ExtraLen = (byte)send.Extra.Length;
+ }
send.AccID = sdkLoginResult.account;
- send.Password = sdkLoginResult.token;
+ if (SDKUtility.Instance.ChannelPlatform != SDKUtility.E_ChannelPlatform.Cjm)
+ {
+ send.Password = sdkLoginResult.token;
+ }
+ else
+ {
+ send.Password = "";
+ }
send.MAC = DeviceUtility.GetMac();
send.Version = _serverInfo.Version;
send.LineNO = 255;
--
Gitblit v1.8.0