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/OSRedEnvelopeModel.cs | 10 ++--------
System/OpenServerActivity/OpenServerRedEnvelopeWin.cs | 36 ++----------------------------------
System/FairyAu/RedOPenBGMWin.cs | 4 +---
3 files changed, 5 insertions(+), 45 deletions(-)
diff --git a/System/FairyAu/RedOPenBGMWin.cs b/System/FairyAu/RedOPenBGMWin.cs
index 8afd2d7..b808d62 100644
--- a/System/FairyAu/RedOPenBGMWin.cs
+++ b/System/FairyAu/RedOPenBGMWin.cs
@@ -93,9 +93,7 @@
if (_data.PlayerID != PlayerDatas.Instance.PlayerId
&& OSRedModel.getEnvelopeTimes <= 0)
{
- var t = TimeUtility.ServerNow - OSRedModel.coolDownTime;
- int _seconds = OSRedModel.addSeconds - (int)t.TotalSeconds % OSRedModel.addSeconds;
- SysNotifyMgr.Instance.ShowTip("OpenRedBag4", TimeUtility.SecondsToHMS(_seconds));
+ SysNotifyMgr.Instance.ShowTip("OpenRedBag4");
return;
}
ModelCenter.Instance.GetModel<RedEnvelopeModel>().envelopeSfx = _redBagID;
diff --git a/System/OpenServerActivity/OSRedEnvelopeModel.cs b/System/OpenServerActivity/OSRedEnvelopeModel.cs
index 11ae93c..5c8de0b 100644
--- a/System/OpenServerActivity/OSRedEnvelopeModel.cs
+++ b/System/OpenServerActivity/OSRedEnvelopeModel.cs
@@ -103,12 +103,9 @@
public List<int> m_AllFuncs { get; private set; }
public int openDays { get; private set; }
public int OSRedEnvelopeType { get; private set; }
- public int initialCount { get; private set; }
- public int addSeconds { get; private set; }
- public int limitCount { get; private set; }
public float envelopeVoiceCD { get; private set; }
+ public int addCounts { get; private set; }
public DateTime overTime = DateTime.Now;
- public DateTime coolDownTime { get; private set; }
void ParseConfig()
{
var _allCfgs = Config.Instance.GetAllValues<OSRedAchieveConfig>();
@@ -135,9 +132,7 @@
var _cfg = Config.Instance.Get<FuncConfigConfig>("OpenServerRedPacketCfg");
openDays = int.Parse(_cfg.Numerical1);
- initialCount = int.Parse(_cfg.Numerical2);
- addSeconds = Mathf.Max(60, int.Parse(_cfg.Numerical3));
- limitCount = int.Parse(_cfg.Numerical4);
+ addCounts = int.Parse(_cfg.Numerical5);
_cfg = Config.Instance.Get<FuncConfigConfig>("OpenServerRedPacketType");
OSRedEnvelopeType = int.Parse(_cfg.Numerical1);
_cfg = Config.Instance.Get<FuncConfigConfig>("RedEnvelopeVoiceCd");
@@ -436,7 +431,6 @@
{
totalJadeGet = (int)_pak.MoneyNum;
getEnvelopeTimes = _pak.GrabCnt;
- coolDownTime = TimeUtility.GetTime(_pak.StartTime);
if (OSRedEnvelopeInfoEnvent != null)
{
OSRedEnvelopeInfoEnvent();
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