From f2cd8cf71a54e251e5f507c7d69c6f91f90e5074 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 25 九月 2018 20:23:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/Login/LoginModel.cs |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/System/Login/LoginModel.cs b/System/Login/LoginModel.cs
index 427405a..db6656d 100644
--- a/System/Login/LoginModel.cs
+++ b/System/Login/LoginModel.cs
@@ -15,8 +15,7 @@
         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,22 +24,19 @@
         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; }
         }
@@ -90,11 +86,18 @@
             }
 
             SDKUtility.Instance.FreePlatformCheckIDAuthentication(sdkLoginResult.account);
-
             ServerListCenter.Instance.RequestServerListPlayer(sdkLoginResult.account);
-            GameNotice.OpenGameNotice();
             SDKUtility.Instance.MakeKeyAndVisible();
             OperationLogCollect.Instance.RecordLauchEvent(5);
+
+            if (VersionUtility.Instance.IsMaoErGame() && VersionUtility.Instance.NeedUpdate())
+            {
+                VersionUtility.Instance.RequestMaoErVersionCheck();
+            }
+            else
+            {
+                GameNotice.OpenGameNotice();
+            }
         }
 
         private void OnSDKAccountLoginOutOk()

--
Gitblit v1.8.0