From 0f01fc6f8e61d71e663a37e81d2d56f59f690f30 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 20 十二月 2018 20:51:15 +0800
Subject: [PATCH] Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server
---
System/CrossServerOneVsOne/CrossServerArenaWin.cs | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerArenaWin.cs b/System/CrossServerOneVsOne/CrossServerArenaWin.cs
index 77eb9a5..dd6bc07 100644
--- a/System/CrossServerOneVsOne/CrossServerArenaWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerArenaWin.cs
@@ -37,6 +37,7 @@
protected override void OnPreOpen()
{
SetDisplay();
+ TimeMgr.Instance.OnMinuteEvent += UpdateMinute;
}
protected override void OnAfterOpen()
@@ -46,7 +47,7 @@
protected override void OnPreClose()
{
-
+ TimeMgr.Instance.OnMinuteEvent -= UpdateMinute;
}
protected override void OnAfterClose()
{
@@ -60,6 +61,28 @@
UpdatePKInfo();
UpdateActivityState();
seasonTimeText.text = CrossServerPKSeason.Instance.ToDisplaySeasonTime();
+ var openTimes = CrossServerPKSeason.Instance.GetActivityTimes();
+ openTimeText.gameObject.SetActive(openTimes != null && openTimes.Count > 0);
+ if(openTimes != null)
+ {
+ string openTimeDes = string.Empty;
+ for(int i = 0; i < openTimes.Count; i++)
+ {
+ var openTime = openTimes[i];
+ string timeDes = StringUtility.Contact(openTime.hourBegin.ToString("D2"), ":", openTime.minuteBegin.ToString("D2")
+ ,"-",openTime.hourEnd.ToString("D2"),":",openTime.minuteEnd.ToString("D2"));
+ if(i == 0)
+ {
+ openTimeDes = timeDes;
+ }
+ else
+ {
+ openTimeDes = StringUtility.Contact(openTimeDes,"銆�",timeDes);
+ }
+ }
+ openTimeText.text = Language.Get("CrossServer119", openTimeDes);
+ }
+
}
private void UpdateMatchInfo()
@@ -81,19 +104,24 @@
sumNumText.text = CrossServerPlayerInfo.Instance.PKCount.ToString();
}
+ private void UpdateMinute()
+ {
+ UpdateActivityState();
+ }
+
private void UpdateActivityState()
{
bool isInTime = CrossServerPKSeason.Instance.InDay(TimeUtility.ServerNow);
- bool isOpen = false;
+ bool isOpen = CrossServerPKSeason.Instance.InOpenTime();
matchBtn.RemoveAllListeners();
if(!isInTime)
{
- matchBtn_Text.text = "鍗冲皢寮�鍚�";
+ matchBtn_Text.text = Language.Get("CrossServer111");
matchBtn_Img.material = MaterialUtility.GetDefaultSpriteGrayMaterial();
}
else
{
- matchBtn_Text.text = "寮�濮嬪尮閰�";
+ matchBtn_Text.text = Language.Get("CrossServer109");
if(isOpen)
{
matchBtn_Img.material = MaterialUtility.GetUIDefaultGraphicMaterial();
--
Gitblit v1.8.0