From a4f28fbd46f23514eed3c03e64cfc9e4010670ca Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 26 十二月 2018 11:31:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Cross_Server' into 【1.4】王者法宝
---
System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs | 60 +++++++++++++++++++++++-------------------------------------
1 files changed, 23 insertions(+), 37 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
index 8df39f3..4f0fd38 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
@@ -149,45 +149,31 @@
private void UpdateActivityState()
{
- //bool isInTime = CrossServerPKSeason.Instance.InDay(TimeUtility.ServerNow);
- //bool isOpen = CrossServerPKSeason.Instance.InOpenTime();
- //inSeasonTimeObj.SetActive(isInTime);
- //outSeasonTimeObj.SetActive(!isInTime);
- //matchBtn.RemoveAllListeners();
- //if(isInTime)
- //{
- // matchBtn_Text.text = Language.Get("CrossServer109");
- // if (isOpen)
- // {
- // matchBtn_Img.material = MaterialUtility.GetUIDefaultGraphicMaterial();
- // if (!crossServerRewardModel.IsOpenMatch)
- // {
- // matchBtn.AddListener(()=> { ClickMatch(1); });
- // }
- // else
- // {
- // matchBtn_Text.text = Language.Get("CrossServer110");
- // matchBtn.AddListener(() => { ClickMatch(0); });
- // }
- // }
- // else
- // {
- // matchBtn_Img.material = MaterialUtility.GetDefaultSpriteGrayMaterial();
- // }
- //}
- inSeasonTimeObj.SetActive(true);
- outSeasonTimeObj.SetActive(false);
+ bool isInTime = CrossServerOneVsOnePKSeason.Instance.InPkSeason(TimeUtility.ServerNow);
+ bool isOpen = CrossServerOneVsOnePKSeason.Instance.InOpenTime();
+ inSeasonTimeObj.SetActive(isInTime);
+ outSeasonTimeObj.SetActive(!isInTime);
matchBtn.RemoveAllListeners();
- matchBtn_Text.text = Language.Get("CrossServer109");
- matchBtn_Img.material = MaterialUtility.GetUIDefaultGraphicMaterial();
- if (!crossServerModel.IsMatching)
+ if (isInTime)
{
- matchBtn.AddListener(() => { ClickMatch(1); });
- }
- else
- {
- matchBtn_Text.text = Language.Get("CrossServer110");
- matchBtn.AddListener(() => { ClickMatch(0); });
+ matchBtn_Text.text = Language.Get("CrossServer109");
+ if (isOpen)
+ {
+ matchBtn_Img.material = MaterialUtility.GetUIDefaultGraphicMaterial();
+ if (!crossServerModel.IsMatching)
+ {
+ matchBtn.AddListener(() => { ClickMatch(1); });
+ }
+ else
+ {
+ matchBtn_Text.text = Language.Get("CrossServer110");
+ matchBtn.AddListener(() => { ClickMatch(0); });
+ }
+ }
+ else
+ {
+ matchBtn_Img.material = MaterialUtility.GetDefaultSpriteGrayMaterial();
+ }
}
}
--
Gitblit v1.8.0