From 5606dfb7dcd2f230e9fe09db2715fe71f7ad72f0 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 13 十二月 2018 11:05:41 +0800
Subject: [PATCH] Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server
---
System/CrossServerOneVsOne/CrossServerArenaWin.cs | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerArenaWin.cs b/System/CrossServerOneVsOne/CrossServerArenaWin.cs
index 0df7798..26f9c1b 100644
--- a/System/CrossServerOneVsOne/CrossServerArenaWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerArenaWin.cs
@@ -8,13 +8,13 @@
public class CrossServerArenaWin : Window
{
[SerializeField] Button matchBtn;
+ [SerializeField] Image matchBtn_Img;
+ [SerializeField] Text matchBtn_Text;
[SerializeField] Button dayAwardBtn;
[SerializeField] Text winRateText;
- [SerializeField] Text winNumText;
- [SerializeField] Text failNumText;
[SerializeField] Text sumNumText;
[SerializeField] Text reaminNumText;
- [SerializeField] Text dayScoreText;
+ [SerializeField] Text seasonTimeText;
[SerializeField] Text openTimeText;
CrossServerModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerModel>(); } }
@@ -25,7 +25,6 @@
}
protected override void AddListeners()
{
- matchBtn.AddListener(ClickMatch);
dayAwardBtn.AddListener(ClickDayAward);
}
@@ -53,22 +52,46 @@
{
UpdateMatchInfo();
UpdatePKInfo();
+ UpdateActivityState();
}
private void UpdateMatchInfo()
{
- dayScoreText.text = StringUtility.Contact(crossServerModel.dayGetScore,"/",crossServerModel.dayMaxScore);
reaminNumText.text = StringUtility.Contact(crossServerModel.dayMatchNum,"/",crossServerModel.dayMaxMatchNum);
}
private void UpdatePKInfo()
{
winRateText.text = StringUtility.Contact(crossServerModel.curWinRate,"%");
- winNumText.text = crossServerModel.curWinNum.ToString();
- failNumText.text = crossServerModel.curFailNum.ToString();
sumNumText.text = crossServerModel.sumBattleNum.ToString();
}
+ private void UpdateActivityState()
+ {
+ bool isInTime = false;
+ bool isOpen = false;
+ matchBtn.RemoveAllListeners();
+ if(!isInTime)
+ {
+ matchBtn_Text.text = "鍗冲皢寮�鍚�";
+ matchBtn_Img.material = MaterialUtility.GetDefaultSpriteGrayMaterial();
+ }
+ else
+ {
+ matchBtn_Text.text = "寮�濮嬪尮閰�";
+ if(isOpen)
+ {
+ matchBtn_Img.material = MaterialUtility.GetUIDefaultGraphicMaterial();
+ matchBtn.AddListener(ClickMatch);
+ }
+ else
+ {
+ matchBtn_Img.material = MaterialUtility.GetDefaultSpriteGrayMaterial();
+ }
+ }
+
+ }
+
private void ClickDayAward()
{
WindowCenter.Instance.Open<CrossServerDayAwardsWin>();
--
Gitblit v1.8.0