From 8f1d566efbf054f7ffc3fdc8605dd31dbaee881a Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期六, 22 十二月 2018 14:40:56 +0800
Subject: [PATCH] 5398 子 【开发】【1.4】跨服竞技场 ,正在进入跨服时，限制进入副本
---
System/CrossServerOneVsOne/CrossServerArenaWin.cs | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerArenaWin.cs b/System/CrossServerOneVsOne/CrossServerArenaWin.cs
index c04ed3c..f323f54 100644
--- a/System/CrossServerOneVsOne/CrossServerArenaWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerArenaWin.cs
@@ -33,7 +33,6 @@
protected override void AddListeners()
{
dayAwardBtn.AddListener(ClickDayAward);
- matchBtn.AddListener(ClickMatch);
buyTimesBtn.AddListener(ClickBuyTimes);
matchRecordBtn.AddListener(ClickMatchRecord);
scoreRankBtn.AddListener(ClickScoreRank);
@@ -129,11 +128,12 @@
matchBtn_Img.material = MaterialUtility.GetUIDefaultGraphicMaterial();
if (!crossServerRewardModel.IsOpenMatch)
{
- matchBtn.AddListener(ClickMatch);
+ matchBtn.AddListener(()=> { ClickMatch(1); });
}
else
{
matchBtn_Text.text = Language.Get("CrossServer110");
+ matchBtn.AddListener(() => { ClickMatch(0); });
}
}
else
@@ -162,13 +162,20 @@
WindowCenter.Instance.Open<RankingWin>();
}
- private void ClickMatch()
+ private void ClickMatch(int type)
{
- CloseImmediately();
- crossServerModel.SendCrossMatch(1);
- crossServerRewardModel.IsOpenMatch = true;
+ crossServerModel.SendCrossMatch(type);
+ crossServerRewardModel.IsOpenMatch = type == 1? true : false;
crossServerRewardModel.ResetTime();
- WindowCenter.Instance.Open<MatchWin>();
+ if(type == 1)
+ {
+ WindowCenter.Instance.Open<MatchWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.CloseImmediately<MatchWin>();
+ }
+ UpdateActivityState();
}
private void ClickMatchRecord()
--
Gitblit v1.8.0