diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua index 33b179eed2..a8b01358cc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua @@ -11,7 +11,7 @@ function this.InitMonthCardData(data) monthCardData = {} --LogError("月卡信息初始化 "..#data) for i = 1, #data do - --LogError("月卡信息初始化 "..data[i].id.." "..data[i].endingTime.." "..data[i].state) + LogError("月卡信息初始化 "..data[i].id.." "..data[i].endingTime.." "..data[i].state) local singleMonthCard = {} singleMonthCard.id = data[i].id singleMonthCard.endingTime = data[i].endingTime --周卡月卡结束时间 @@ -35,6 +35,7 @@ function this.UpdateMonthCardData(msg) monthCardData = {} local _CurActive = {} for i = 1, #msg.monthinfos do + LogError("999999999999") --LogError("月卡信息推送 "..msg.monthinfos[i].id.." "..msg.monthinfos[i].endingTime.." "..msg.monthinfos[i].state) local singleMonthCard = {} singleMonthCard.id = msg.monthinfos[i].id @@ -104,14 +105,30 @@ function this.SetMonthCardGetStateData(type,state) end --后端设置月卡领取状态数据 datas已领取的月卡id 五点刷新 function this.BackSetMonthCardGetStateData(datas) + -- for i = 1, #monthCardData do + -- if monthCardData[i] then--0 未领取 1 已领取 + -- if datas[i] then + -- --LogError("datas[i]===="..datas[i]) + -- LogError("8888888888888888") + -- monthCardData[i].state = 1 + -- else + -- monthCardData[i].state = 0 + -- end + -- end + -- end for i = 1, #monthCardData do if monthCardData[i] then--0 未领取 1 已领取 - if datas[i] then - monthCardData[i].state = 1 - else - monthCardData[i].state = 0 + if monthCardData[i].state==2 then + monthCardData[i].state=1 end end + if datas[i] then + -- monthCardData[i].state=0 + LogError("66666666666") + end + if PlayerManager.serverTime>=monthCardData[i].endingTime then + monthCardData[i].state=0 + end end --事件 CheckRedPointStatus(RedPointType.MonthCard) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua index 2586905fb2..6181daad45 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua @@ -76,11 +76,13 @@ end --添加事件监听(用于子类重写) function MonthCardPage:AddListener() Game.GlobalEvent:AddEvent(GameEvent.MoneyPay.OnPayResultSuccess, self.BuySuccess) + Game.GlobalEvent:AddEvent(GameEvent.MonthCard.OnMonthCardUpdate, MonthCardPage.RefreshStoneShow) end --移除事件监听(用于子类重写) function MonthCardPage:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.MoneyPay.OnPayResultSuccess, self.BuySuccess) + Game.GlobalEvent:RemoveEvent(GameEvent.MonthCard.OnMonthCardUpdate, MonthCardPage.RefreshStoneShow) end --界面打开时调用(用于子类重写) @@ -112,6 +114,16 @@ function MonthCardPage:RefreshStoneShow(index) end end +function MonthCardPage.RefreshStoneShow2() + LogError("刷新月卡") + self.curAllMonthCardData = MonthCardManager.GetMonthCardData() + --月卡 + for i = 1, #self.cardPres do + self:SetCardShow(i) + end +end + + function MonthCardPage:SetCardShow(i) local cardType=cardData[i].cardType local monthCardData=self.curAllMonthCardData[cardType]