From cfb5a44c43432432f3e47d752ef279e286db5ef7 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期三, 26 十二月 2018 13:52:31 +0800
Subject: [PATCH] 5398 子 【开发】【1.4】跨服竞技场 / 【前端】【1.4】跨服竞技场开发
---
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
index 60ce934..336082f 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -29,6 +29,7 @@
public void OnBeforePlayerDataInitialize()
{
+ TimeMgr.Instance.OnMinuteEvent -= UpdateMinute;
dungeonModel.updateMissionEvent -= UpdateFBHelp;
rewardModel.CrossRealmPKAwardStateUpdate -= UpdateDayAwardState;
CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdateDayAwardState;
@@ -49,11 +50,12 @@
public void OnPlayerLoginOk()
{
+ TimeMgr.Instance.OnMinuteEvent += UpdateMinute;
rewardModel.CrossRealmPKAwardStateUpdate += UpdateDayAwardState;
CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdateDayAwardState;
dungeonModel.updateMissionEvent += UpdateFBHelp;
UpdateDayAwardState();
- if(IsMatching)
+ if(IsMatching && CrossServerOneVsOnePKSeason.Instance.InOpenTime())
{
SendCrossMatch(1);
}
@@ -72,6 +74,18 @@
oneVsOneHistoryDict.Clear();
}
+
+ private void UpdateMinute()
+ {
+ if (!IsMatching) return;
+
+ if(!CrossServerOneVsOnePKSeason.Instance.isSatisfyMatch)
+ {
+ IsMatching = false;
+ SendCrossMatch(0);
+ }
+ }
+
public void UpdateDayAwardState()
{
var playerInfo = CrossServerOneVsOnePlayerInfo.Instance;
--
Gitblit v1.8.0