From 336c229f0b32edc4d1dfd3579eb70c5bae142286 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 24 十二月 2018 12:00:53 +0800
Subject: [PATCH] Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server

---
 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/System/CrossServerOneVsOne/CrossServerModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
similarity index 90%
rename from System/CrossServerOneVsOne/CrossServerModel.cs
rename to System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
index 1b2dc54..40b15f0 100644
--- a/System/CrossServerOneVsOne/CrossServerModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -9,10 +9,10 @@
 {
     [XLua.Hotfix]
     [XLua.LuaCallCSharp]
-    public class CrossServerModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize,ISwitchAccount ,IPlayerLoginOk
+    public class CrossServerOneVsOneModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize,ISwitchAccount ,IPlayerLoginOk
     {
         public string PkResultLocalSaveKey { get; private set; }
-        public List<CrossServerPkResult> localSaveResults { get; private set; }
+        public List<CrossServerOneVsOnePkResult> localSaveResults { get; private set; }
         CrossServerRewardModel rewardModel { get { return ModelCenter.Instance.GetModel<CrossServerRewardModel>(); } }
         public event Action UpdateDayAwardsEvent;
         public const int CrossServerDataMapId = 32010;
@@ -31,7 +31,7 @@
         {
             dungeonModel.updateMissionEvent -= UpdateFBHelp;
             rewardModel.CrossRealmPKAwardStateUpdate -= UpdateDayAwardState;
-            CrossServerPlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdateDayAwardState;
+            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdateDayAwardState;
             InitData();
         }
 
@@ -50,7 +50,7 @@
         public void OnPlayerLoginOk()
         {
             rewardModel.CrossRealmPKAwardStateUpdate += UpdateDayAwardState;
-            CrossServerPlayerInfo.Instance.UpdatePlayerInfoEvent += UpdateDayAwardState;
+            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdateDayAwardState;
             dungeonModel.updateMissionEvent += UpdateFBHelp;
             UpdateDayAwardState();
             if(IsMatching)
@@ -66,14 +66,14 @@
 
         private void InitData()
         {
-            CrossServerPKSeason.Instance.InitData();
-            CrossServerPlayerInfo.Instance.InitData();
-            pkResultInfo = new CrossServerPkResult();
+            CrossServerOneVsOnePKSeason.Instance.InitData();
+            CrossServerOneVsOnePlayerInfo.Instance.InitData();
+            pkResultInfo = new CrossServerOneVsOnePkResult();
         }
 
         public void UpdateDayAwardState()
         {
-            var playerInfo = CrossServerPlayerInfo.Instance;
+            var playerInfo = CrossServerOneVsOnePlayerInfo.Instance;
             for(int i = 0; i < dayAwardTypelist.Count; i++)
             {
                 var dayAward = dayAwardTypelist[i];
@@ -105,9 +105,9 @@
             var mission = dungeonModel.mission;
             if(mission.prepareTime > 0)
             {
-                if(!WindowCenter.Instance.IsOpen<CrossServerRoundWin>())
+                if(!WindowCenter.Instance.IsOpen<CrossServerOneVsOneRoundWin>())
                 {
-                    WindowCenter.Instance.Open<CrossServerRoundWin>();
+                    WindowCenter.Instance.Open<CrossServerOneVsOneRoundWin>();
                 }
             }
 
@@ -279,11 +279,11 @@
         #endregion
 
         #region 鍗忚
-        public CrossServerPkResult pkResultInfo { get; private set;}
+        public CrossServerOneVsOnePkResult pkResultInfo { get; private set;}
         public event Action UpdatePkResultEvent;
         public void UpdatePKResultInfo(HC003_tagGCCrossRealmPKOverInfo pKOverInfo)
         {
-            pkResultInfo = new CrossServerPkResult();
+            pkResultInfo = new CrossServerOneVsOnePkResult();
             pkResultInfo.UpdatePkResult(pKOverInfo);
             SetPkInfoLocalSave(pkResultInfo);
             if(UpdatePkResultEvent != null)
@@ -314,19 +314,19 @@
 
         private void GetLocalSaveData()
         {
-            localSaveResults = new List<CrossServerPkResult>();
+            localSaveResults = new List<CrossServerOneVsOnePkResult>();
             string[] localJsons = LocalSave.GeStringArray(PkResultLocalSaveKey);
             if(localJsons != null)
             {
                 for(int i = 0; i < localJsons.Length; i++)
                 {
-                    CrossServerPkResult resultInfo = JsonMapper.ToObject<CrossServerPkResult>(localJsons[i]);
+                    CrossServerOneVsOnePkResult resultInfo = JsonMapper.ToObject<CrossServerOneVsOnePkResult>(localJsons[i]);
                     localSaveResults.Add(resultInfo);
                 }
             }
         }
 
-        public void SetPkInfoLocalSave(CrossServerPkResult resultInfo)
+        public void SetPkInfoLocalSave(CrossServerOneVsOnePkResult resultInfo)
         {
             if (localSaveResults.Count >= 30)
             {
@@ -353,8 +353,8 @@
         public Redpoint crossMatchRedpoint = new Redpoint(CrossArenaRedKey, CrossMatchRedKey);
         public void UpdateCrossArenaRedpoint()
         {
-            var playerInfo = CrossServerPlayerInfo.Instance;
-            var pkSeason = CrossServerPKSeason.Instance;
+            var playerInfo = CrossServerOneVsOnePlayerInfo.Instance;
+            var pkSeason = CrossServerOneVsOnePKSeason.Instance;
 
             if(pkSeason.InDay(TimeUtility.ServerNow) 
                 && pkSeason.InOpenTime()

--
Gitblit v1.8.0