From 9ee6fe853c33f10db9cd17312618d454609dc024 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 26 九月 2018 22:46:23 +0800
Subject: [PATCH] Merge branch 'master' into 3687天赋功能
---
System/OpenServerActivity/InSevenDayWin.cs | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/System/OpenServerActivity/InSevenDayWin.cs b/System/OpenServerActivity/InSevenDayWin.cs
index 5ecb21d..57152ab 100644
--- a/System/OpenServerActivity/InSevenDayWin.cs
+++ b/System/OpenServerActivity/InSevenDayWin.cs
@@ -24,6 +24,7 @@
[SerializeField] RewardInformation m_rewardInformation;
[SerializeField] Text m_TextName;
[SerializeField] Image m_ImageShow;
+ [SerializeField] Image m_ImageShowCH;
[SerializeField] Image m_ImageDay;
[SerializeField] Image m_ImageTex1;
[SerializeField] Image m_ImageTex2;
@@ -119,8 +120,21 @@
}
m_rewardInformation.GetIsDays(SelectedDay);
m_TextName.text = InsevenConfig.RewardName;
- m_ImageShow.SetSprite(InsevenConfig.Image);
- m_ImageShow.SetNativeSize();
+ if (InsevenConfig.IsTitle == 1)
+ {
+ m_ImageShow.gameObject.SetActive(false);
+ m_ImageShowCH.gameObject.SetActive(true);
+ m_ImageShowCH.SetSprite(InsevenConfig.Image);
+ m_ImageShowCH.SetNativeSize();
+ }
+ else
+ {
+ m_ImageShowCH.gameObject.SetActive(false);
+ m_ImageShow.gameObject.SetActive(true);
+ m_ImageShow.SetSprite(InsevenConfig.Image);
+ m_ImageShow.SetNativeSize();
+ }
+
m_ImageDay.SetSprite(InsevenConfig.DayIcon);
m_ImageDay.SetNativeSize();
m_ImageTex1.SetSprite(InsevenConfig.ImgTxt1);
--
Gitblit v1.8.0