From f8d35bbf09d67fdff214aa824d13a0dca613a91e Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 13 九月 2018 19:53:25 +0800
Subject: [PATCH] 3549 【前端】【1.0.15】【主干】开服红包优化
---
System/OpenServerActivity/OpenServerRedEnvelopeWin.cs | 36 ++----------------------------------
1 files changed, 2 insertions(+), 34 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerRedEnvelopeWin.cs b/System/OpenServerActivity/OpenServerRedEnvelopeWin.cs
index 17f2971..9718d4c 100644
--- a/System/OpenServerActivity/OpenServerRedEnvelopeWin.cs
+++ b/System/OpenServerActivity/OpenServerRedEnvelopeWin.cs
@@ -91,7 +91,6 @@
private float m_Time = 0.0f;
private float m_DelayTime = 0.5f;
- bool IsOutOffTime = false;
protected override void LateUpdate()
{
base.LateUpdate();
@@ -102,13 +101,6 @@
if (TimeUtility.OpenDay < model.openDays)
{
UpdateCoolDown();
- }
- if (!IsOutOffTime)
- {
- if (m_SelectType == 2)
- {
- UpdateAddTime();
- }
}
m_Time = 0;
}
@@ -148,7 +140,6 @@
private void OnServerOpenDayRefresh()
{
UpdateCoolDown();
- UpdateAddTime();
}
private void UpdateCoolDown()
@@ -216,7 +207,6 @@
m_OSRedTitle.text = m_SelectType == 1 ? Language.Get("OSAchievementTitle") : Language.Get("OSRedEnvelopeTitle");
m_ContainerAchievement.gameObject.SetActive(m_SelectType == 1);
m_ContainerEnvelope.gameObject.SetActive(m_SelectType == 2);
- IsOutOffTime = false;
UpdateCoolDown();
if (m_SelectType == 1)
{
@@ -264,34 +254,12 @@
private void UpdateAddTime()
{
- var t = TimeUtility.ServerNow - model.coolDownTime;
- int _seconds = model.addSeconds - (int)t.TotalSeconds % model.addSeconds;
- if (TimeUtility.OpenDay >= model.openDays)
- {
- m_EnvelopeTime.color = UIHelper.GetUIColor(TextColType.NavyYellow);
- m_EnvelopeTime.text = StringUtility.Contact("(", Language.Get("ActivityEnd"), ")");
- IsOutOffTime = true;
- }
- else if (model.getEnvelopeTimes >= model.limitCount)
- {
- m_EnvelopeTime.color = UIHelper.GetUIColor(TextColType.LightGreen);
- m_EnvelopeTime.text = Language.Get("NumberOfArrivals_Z");
- IsOutOffTime = true;
- }
- else
- {
- m_EnvelopeTime.color = UIHelper.GetUIColor(TextColType.LightGreen);
- m_EnvelopeTime.text = StringUtility.Contact("(", TimeUtility.SecondsToHMS(_seconds), Language.Get("OSRedEnvelopeAddTimes"), ")");
- }
+ m_EnvelopeTime.text = Language.Get("OSRedEnvelopeAddTimes", model.addCounts);
}
private void UpdateCounts()
{
- if (model.getEnvelopeTimes < model.limitCount)
- {
- IsOutOffTime = false;
- }
- m_EnvelopeCount.text = Mathf.Min(model.limitCount, model.getEnvelopeTimes).ToString();
+ m_EnvelopeCount.text = model.getEnvelopeTimes.ToString();
}
}
--
Gitblit v1.8.0