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/CrossServerOneVsOnePKSeason.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerPKSeason.cs b/System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs
similarity index 97%
rename from System/CrossServerOneVsOne/CrossServerPKSeason.cs
rename to System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs
index 696aafa..cd63b2b 100644
--- a/System/CrossServerOneVsOne/CrossServerPKSeason.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
[XLua.Hotfix]
- public class CrossServerPKSeason : Singleton<CrossServerPKSeason>
+ public class CrossServerOneVsOnePKSeason : Singleton<CrossServerOneVsOnePKSeason>
{
public int ZoneCount { get; private set;} // 鎵�鏈夎禌鍖轰釜鏁�
@@ -94,9 +94,9 @@
private bool stepDateNotify = false;
public const int dailyQuestId = 31;
DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }
- CrossServerModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerModel>(); } }
+ CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }
- public CrossServerPKSeason()
+ public CrossServerOneVsOnePKSeason()
{
GlobalTimeEvent.Instance.secondEvent += SecondEvent;
}
--
Gitblit v1.8.0