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/CrossServerOneVsOneArenaWin.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerArenaWin.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
similarity index 88%
rename from System/CrossServerOneVsOne/CrossServerArenaWin.cs
rename to System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
index 7ecd50b..a7b89fe 100644
--- a/System/CrossServerOneVsOne/CrossServerArenaWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
[XLua.Hotfix]
- public class CrossServerArenaWin : Window
+ public class CrossServerOneVsOneArenaWin : Window
{
[SerializeField] Button scoreRankBtn;
[SerializeField] Button matchBtn;
@@ -24,7 +24,7 @@
[SerializeField] GameObject outSeasonTimeObj;
[SerializeField] GameObject lookPlayerObj;
[SerializeField] Text lookTimeText;
- CrossServerModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerModel>(); } }
+ CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }
#region Built-in
protected override void BindController()
@@ -70,7 +70,7 @@
UpdatePKInfo();
UpdateActivityState();
UpdateLookPlayerTime();
- var pkSeason = CrossServerPKSeason.Instance;
+ var pkSeason = CrossServerOneVsOnePKSeason.Instance;
seasonTimeText.text = pkSeason.ToDisplaySeasonTime();
var openTimes = pkSeason.GetActivityTimes();
openTimeText.gameObject.SetActive(openTimes != null && openTimes.Count > 0);
@@ -99,7 +99,7 @@
private void UpdateMatchInfo()
{
- int remainNum = CrossServerPlayerInfo.Instance.GetDayRemainNum();
+ int remainNum = CrossServerOneVsOnePlayerInfo.Instance.GetDayRemainNum();
if (remainNum > 0)
{
reaminNumText.text = StringUtility.Contact(UIHelper.AppendStringColor(TextColType.Green,remainNum.ToString()), "/", crossServerModel.freeMaxMatchNum);
@@ -112,9 +112,9 @@
private void UpdatePKInfo()
{
- winRateText.text = CrossServerPlayerInfo.Instance.DisplayWinningRate();
- sumNumText.text = CrossServerPlayerInfo.Instance.PKCount.ToString();
- winStreakText.text = CrossServerPlayerInfo.Instance.CWinCount.ToString();
+ winRateText.text = CrossServerOneVsOnePlayerInfo.Instance.DisplayWinningRate();
+ sumNumText.text = CrossServerOneVsOnePlayerInfo.Instance.PKCount.ToString();
+ winStreakText.text = CrossServerOneVsOnePlayerInfo.Instance.CWinCount.ToString();
}
private void UpdateMinute()
@@ -191,15 +191,15 @@
private void ClickBuyTimes()
{
- int remainNum = CrossServerPlayerInfo.Instance.GetDayRemainNum();
+ int remainNum = CrossServerOneVsOnePlayerInfo.Instance.GetDayRemainNum();
if (remainNum >= crossServerModel.freeMaxMatchNum) return;
- WindowCenter.Instance.Open<CrossSeverBuyMatchTimesWin>();
+ WindowCenter.Instance.Open<CrossSeverOneVsOneBuyMatchTimesWin>();
}
private void ClickDayAward()
{
- WindowCenter.Instance.Open<CrossServerDayAwardsWin>();
+ WindowCenter.Instance.Open<CrossServerOneVsOneDayAwardsWin>();
}
@@ -229,7 +229,7 @@
private void ClickMatchRecord()
{
- WindowCenter.Instance.Open<CrossMatchRecordWin>();
+ WindowCenter.Instance.Open<CrossServerOneVsOneMatchRecordWin>();
}
}
--
Gitblit v1.8.0