From fa456af06ddef00145aff72bdee795390c78586e Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 14 二月 2019 17:27:52 +0800
Subject: [PATCH] 6197 【前端】【1.6】跨服匹配玩法

---
 System/CrossServerOneVsOne/CrossServerOneVsOnePkResult.cs |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOnePkResult.cs b/System/CrossServerOneVsOne/CrossServerOneVsOnePkResult.cs
index 674b22e..09975f1 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOnePkResult.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOnePkResult.cs
@@ -32,16 +32,29 @@
 
         public void UpdatePkResult(HC003_tagGCCrossRealmPKOverInfo pKOverInfo)
         {
-            this.PkEndTime = pKOverInfo.TimeStr;
-            this.OverType = pKOverInfo.OverType;
-            this.WinnerID = (int)pKOverInfo.WinnerID;
-            this.RoundCount = pKOverInfo.RoundCount;
-            this.RoundWinnerIDs = pKOverInfo.RoundWinnerID;
             this.AddScore = pKOverInfo.AddScore;
             this.CurScore = (int)pKOverInfo.Score;
             this.DanLV = pKOverInfo.DanLV;
             this.WinStreak = pKOverInfo.CWinCnt;
-            this.VsPlayerName = pKOverInfo.TagName;
+
+            if (ClientCrossServerOneVsOne.isClientCrossServerOneVsOne)
+            {
+                this.PkEndTime = ClientCrossServerOneVsOne.resultSupplement.endTime.ToString();
+                this.OverType = ClientCrossServerOneVsOne.resultSupplement.overType;
+                this.WinnerID = ClientCrossServerOneVsOne.resultSupplement.winPlayerId;
+                this.RoundCount = ClientCrossServerOneVsOne.resultSupplement.roundCount;
+                this.RoundWinnerIDs = ClientCrossServerOneVsOne.resultSupplement.roundWinnerId;
+                this.VsPlayerName = ClientCrossServerOneVsOne.resultSupplement.opponentName;
+            }
+            else
+            {
+                this.PkEndTime = pKOverInfo.TimeStr;
+                this.OverType = pKOverInfo.OverType;
+                this.WinnerID = (int)pKOverInfo.WinnerID;
+                this.RoundCount = pKOverInfo.RoundCount;
+                this.RoundWinnerIDs = pKOverInfo.RoundWinnerID;
+                this.VsPlayerName = pKOverInfo.TagName;
+            }
         }
 
         public void GetWinAndFailNum(out int winNum, out int failNum)

--
Gitblit v1.8.0