From e102e4a814c25aa42017ac962d88bfbfc8d279de Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 09 一月 2019 15:29:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/Login/ServerBehaviour.cs |   27 +++++++++++----------------
 1 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/System/Login/ServerBehaviour.cs b/System/Login/ServerBehaviour.cs
index 95d13ca..cde35ec 100644
--- a/System/Login/ServerBehaviour.cs
+++ b/System/Login/ServerBehaviour.cs
@@ -42,12 +42,6 @@
                     break;
             }
             m_ServerName.text = _serverData.name;
-            m_OpenTime.gameObject.SetActive(m_ServerData.start_date > DateTime.Now);
-
-            if (m_ServerData.start_date > DateTime.Now)
-            {
-                m_OpenTime.text = Language.Get("ServerOnTime", m_ServerData.start_date.ToString("MM-dd HH:mm"));
-            }
 
             var job = 0;
             if (!string.IsNullOrEmpty(_serverData.job))
@@ -58,22 +52,23 @@
             if (job != 0)
             {
                 m_RoleHead.gameObject.SetActive(true);
-                m_RoleHead.SetSprite(GeneralDefine.GetJobHeadPortrait(job, 0));
-            }
-            else
-            {
-                m_RoleHead.gameObject.SetActive(false);
-            }
-
-            m_RoleName.text = _serverData.roleid;
-            if (_serverData.level > 0)
-            {
                 m_RoleName.gameObject.SetActive(true);
                 m_RoleLevel.gameObject.SetActive(true);
+                m_OpenTime.gameObject.SetActive(false);
+
+                m_RoleHead.SetSprite(GeneralDefine.GetJobHeadPortrait(job, 0));
+                m_RoleName.text = _serverData.roleid;
                 m_RoleLevel.text = Language.Get("Z1024", _serverData.level);
             }
             else
             {
+                m_OpenTime.gameObject.SetActive(m_ServerData.start_date > DateTime.Now);
+                if (m_ServerData.start_date > DateTime.Now)
+                {
+                    m_OpenTime.text = Language.Get("ServerOnTime", m_ServerData.start_date.ToString("MM-dd HH:mm"));
+                }
+
+                m_RoleHead.gameObject.SetActive(false);
                 m_RoleName.gameObject.SetActive(false);
                 m_RoleLevel.gameObject.SetActive(false);
             }

--
Gitblit v1.8.0