From d930e85ecc496307fd2e1bd21add1808e44849b8 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 26 十二月 2018 15:41:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Cross_Server' into 【1.4】王者法宝
---
System/CrossServerOneVsOne/CrossSeverOneVsOneDayAwardCell.cs | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossSeverOneVsOneDayAwardCell.cs b/System/CrossServerOneVsOne/CrossSeverOneVsOneDayAwardCell.cs
index ae054fb..8c5ae8e 100644
--- a/System/CrossServerOneVsOne/CrossSeverOneVsOneDayAwardCell.cs
+++ b/System/CrossServerOneVsOne/CrossSeverOneVsOneDayAwardCell.cs
@@ -50,8 +50,6 @@
private void DisplayDayAward()
{
var awardItems = awardType.awardItems;
- stateImg.gameObject.SetActive(awardType.progress != CrossServerOneVsOneModel.AwardType.CompleteProgress.Completed);
- recieveBtn.gameObject.SetActive(awardType.progress == CrossServerOneVsOneModel.AwardType.CompleteProgress.Completed);
progressSlider.minValue = 0;
progressSlider.maxValue = awardType.num;
progressSlider.value = awardType.curCompletedNum;
@@ -77,10 +75,24 @@
switch(awardType.type)
{
case 1:
- taskNameText.text = Language.Get("CrossServer116",awardType.curCompletedNum);
+ taskNameText.text = Language.Get("CrossServer116",awardType.num);
break;
case 2:
- taskNameText.text = Language.Get("CrossServer117", awardType.curCompletedNum);
+ taskNameText.text = Language.Get("CrossServer117", awardType.num);
+ break;
+ }
+
+ stateImg.gameObject.SetActive(awardType.progress != CrossServerOneVsOneModel.AwardType.CompleteProgress.Completed);
+ recieveBtn.gameObject.SetActive(awardType.progress == CrossServerOneVsOneModel.AwardType.CompleteProgress.Completed);
+ switch (awardType.progress)
+ {
+ case CrossServerOneVsOneModel.AwardType.CompleteProgress.Completed:
+ break;
+ case CrossServerOneVsOneModel.AwardType.CompleteProgress.UnCompleted:
+ stateImg.SetSprite("LVReward2");
+ break;
+ case CrossServerOneVsOneModel.AwardType.CompleteProgress.AlreadyReceived:
+ stateImg.SetSprite("LVReward1");
break;
}
}
--
Gitblit v1.8.0