From fb51497d388da32bf7047093674a3585794599ba Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 7 May 2021 18:05:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=B4=BB=E5=8A=A8=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/DynamicTaskPage.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua index d233eb4b5d..878bea0dfb 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua @@ -218,9 +218,13 @@ function this.SingleDataShow(pre,value) local activityRewardGo = pre activityRewardGo:SetActive(true) local sConFigData = value - + local state = sConFigData.state local titleText = Util.GetGameObject(activityRewardGo, "title"):GetComponent("Text") - titleText.text = sConFigData.title.."("..(sConFigData.progress > sConFigData.value and sConFigData.value or sConFigData.progress) .."/"..sConFigData.value..")" + if state == 2 or state == 1 then + titleText.text = sConFigData.title.."(".. sConFigData.value .."/"..sConFigData.value..")" + else + titleText.text = sConFigData.title.."(".. (sConFigData.progress > sConFigData.value and sConFigData.value or sConFigData.progress).."/"..sConFigData.value..")" + end local missionText = Util.GetGameObject(activityRewardGo, "mission"):GetComponent("Text") missionText.text = sConFigData.content local timeText = Util.GetGameObject(activityRewardGo, "btn/Text") @@ -236,7 +240,7 @@ function this.SingleDataShow(pre,value) local lingquButton = Util.GetGameObject(activityRewardGo.gameObject, "btn") --0-未完成，1-完成未领取 2-已领取 - local state = sConFigData.state + timeText:SetActive(state == 0) local red = Util.GetGameObject(lingquButton.gameObject, "redPoint")