diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua index cf46906fce..4c33a3f639 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua @@ -63,9 +63,9 @@ function this:AddListener() end function this:RemoveListener() - Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.BuyQinglongSerectLevelSuccess, this.refresh) - Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.RechargeQinglongSerectSuccess, this.refresh) - Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose,this.Closefunction) + Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.BuyQinglongSerectLevelSuccess) + Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.RechargeQinglongSerectSuccess) + Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose) end this.Closefunction = function() Timer.New(function() diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua index c5b8b3a76a..944f3e20a0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua @@ -2,7 +2,7 @@ QinglongSerectTreasureManager = {} local this = QinglongSerectTreasureManager local TreasureSunlongConfig = ConfigManager.GetConfig(ConfigName.TreasureSunlongConfig) local TreasureSunLongTaskConfig = ConfigManager.GetConfig(ConfigName.TreasureSunLongTaskConfig) -local rewardData = {}--表内活动任务数据 +this.rewardData = {}--表内活动任务数据 local taskData = {} this.scoreId = 0 this.score = 0 @@ -14,19 +14,19 @@ function this.Initialize() end function this.InitializeData() - rewardData = {} + this.rewardData = {} taskData = {} this.scoreId = TreasureSunlongConfig[1].Integral[1][1] for i, v in ConfigPairs(TreasureSunlongConfig) do - rewardData[v.Level] = {} - rewardData[v.Level].level = v.Level - rewardData[v.Level].activityId = v.ActivityId + this.rewardData[v.Level] = {} + this.rewardData[v.Level].level = v.Level + this.rewardData[v.Level].activityId = v.ActivityId if v.Integral then - rewardData[v.Level].needScore = v.Integral[1][2] + this.rewardData[v.Level].needScore = v.Integral[1][2] else - rewardData[v.Level].needScore = 0 + this.rewardData[v.Level].needScore = 0 end - rewardData[v.Level].Reward = {} + this.rewardData[v.Level].Reward = {} local temp = {} if v.Reward then for n,m in ipairs(v.Reward) do @@ -38,7 +38,7 @@ function this.InitializeData() table.insert(temp,{ type = 2,item = { m[1] , m[2] } }) end end - rewardData[v.Level].Reward = temp + this.rewardData[v.Level].Reward = temp end for i, v in ConfigPairs(TreasureSunLongTaskConfig) do if not taskData[v.Type] then @@ -56,27 +56,37 @@ end function this.UpdateTreasureState() local level = this.GetLevel() - for k,v in pairs(rewardData) do - if level > k then + for k,v in pairs(this.rewardData) do + if level < k then v.state = -2 - else - v.state = 0 end end this.activityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody) local TreasureRewardState = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TreasureOfSomeBody) if TreasureRewardState and TreasureRewardState.mission then --state -2 未达成 -1 普通和额外全部领取 0未领取 1激活秘宝,可以再次领取 - for k,v in ipairs(TreasureRewardState.mission) do + for k,v in ipairs(TreasureRewardState.mission) do if v and level >= v.missionId then - rewardData[v.missionId].state = v.state - else - rewardData[v.missionId].state = -2 + this.rewardData[v.missionId].state = v.state + else + this.rewardData[v.missionId].state = -2 end end end end + +function this.UpdateTreasureState2() + local level = this.GetLevel() + for k,v in pairs(this.rewardData) do + if level < k then + v.state = -2 + elseif v.state == -2 then + v.state = 0 + end + end +end + function this.UpdateTrailWeekTime(msg) LogRed("msg.weekTime:"..msg.weekTime) this.traiWeekTime = msg.weekTime @@ -114,12 +124,13 @@ function this.GetScore() end function this.SetSingleRewardState(id,state) - rewardData[id].state = state + this.rewardData[id].state = state + LogBlue("SetSingleRewardState:id:"..id.." state:"..state) end function this.GetAllRewardData() local temp ={} - for i, v in pairs(rewardData) do + for i, v in pairs(this.rewardData) do if i ~= 0 and v.activityId == this.activityId then table.insert(temp,v) end @@ -128,7 +139,7 @@ function this.GetAllRewardData() end function this.GetRewardData(lv) - return rewardData[lv] + return this.rewardData[lv] end function this.SetLevel(_level) @@ -159,7 +170,7 @@ function this.GetQinglongSerectTreasureRedPot() return false end local state = this.GetTreasureState() - for i, v in pairs(rewardData) do + for i, v in pairs(this.rewardData) do if i ~= 0 then if v.state == 0 or (v.state == 1 and state > 0) then return true diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index c21474a8e3..194f3a252d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -642,7 +642,7 @@ function this.RefreshTreasureLevel(buffer) msg:ParseFromString(data) LogGreen("青龙秘宝等级更新了:"..msg.level) QinglongSerectTreasureManager.SetLevel(msg.level) - QinglongSerectTreasureManager.UpdateTreasureState() + QinglongSerectTreasureManager.UpdateTreasureState2() end --幸运转盘 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua index a6a927c035..b97bf6122a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua @@ -61,7 +61,7 @@ function this:OnShow(_parent,...) rewardData = QinglongSerectTreasureManager.GetAllRewardData() this:showRewardQinglong() end - this.tip.text = "解锁高阶战令,激活进阶专属奖励+直升15级解锁立获限定称号+限定气泡" + this.tip.text = "解锁高阶战令,激活进阶专属奖励+直升15级" end --充值成功