From 703337574c8d4d4e852ea90c778e3aff3523ce12 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 26 九月 2018 15:12:31 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/Login/LoginWin.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/System/Login/LoginWin.cs b/System/Login/LoginWin.cs
index 2626d02..5007d06 100644
--- a/System/Login/LoginWin.cs
+++ b/System/Login/LoginWin.cs
@@ -33,7 +33,7 @@
[SerializeField] Button m_ServerSelect;
[SerializeField] Button m_SwitchAccount;
[SerializeField] Button m_Notice;
- [SerializeField] RectTransform m_BanHao;
+ [SerializeField] RichText m_BanHao;
LoginModel model { get { return ModelCenter.Instance.GetModel<LoginModel>(); } }
@@ -57,7 +57,8 @@
protected override void OnPreOpen()
{
- m_BanHao.gameObject.SetActive(Application.platform == RuntimePlatform.WindowsEditor || VersionUtility.Instance.IsMaoErGame());
+ m_BanHao.text = string.IsNullOrEmpty(VersionConfig.Get().banHao) ? string.Empty : VersionConfig.Get().banHao;
+
var sprite = Resources.Load<Sprite>("UI/Sprites/TB_DL_Logo");
m_Logo.overrideSprite = sprite;
m_Logo.SetNativeSize();
@@ -169,6 +170,14 @@
return;
}
+ if (VersionUtility.Instance.IsMaoErGame())
+ {
+ if (VersionUtility.Instance.step != VersionUtility.Step.Completed)
+ {
+ return;
+ }
+ }
+
Login();
}
--
Gitblit v1.8.0