puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

细节完善

Browse Source
This commit is contained in:
Fang 2023-08-11 14:26:52 +08:00
parent 78c18dac68
commit ba449382a9
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lua/app/module/activity/activity_manager.lua
View File

@ -52,7 +52,9 @@ function ActivityManager:reqSummerData()
end end
function ActivityManager:rspSummerData(result) function ActivityManager:rspSummerData(result)
DataManager.ActivityData:onGetActData(result.summer) if result.summer then
DataManager.ActivityData:onGetActData(result.summer)
end
end end
-- 请求夏日活动任务奖励 -- 请求夏日活动任务奖励
@ -96,7 +98,7 @@ function ActivityManager:reqBuyBountyLevel()
costNum = costNum, costNum = costNum,
okFunc = function() okFunc = function()
local id = DataManager.ActivityData:getBountyCfg()[DataManager.ActivityData:getBountyLevel() + 1].id 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) self:sendMessage(ProtoMsgType.FromMsgEnum.SummerBountyClaimByDiamondReq, {id = id}, {}, self.rspBuyBountyLevel, BIReport.ITEM_GET_TYPE.ACTIVITY_BOUNTY_LEVEL)
end, end,
} }

2
lua/app/ui/activity/activity_bounty_comp.lua
View File

@ -60,7 +60,7 @@ function ActivityBountyComp:refresh()
self.imgProg.value = cur / total self.imgProg.value = cur / total
self.txScore:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_1)) self.txScore:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_1))
self.txProg:setText(cur .. "/" .. total) 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()) self.txLvNum:setText(DataManager.ActivityData:getBountyLevel())
-- 档位展示 -- 档位展示

2
lua/app/ui/activity/activity_task_comp.lua
View File

@ -17,7 +17,7 @@ function ActivityTaskComp:refresh()
self.imgProg.value = cur / total self.imgProg.value = cur / total
self.txScore:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_1)) self.txScore:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_1))
self.txProg:setText(cur .. "/" .. total) 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()) self.txLvNum:setText(DataManager.ActivityData:getBountyLevel())
-- 任务列表 -- 任务列表

12
lua/app/ui/activity/activity_ui.lua
View File

@ -17,16 +17,16 @@ function ActivityUI:onPressBackspace()
end end
function ActivityUI:ctor() function ActivityUI:ctor()
self.panelType = GConst.ActivityConst.PANEL_TYPE.TASK -- 默认进入任务页签 if DataManager.ActivityData:hasTaskRedPoint() then
if self.panelType == nil and DataManager.ActivityData:hasTaskRedPoint() then
self.panelType = GConst.ActivityConst.PANEL_TYPE.TASK 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 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 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 self.panelType = GConst.ActivityConst.PANEL_TYPE.HERO
else
self.panelType = GConst.ActivityConst.PANEL_TYPE.TASK -- 默认进入任务页签
end end
end end

2
lua/app/userdata/activity/activity_data.lua
View File

@ -305,7 +305,7 @@ end
-- 获取战令等级 -- 获取战令等级
function ActivityData:getBountyLevel() function ActivityData:getBountyLevel()
if self.actData == nil or self.actData.level == nil then if self.actData == nil or self.actData.level == nil then
return 0 return 1
end end
return self.actData.level return self.actData.level
end end