From bbc2a85578a3b3d834fb9f5d0d214d12f40fe902 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 18 一月 2019 10:57:20 +0800
Subject: [PATCH] Merge branch 'master' into StrangleGodBoss

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

diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOnePkResult.cs b/System/CrossServerOneVsOne/CrossServerOneVsOnePkResult.cs
index 7a60a6a..674b22e 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOnePkResult.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOnePkResult.cs
@@ -38,7 +38,7 @@
             this.RoundCount = pKOverInfo.RoundCount;
             this.RoundWinnerIDs = pKOverInfo.RoundWinnerID;
             this.AddScore = pKOverInfo.AddScore;
-            this.CurScore = pKOverInfo.Score;
+            this.CurScore = (int)pKOverInfo.Score;
             this.DanLV = pKOverInfo.DanLV;
             this.WinStreak = pKOverInfo.CWinCnt;
             this.VsPlayerName = pKOverInfo.TagName;

--
Gitblit v1.8.0