From d17b5a9e7728da9c4128437dbe203fae87385c87 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 28 十二月 2018 15:17:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
index afc3e7a..39ce515 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -41,6 +41,7 @@
public void OnBeforePlayerDataInitialize()
{
+ CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdatePlayerInfo;
CrossServerOneVsOnePKSeason.Instance.updateSelfSeasonEvent -= UpdateSeason;
TimeMgr.Instance.OnMinuteEvent -= UpdateMinute;
dungeonModel.updateMissionEvent -= UpdateFBHelp;
@@ -63,6 +64,7 @@
public void OnPlayerLoginOk()
{
+ CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfo;
CrossServerOneVsOnePKSeason.Instance.updateSelfSeasonEvent += UpdateSeason;
TimeMgr.Instance.OnMinuteEvent += UpdateMinute;
rewardModel.CrossRealmPKAwardStateUpdate += UpdateDayAwardState;
@@ -90,7 +92,6 @@
pkResultInfo = new CrossServerOneVsOnePkResult();
oneVsOneHistoryDict.Clear();
}
-
private void UpdateMinute()
{
@@ -134,6 +135,12 @@
private void UpdateSeason()
{
+ UpdateCrossMatchRedpoint();
+ }
+
+ private void UpdatePlayerInfo()
+ {
+ UpdateCrossDayAwardsRedpoint();
UpdateCrossMatchRedpoint();
}
@@ -532,8 +539,7 @@
var playerInfo = CrossServerOneVsOnePlayerInfo.Instance;
var pkSeason = CrossServerOneVsOnePKSeason.Instance;
- if (pkSeason.InPkSeason(TimeUtility.ServerNow)
- && pkSeason.InOpenTime()
+ if (pkSeason.isSatisfyMatch
&& playerInfo.GetDayRemainNum() > 0)
{
crossMatchRedpoint.state = RedPointState.Simple;
--
Gitblit v1.8.0