From 8801d2685efd2cfb9c2f9051df3f564d88239938 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 17 八月 2018 15:13:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/FlashSaleCoolDown.cs | 13 +++++++++++++
System/Welfare/WelfareCenter.cs | 4 ++--
System/MainInterfacePanel/HighSettingFadeInFadeOut.cs | 4 ++--
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
index 61fbdee..f140981 100644
--- a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
+++ b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
@@ -457,7 +457,7 @@
{
if (isPlayerUIeffect.RedPointId == 201 || isPlayerUIeffect.RedPointId == 210)
{
- if (RedpointCenter.Instance.GetRedpointState(isPlayerUIeffect.RedPointId) == RedPointState.Simple)
+ if (RedpointCenter.Instance.GetRedpointState(isPlayerUIeffect.RedPointId) == RedPointState.GetReward)
{
m_GroupIndex_Low.GetChild(i).GetComponent<HighBtnRecord>().IsNagaaki = true;
highBtnRecord.IsNagaaki = true;
@@ -500,7 +500,7 @@
{
if (isPlayerUIeffect.RedPointId == 201 || isPlayerUIeffect.RedPointId == 210)
{
- if (RedpointCenter.Instance.GetRedpointState(isPlayerUIeffect.RedPointId) == RedPointState.Simple)
+ if (RedpointCenter.Instance.GetRedpointState(isPlayerUIeffect.RedPointId) == RedPointState.GetReward)
{
m_GroupIndex_Low.GetChild(i).GetComponent<HighBtnRecord>().IsNagaaki = true;
highBtnRecord.IsNagaaki = true;
diff --git a/System/OpenServerActivity/FlashSaleCoolDown.cs b/System/OpenServerActivity/FlashSaleCoolDown.cs
index 14b095f..d726c93 100644
--- a/System/OpenServerActivity/FlashSaleCoolDown.cs
+++ b/System/OpenServerActivity/FlashSaleCoolDown.cs
@@ -13,6 +13,19 @@
private void OnEnable()
{
DisplayTime();
+ GlobalTimeEvent.Instance.secondEvent -= SecondEvent;
+ GlobalTimeEvent.Instance.secondEvent += SecondEvent;
+ }
+
+ private void SecondEvent()
+ {
+ var seconds = OperationTimeHepler.Instance.GetOperationSurplusTime(Operation.FlashSale);
+ m_Time.timeShow.color = seconds > 3600 ? UIHelper.GetUIColor(TextColType.Green) : UIHelper.GetUIColor(TextColType.Red);
+ }
+
+ private void OnDisable()
+ {
+ GlobalTimeEvent.Instance.secondEvent -= SecondEvent;
}
void DisplayTime()
diff --git a/System/Welfare/WelfareCenter.cs b/System/Welfare/WelfareCenter.cs
index e25e448..fc49aec 100644
--- a/System/Welfare/WelfareCenter.cs
+++ b/System/Welfare/WelfareCenter.cs
@@ -66,7 +66,7 @@
if (fairyJadeInvestmentModel.redPointStre1.state == RedPointState.Simple || fairyJadeInvestmentModel.redPointStre1.state == RedPointState.GetReward)
{
WindowCenter.Instance.Close<MainInterfaceWin>();
- WindowCenter.Instance.Open<WelfareWin>(false, 8);
+ WindowCenter.Instance.Open<WelfareWin>(false, 5);
return;
}
WindowCenter.Instance.Close<MainInterfaceWin>();
@@ -112,7 +112,7 @@
if (fairyJadeInvestmentModel.redPointStre1.state == RedPointState.Simple || fairyJadeInvestmentModel.redPointStre1.state == RedPointState.GetReward)
{
- return 8;
+ return 5;
}
return functionOrder;
}
--
Gitblit v1.8.0