From bc74cf8e6d4a002174333532e9e955ff90872d16 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 18 十二月 2018 21:25:19 +0800
Subject: [PATCH] Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server
---
System/CrossServerOneVsOne/CrossServerArenaWin.cs | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerArenaWin.cs b/System/CrossServerOneVsOne/CrossServerArenaWin.cs
index 05d348b..17f389f 100644
--- a/System/CrossServerOneVsOne/CrossServerArenaWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerArenaWin.cs
@@ -16,6 +16,8 @@
[SerializeField] Text reaminNumText;
[SerializeField] Text seasonTimeText;
[SerializeField] Text openTimeText;
+ [SerializeField] Button buyTimesBtn;
+
CrossServerRewardModel m_CrossServerRewardModel;
CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } }
CrossServerModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerModel>(); } }
@@ -28,11 +30,12 @@
{
dayAwardBtn.AddListener(ClickDayAward);
matchBtn.AddListener(ClickMatch);
+ buyTimesBtn.AddListener(ClickBuyTimes);
}
protected override void OnPreOpen()
{
-
+ SetDisplay();
}
protected override void OnAfterOpen()
@@ -59,7 +62,15 @@
private void UpdateMatchInfo()
{
- reaminNumText.text = StringUtility.Contact(crossServerModel.dayMatchNum,"/",crossServerModel.dayMaxMatchNum);
+ int remainNum = crossServerModel.alreadyBuyNum + crossServerModel.freeMaxMatchNum - crossServerModel.dayMatchNum;
+ if (remainNum > 0)
+ {
+ reaminNumText.text = StringUtility.Contact(UIHelper.AppendStringColor(TextColType.Green,remainNum.ToString()), "/", crossServerModel.freeMaxMatchNum);
+ }
+ else
+ {
+ reaminNumText.text = StringUtility.Contact(UIHelper.AppendStringColor(TextColType.Red, remainNum.ToString()), "/", crossServerModel.freeMaxMatchNum);
+ }
}
private void UpdatePKInfo()
@@ -94,6 +105,15 @@
}
+
+ private void ClickBuyTimes()
+ {
+ int remainNum = crossServerModel.alreadyBuyNum + crossServerModel.freeMaxMatchNum - crossServerModel.dayMatchNum;
+ if (remainNum >= crossServerModel.freeMaxMatchNum) return;
+
+ WindowCenter.Instance.Open<CrossSeverBuyMatchTimesWin>();
+ }
+
private void ClickDayAward()
{
WindowCenter.Instance.Open<CrossServerDayAwardsWin>();
--
Gitblit v1.8.0