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/CrossServerOneVsOnePkResult.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerPkResult.cs b/System/CrossServerOneVsOne/CrossServerOneVsOnePkResult.cs
similarity index 94%
rename from System/CrossServerOneVsOne/CrossServerPkResult.cs
rename to System/CrossServerOneVsOne/CrossServerOneVsOnePkResult.cs
index 81b3c8a..fc7150d 100644
--- a/System/CrossServerOneVsOne/CrossServerPkResult.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOnePkResult.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
[XLua.Hotfix]
- public class CrossServerPkResult
+ public class CrossServerOneVsOnePkResult
{
public string PkEndTime { get; private set; } // 缁撶畻鏃堕棿锛屾牸寮� yyyy-MM-dd HH:mm:ss
@@ -28,7 +28,7 @@
public string VsPlayerName { get; private set; } //瀵规墜鍚嶅瓧
- CrossServerModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerModel>(); } }
+ CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }
public void UpdatePkResult(HC003_tagGCCrossRealmPKOverInfo pKOverInfo)
{
--
Gitblit v1.8.0