From d930e85ecc496307fd2e1bd21add1808e44849b8 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 26 十二月 2018 15:41:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Cross_Server' into 【1.4】王者法宝
---
System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
index 4f0fd38..a97b3e6 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
@@ -43,6 +43,7 @@
protected override void OnPreOpen()
{
SetDisplay();
+ CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfo;
TimeMgr.Instance.OnMinuteEvent += UpdateMinute;
GlobalTimeEvent.Instance.secondEvent += UpdateSecond;
DTCC002_tagGCCrossRealmPKStartMatch.CrossServerStartMatchEvent += OnStartMatch;
@@ -55,6 +56,7 @@
protected override void OnPreClose()
{
+ CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdatePlayerInfo;
TimeMgr.Instance.OnMinuteEvent -= UpdateMinute;
GlobalTimeEvent.Instance.secondEvent -= UpdateSecond;
DTCC002_tagGCCrossRealmPKStartMatch.CrossServerStartMatchEvent -= OnStartMatch;
@@ -64,6 +66,12 @@
}
#endregion
+
+ private void UpdatePlayerInfo()
+ {
+ UpdateMatchInfo();
+ UpdatePKInfo();
+ }
private void SetDisplay()
{
@@ -133,18 +141,24 @@
{
if (!crossServerModel.IsMatching) return;
- int totalSeconds = Mathf.RoundToInt((float)(DateTime.Now - crossServerModel.matchStartTime).TotalSeconds);
- if(totalSeconds < 3600)
+ if(CrossServerOneVsOnePKSeason.Instance.isSatisfyMatch)
{
- int minute = totalSeconds / 60;
- int seconds = totalSeconds % 60;
- lookTimeText.text = StringUtility.Contact(minute.ToString("D2"), ":", seconds.ToString("D2"));
+ int totalSeconds = Mathf.RoundToInt((float)(DateTime.Now - crossServerModel.matchStartTime).TotalSeconds);
+ if (totalSeconds < 3600)
+ {
+ int minute = totalSeconds / 60;
+ int seconds = totalSeconds % 60;
+ lookTimeText.text = StringUtility.Contact(minute.ToString("D2"), ":", seconds.ToString("D2"));
+ }
+ else
+ {
+ ClickMatch(0);
+ }
}
else
{
ClickMatch(0);
}
-
}
private void UpdateActivityState()
@@ -180,8 +194,12 @@
private void ClickBuyTimes()
{
int remainNum = CrossServerOneVsOnePlayerInfo.Instance.GetDayRemainNum();
- if (remainNum >= crossServerModel.freeMaxMatchNum) return;
-
+ if (remainNum >= crossServerModel.freeMaxMatchNum)
+ {
+ SysNotifyMgr.Instance.ShowTip("CrossMatching13");
+ return;
+ }
+
WindowCenter.Instance.Open<CrossSeverOneVsOneBuyMatchTimesWin>();
}
--
Gitblit v1.8.0