From c7b93f0ad3bcfa8ee06e870f1a9f41c7c72ebda8 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 19 四月 2019 10:22:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/OpenServerActivityWin.cs | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index 16462b1..ff70b3f 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -256,22 +256,22 @@
activityCell.timer.text = TimeUtility.SecondsToHMS(seconds);
activityCell.containerTimer.gameObject.SetActive(seconds > 0);
}
- cell = m_ActivityCtrl.GetActiveCellView((int)OpenServerActivityCenter.OSActivityType.FairyGrabBossNotice);
- if (cell != null)
- {
- var activityCell = cell as OpenServerActivityCell;
- var seconds = fairyGrabBossModel.GetNextSessionSeconds();
- bool isOpen = fairyGrabBossModel.IsOpen;
- activityCell.containerTimer.gameObject.SetActive(seconds > 0 || isOpen);
- if (seconds > 0)
- {
- activityCell.timer.text = TimeUtility.SecondsToHMS(seconds);
- }
- else if (isOpen)
- {
- activityCell.timer.text = Language.Get("FairyGrabBossOpened");
- }
- }
+ //cell = m_ActivityCtrl.GetActiveCellView((int)OpenServerActivityCenter.OSActivityType.FairyGrabBossNotice);
+ //if (cell != null)
+ //{
+ // var activityCell = cell as OpenServerActivityCell;
+ // var seconds = fairyGrabBossModel.GetNextSessionSeconds();
+ // bool isOpen = fairyGrabBossModel.IsOpen;
+ // activityCell.containerTimer.gameObject.SetActive(seconds > 0 || isOpen);
+ // if (seconds > 0)
+ // {
+ // activityCell.timer.text = TimeUtility.SecondsToHMS(seconds);
+ // }
+ // else if (isOpen)
+ // {
+ // activityCell.timer.text = Language.Get("FairyGrabBossOpened");
+ // }
+ //}
}
void CheckAlreadyOpen()
@@ -567,9 +567,9 @@
case 12:
WindowCenter.Instance.Open<FairyLeagueNoticeWin>(true);
break;
- case 13:
- WindowCenter.Instance.Open<FairyGrabBossNoticeWin>(true);
- break;
+ //case 13:
+ // WindowCenter.Instance.Open<FairyGrabBossNoticeWin>(true);
+ // break;
case 14:
WindowCenter.Instance.Open<FlashRushToBuyWin>(true);
break;
--
Gitblit v1.8.0