Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

# Conflicts:
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -57,7 +57,6 @@ namespace GFGGame
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
             }
             SceneController.UpdateLoginScene(_sceneObject);
-            _ui.m_btnLogout.visible = GameController.CheckLoginCache(false);
             if (!_ui.m_btnLogout.visible)
             {
                 ViewManager.Show<LoginInputView>();
@@ -83,8 +82,10 @@ namespace GFGGame
             }
             base.OnHide();
         }
+
         private void UpdateServer(ServerInfo info)
         {
+            _ui.m_btnLogout.visible = GameController.CheckLoginCache(false);
             ServerInfosComponent serverInfosComponent = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>();
             if (serverInfosComponent.ServerInfoList.Count == 0)
             {