From e2c7e29df3a12ea6b191f60fa4a4d7a7c9b22f0a Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 13 十二月 2018 11:57:47 +0800
Subject: [PATCH] 5398 子 【开发】【1.4】跨服竞技场 / 【前端】【1.4】跨服竞技场开发
---
System/CrossServerOneVsOne/CrossServerWin.cs | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerWin.cs b/System/CrossServerOneVsOne/CrossServerWin.cs
index af4ee06..1a808d2 100644
--- a/System/CrossServerOneVsOne/CrossServerWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerWin.cs
@@ -27,7 +27,8 @@
[SerializeField] Button arenaBtn;
[SerializeField] Button seasonAwardBtn;
[SerializeField] Button honorStoreBtn;
-
+ CrossServerRewardModel m_CrossServerRewardModel;
+ CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } }
CrossServerModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerModel>(); } }
#region Built-in
protected override void BindController()
@@ -61,7 +62,7 @@
protected override void OnAfterOpen()
{
-
+
}
protected override void OnPreClose()
@@ -79,7 +80,7 @@
var playerData = PlayerDatas.Instance.baseData;
headImg.SetSprite(GeneralDefine.GetOtherJobHeadPortrait(playerData.Job, 0));
nameText.text = playerData.PlayerName;
- lvText.text = StringUtility.Contact("Lv.",playerData.LV);
+ lvText.text = StringUtility.Contact("Lv.", playerData.LV);
scoreSlider.minValue = 0;
scoreSlider.maxValue = 1;
UpdateScore();
@@ -94,7 +95,7 @@
curScoreText.text = crossServerModel.curScore.ToString();
int maxScore = 0;
bool isMaxRank = crossServerModel.TryGetMaxRank(out maxScore);
- if(!isMaxRank)
+ if (!isMaxRank)
{
scorePerText.text = StringUtility.Contact(crossServerModel.curScore, "/", maxScore);
scoreSlider.value = (float)crossServerModel.curScore / maxScore;
@@ -139,7 +140,14 @@
private void ClickArena()
{
CloseSubWindows();
- WindowCenter.Instance.Open<CrossServerArenaWin>();
+ if (crossServerRewardModel.IsOpenMatch)
+ {
+ WindowCenter.Instance.Open<MatchWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<CrossServerArenaWin>();
+ }
}
private void ClickRankAward()
@@ -173,6 +181,7 @@
WindowCenter.Instance.CloseImmediately<RankingWin>();
WindowCenter.Instance.CloseImmediately<SeasonRewardWin>();
WindowCenter.Instance.CloseImmediately<SegmentRewardWin>();
+ WindowCenter.Instance.CloseImmediately<MatchWin>();
}
#endregion
}
--
Gitblit v1.8.0