diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index b0f64b72f1..c4a4834c36 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -679,11 +679,10 @@ function this.GetSong10WanRedPoint() if miss.state==1 then return true end - if lastState>0 and miss.state==0 then + if lastState>0 and miss.state==0 and miss.progress>=0 then local zhenConfig=ConfigManager.GetConfigData(ConfigName.SuperZhenChong,miss.missionId) if zhenConfig then if GetTimeStamp()-this.loginTime+miss.progress>=zhenConfig.Time then - return true end end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua index f8eb87c10c..b0ae926b8f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua @@ -41,6 +41,7 @@ function GMSong10WanPanel:BindEvent() NetManager.GetActivityRewardRequest(0,11201,function(msg) UIManager.OpenPanel(UIName.RewardItemPopup, msg, 1,function () isCanGet=false + this.getRed:SetActive(false) self:OnShow() end) end) @@ -99,7 +100,7 @@ function GMSong10WanPanel:OnShow() local state=activityData.mission[i].state dayList[aaa.day].reward.state=state local progress=activityData.mission[i].progress - if lastState~=0 then + if lastState~=0 and progress>=0 then lineTime=progress if state==0 and rewardTime==0 then rewardTime=aaa.Time @@ -117,31 +118,32 @@ function GMSong10WanPanel:OnShow() this.timer:Stop() this.timer = nil end - local cha=GetTimeStamp()-ActivityGiftManager.loginTime + local cha= tonumber(GetTimeStamp()-ActivityGiftManager.loginTime) local needTime=rewardTime- (lineTime+cha) + LogError("needTime=="..needTime) this.getRed:SetActive(false) - if needTime>0 then + if needTime>=0 then this.timeTxt.gameObject:SetActive(true) this.timer = Timer.New(function () + --LogError("needTime=="..needTime) needTime=needTime-1 - if needTime==0 then + if needTime<=0 then isCanGet=true this.timeTxt.text = "有可领取奖励" + this.getRed:SetActive(true) + this.timer:Stop() + this.timer = nil else this.timeTxt.text = string.format("领取倒计时:".."%s",TimeToFelaxible(needTime)) end - --if state==1 then - - -- elseif state==2 then - -- this.leftTimeTxt.text = string.format(Language[10512].."%s",TimeToFelaxible(time)) - -- elseif state==3 then - -- this.leftTimeTxt.text = "活动已结束" - --end end,1,-1,true) this.timer:Start() else - isCanGet=true + if rewardTime~=0 then + isCanGet=true + + end this.timeTxt.gameObject:SetActive(false) end this.scrollView:SetData(dayList,function(index, rewardItem) @@ -195,6 +197,7 @@ end --界面关闭时调用(用于子类重写) function GMSong10WanPanel:OnClose() allValue=0 + rewardTime=0 CheckRedPointStatus(RedPointType.song10Wan) end --界面销毁时调用(用于子类重写)