diff --git a/lua/app/module/activity/activity_manager.lua b/lua/app/module/activity/activity_manager.lua index 7577970f..159a7b54 100644 --- a/lua/app/module/activity/activity_manager.lua +++ b/lua/app/module/activity/activity_manager.lua @@ -52,7 +52,9 @@ function ActivityManager:reqSummerData() end function ActivityManager:rspSummerData(result) - DataManager.ActivityData:onGetActData(result.summer) + if result.summer then + DataManager.ActivityData:onGetActData(result.summer) + end end -- 请求夏日活动任务奖励 @@ -96,7 +98,7 @@ function ActivityManager:reqBuyBountyLevel() costNum = costNum, okFunc = function() local id = DataManager.ActivityData:getBountyCfg()[DataManager.ActivityData:getBountyLevel() + 1].id - Logger.logHighlight("购买战令等级:"..id) + -- Logger.logHighlight("购买战令等级:"..id) self:sendMessage(ProtoMsgType.FromMsgEnum.SummerBountyClaimByDiamondReq, {id = id}, {}, self.rspBuyBountyLevel, BIReport.ITEM_GET_TYPE.ACTIVITY_BOUNTY_LEVEL) end, } diff --git a/lua/app/ui/activity/activity_bounty_comp.lua b/lua/app/ui/activity/activity_bounty_comp.lua index d74b4ad3..111fd735 100644 --- a/lua/app/ui/activity/activity_bounty_comp.lua +++ b/lua/app/ui/activity/activity_bounty_comp.lua @@ -60,7 +60,7 @@ function ActivityBountyComp:refresh() self.imgProg.value = cur / total self.txScore:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_1)) self.txProg:setText(cur .. "/" .. total) - self.txLv:setText("LV") + self.txLv:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_12)) self.txLvNum:setText(DataManager.ActivityData:getBountyLevel()) -- 档位展示 diff --git a/lua/app/ui/activity/activity_task_comp.lua b/lua/app/ui/activity/activity_task_comp.lua index e14b20ab..ec347aa5 100644 --- a/lua/app/ui/activity/activity_task_comp.lua +++ b/lua/app/ui/activity/activity_task_comp.lua @@ -17,7 +17,7 @@ function ActivityTaskComp:refresh() self.imgProg.value = cur / total self.txScore:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_1)) self.txProg:setText(cur .. "/" .. total) - self.txLv:setText("LV") + self.txLv:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_12)) self.txLvNum:setText(DataManager.ActivityData:getBountyLevel()) -- 任务列表 diff --git a/lua/app/ui/activity/activity_ui.lua b/lua/app/ui/activity/activity_ui.lua index 428d246f..db1cc198 100644 --- a/lua/app/ui/activity/activity_ui.lua +++ b/lua/app/ui/activity/activity_ui.lua @@ -17,16 +17,16 @@ function ActivityUI:onPressBackspace() end function ActivityUI:ctor() - self.panelType = GConst.ActivityConst.PANEL_TYPE.TASK -- 默认进入任务页签 - - if self.panelType == nil and DataManager.ActivityData:hasTaskRedPoint() then + if DataManager.ActivityData:hasTaskRedPoint() then self.panelType = GConst.ActivityConst.PANEL_TYPE.TASK - elseif self.panelType == nil and DataManager.ActivityData:hasBountyRedPoint() then + elseif DataManager.ActivityData:hasBountyRedPoint() then self.panelType = GConst.ActivityConst.PANEL_TYPE.BOUNTY - elseif self.panelType == nil and DataManager.ActivityData:hasSkinRedPoint() then + elseif DataManager.ActivityData:hasSkinRedPoint() then self.panelType = GConst.ActivityConst.PANEL_TYPE.SKIN - elseif self.panelType == nil and DataManager.ActivityData:hasHeroRedPoint() then + elseif DataManager.ActivityData:hasHeroRedPoint() then self.panelType = GConst.ActivityConst.PANEL_TYPE.HERO + else + self.panelType = GConst.ActivityConst.PANEL_TYPE.TASK -- 默认进入任务页签 end end diff --git a/lua/app/userdata/activity/activity_data.lua b/lua/app/userdata/activity/activity_data.lua index 53df124e..f45b2850 100644 --- a/lua/app/userdata/activity/activity_data.lua +++ b/lua/app/userdata/activity/activity_data.lua @@ -305,7 +305,7 @@ end -- 获取战令等级 function ActivityData:getBountyLevel() if self.actData == nil or self.actData.level == nil then - return 0 + return 1 end return self.actData.level end