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

FGUIProject/assets/Login/LoginUI.xml

@@ -28,6 +28,8 @@
     <component id="n13_es2q" name="btnAge" src="es2q5i" fileName="components/Button5.xml" xy="924,1740">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
-    <component id="n15_pwpm" name="btnTapLogin" src="pwpm5k" fileName="components/ButtonTapLogin.xml" xy="333,1837"/>
+    <component id="n15_pwpm" name="btnTapLogin" src="pwpm5k" fileName="components/ButtonTapLogin.xml" xy="333,1837">
+      <relation target="" sidePair="bottom-bottom"/>
+    </component>
   </displayList>
 </component>

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

@@ -102,7 +102,6 @@ namespace GFGGame
                 {
                     OnClickBtnStart();
                 }
-                _ui.m_btnLogout.visible = GameController.CheckLoginCache(false);
                 if (!_ui.m_btnLogout.visible)
                 {
                     ViewManager.Show<LoginInputView>();
@@ -140,6 +139,8 @@ namespace GFGGame
 
         private void UpdateServer(ServerInfo info)
         {
+            //登录成功后更新注销按钮显示
+            _ui.m_btnLogout.visible = GameController.CheckLoginCache(false);
             ServerInfosComponent serverInfosComponent = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>();
             if (serverInfosComponent.ServerInfoList.Count == 0)
             {