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/UserHelp/UserHelpWin.cs | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/System/UserHelp/UserHelpWin.cs b/System/UserHelp/UserHelpWin.cs
index 25410c7..b82a94f 100644
--- a/System/UserHelp/UserHelpWin.cs
+++ b/System/UserHelp/UserHelpWin.cs
@@ -25,6 +25,7 @@
[SerializeField] ScrollRect m_IssueScrollRect;
[SerializeField] UserIssueBehaviour m_IssueBehaviourPattern;
[SerializeField] RectTransform m_ContactContainer;
+ [SerializeField] Text m_QQTitle;
[SerializeField] Text m_QQ;
[SerializeField] Text m_Phone;
[SerializeField] Button m_CopyQQ;
@@ -106,8 +107,13 @@
private void InitContact()
{
- var config = Config.Instance.Get<ContactConfig>(VersionConfig.Get().appId);
- m_QQ.text = Language.GetFromLocal(31, config.qq);
+ var config = ContactConfig. GetConfig(VersionConfig.Get().appId, VersionConfig.Get().branch);
+
+ m_QQTitle.text = Language.GetFromLocal(31);
+ var qqContent = config.qq.Split('|');
+ m_QQ.text = string.Join("\r\n", qqContent);
+ m_CopyQQ.gameObject.SetActive(qqContent.Length == 1);
+
m_Phone.text = Language.GetFromLocal(32, config.phone);
}
@@ -127,8 +133,8 @@
{
if (Application.isMobilePlatform)
{
- var config = Config.Instance.Get<ContactConfig>(VersionConfig.Get().appId);
- SDKUtility.Instance.CopyContent(config.qq);
+ var config = ContactConfig.GetConfig(VersionConfig.Get().appId, VersionConfig.Get().branch);
+ SDKUtility.Instance.CopyContent(m_QQ.text);
m_CopySucceedTip.Display(Language.GetFromLocal(33));
}
}
@@ -137,7 +143,7 @@
{
if (Application.isMobilePlatform)
{
- var config = Config.Instance.Get<ContactConfig>(VersionConfig.Get().appId);
+ var config = ContactConfig.GetConfig(VersionConfig.Get().appId, VersionConfig.Get().branch);
SDKUtility.Instance.CopyContent(config.phone);
m_CopySucceedTip.Display(Language.GetFromLocal(33));
}
--
Gitblit v1.8.0