From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/Launch/LaunchWin.cs | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/System/Launch/LaunchWin.cs b/System/Launch/LaunchWin.cs
index 2bb1005..e9b04bd 100644
--- a/System/Launch/LaunchWin.cs
+++ b/System/Launch/LaunchWin.cs
@@ -40,13 +40,16 @@
#region Built-in
protected override void BindController()
{
- var sprite = Resources.Load<Sprite>("UI/Sprites/Launch");
+ var sprite = BuiltInLoader.LoadSprite("Launch");
m_BackGround.overrideSprite = sprite;
}
protected override void AddListeners()
{
- m_UserHelp.SetListener(OpenUserHelp);
+ if (m_UserHelp)
+ {
+ m_UserHelp.SetListener(OpenUserHelp);
+ }
}
protected override void OnPreOpen()
@@ -60,7 +63,12 @@
m_Version.text = StringUtility.Contact(VersionConfig.Get().version, "_", VersionConfig.Get().buildIndex);
m_BuildTime.text = VersionConfig.Get().debugVersion ? VersionConfig.Get().buildTime : "";
- m_UserHelp.gameObject.SetActive(Config.Instance.ContainKey<ContactConfig>(VersionConfig.Get().appId));
+ if (m_UserHelp)
+ {
+ var appId = VersionConfig.Get().appId;
+ var branch = VersionConfig.Get().branch;
+ m_UserHelp.gameObject.SetActive(ContactConfig.GetConfig(appId, branch) != null);
+ }
if (Application.platform == RuntimePlatform.IPhonePlayer)
{
--
Gitblit v1.8.0