diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua index 520251b770..9b3632ec41 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua @@ -109,6 +109,7 @@ end this.refresh = function() this:topBar() this:showTaskList() + CheckRedPointStatus(RedPointType.QinglongSerectTreasure) end --topBar按钮状态 diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua index b175b4732d..3fe62d71d0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua @@ -146,6 +146,7 @@ function this.refresh(type) this:SetSelect() this:ShowTime(type) this:showTaskList(type) + CheckRedPointStatus(RedPointType.QinglongSerectTreasureTrail) end @@ -169,7 +170,7 @@ function this:SingleTask(go, rewardSingleData) local titleText = Util.GetGameObject(activityRewardGo, "content"):GetComponent("Text") titleText.text = sConFigData.show local rewardText = Util.GetGameObject(activityRewardGo, "reward"):GetComponent("Text") - rewardText.text = sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])] .."/次" + rewardText.text = sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name .."/次" local getRewardProgress = Util.GetGameObject(activityRewardGo.gameObject, "getRewardProgress"):GetComponent("Text") local state = sConFigData.state local value = sConFigData.taskValue[2][1] @@ -183,7 +184,7 @@ function this:SingleTask(go, rewardSingleData) lingquButton:GetComponent("Image").sprite = Util.LoadSprite(type[state].sprite) text.text = type[state].text if state == 1 then - text.text = sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])] + text.text = sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name end Util.AddOnceClick(lingquButton, function() if state == 1 then diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua index 298d218712..0c677b2337 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua @@ -58,15 +58,17 @@ function this.UpdateTreasureState() end end local TreasureRewardState = ActivityGiftManager.GetActivityTypeInfo(8) - --state -2 未达成 -1 普通和额外全部领取 0未领取 1激活秘宝,可以再次领取 - if TreasureRewardState.mission then - for k,v in ipairs(TreasureRewardState.mission) do - if level >= v.missionId then - rewardData[v.missionId].state = v.state - else - rewardData[v.missionId].state = -2 - end - end + if TreasureRewardState then + --state -2 未达成 -1 普通和额外全部领取 0未领取 1激活秘宝,可以再次领取 + if TreasureRewardState.mission then + for k,v in ipairs(TreasureRewardState.mission) do + if level >= v.missionId then + rewardData[v.missionId].state = v.state + else + rewardData[v.missionId].state = -2 + end + end + end end end @@ -149,6 +151,10 @@ function this.GetQinglongTaskData(_curtype) end function this.GetQinglongSerectTreasureRedPot() + local id =ActivityGiftManager.GetActivityIdByType(8) + if not ActivityGiftManager.GetActivityOpenStatus(id) then + return false + end local state = this.GetTreasureState() for i, v in pairs(rewardData) do if i ~= 0 then @@ -161,6 +167,10 @@ function this.GetQinglongSerectTreasureRedPot() end function this.GetSerectTreasureTrailRedPot() + local id =ActivityGiftManager.GetActivityIdByType(8) + if not ActivityGiftManager.GetActivityOpenStatus(id) then + return false + end for i = 1,2 do local task = this.GetQinglongTaskData(i) for i, v in pairs(task) do