From bcb0514a75dd684e041e4f17081311cd086bafb6 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 21 十二月 2018 09:33:39 +0800
Subject: [PATCH] Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server
---
System/CrossServerOneVsOne/CrossServerRewardModel.cs | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerRewardModel.cs b/System/CrossServerOneVsOne/CrossServerRewardModel.cs
index 4505893..a420295 100644
--- a/System/CrossServerOneVsOne/CrossServerRewardModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerRewardModel.cs
@@ -35,13 +35,14 @@
}
public enum CrossRealmPKAwardStateEnum
{
- DayPKCountAwardState=1,
- DayWinCountAwardState=2,
- DanLVAwardState=3,
- SeasonAwardState=4,
+ DayPKCountAwardState = 1,
+ DayWinCountAwardState = 2,
+ DanLVAwardState = 3,
+ SeasonAwardState = 4,
}
public class CrossServerRewardModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
+ CrossServerModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerModel>(); } }
public Dictionary<int, SeasonAwardClass> SegmentRewardDic = new Dictionary<int, SeasonAwardClass>();
public ImpactRankModel.RankAwardItem SeasonRewardDic = new ImpactRankModel.RankAwardItem();
public Dictionary<int, RankingInformationClass> RankInformationDic = new Dictionary<int, RankingInformationClass>();
@@ -70,11 +71,12 @@
public void OnBeforePlayerDataInitialize()
{
-
+ crossServerModel.UpdatePkResultEvent -= UpdatePkResultEvent;
}
public void OnPlayerLoginOk()
{
+ crossServerModel.UpdatePkResultEvent += UpdatePkResultEvent;
}
@@ -83,7 +85,13 @@
{
}
-
+ private void UpdatePkResultEvent()
+ {
+ if (IsCrossServer())//鍓湰缁撶畻鐣岄潰
+ {
+ WindowCenter.Instance.Open<CrossServerSettlementWin>();
+ }
+ }
private void GetSeasonAward()
{
var config = Config.Instance.GetAllValues<CrossServerArenaConfig>();
@@ -131,9 +139,9 @@
}
SeasonRewardDic = _award;
}
- public void ResetTime()
+ public void ResetTime()
{
- Date_Time= TimeUtility.ServerNow;
+ Date_Time = TimeUtility.ServerNow;
}
public void CrossRealmPKAwardState(HC102_tagMCCrossRealmPKAwardState info)//c102璺ㄦ湇PK鐜╁濂栧姳璁板綍
{
@@ -176,7 +184,7 @@
break;
}
}
- return _bool;
+ return _bool;
}
public void CrossRealmPKGetAward(CrossRealmPKAwardStateEnum _cross, int Index)//棰嗗鍙戝寘
@@ -187,6 +195,16 @@
GameNetSystem.Instance.SendInfo(c103);
}
+ public bool IsCrossServer()//鏄惁鍐嶈法鏈嶅壇鏈腑
+ {
+ bool _bool = false;
+ int mapId = PlayerDatas.Instance.baseData.MapID;
+ if (mapId == 32010 || mapId == 32011)
+ {
+ _bool = true;
+ }
+ return _bool;
+ }
}
--
Gitblit v1.8.0