diff --git a/lua/app/module/activity/tourn_arena/tourn_arena_manager.lua b/lua/app/module/activity/tourn_arena/tourn_arena_manager.lua index 5e56296c..8f4939c1 100644 --- a/lua/app/module/activity/tourn_arena/tourn_arena_manager.lua +++ b/lua/app/module/activity/tourn_arena/tourn_arena_manager.lua @@ -101,7 +101,7 @@ end function TournArenaManager:rspRankList(result) DataManager.TournArenaData:setInReset(false) - if result.err_code == GConst.ERROR_STR.SUCCESS then + if result.err_code == GConst.ERROR_STR.SUCCESS and result.reqData then DataManager.TournArenaData:onGetRankData(result.reqData.turn, result.ranks, result.score, result.own_rank) end end diff --git a/lua/app/module/activity/tourn_wave/tourn_wave_manager.lua b/lua/app/module/activity/tourn_wave/tourn_wave_manager.lua index 4a5e5677..bc3b660f 100644 --- a/lua/app/module/activity/tourn_wave/tourn_wave_manager.lua +++ b/lua/app/module/activity/tourn_wave/tourn_wave_manager.lua @@ -95,7 +95,7 @@ end function TournWaveManager:rspRankList(result) DataManager.TournWaveData:setInReset(false) - if result.err_code == GConst.ERROR_STR.SUCCESS then + if result.err_code == GConst.ERROR_STR.SUCCESS and result.reqData then DataManager.TournWaveData:onGetRankData(result.reqData.turn, result.ranks, result.score, result.own_rank) end end diff --git a/lua/app/ui/activity/tourn_arena/tourn_arena_bounty_comp.lua b/lua/app/ui/activity/tourn_arena/tourn_arena_bounty_comp.lua index 21398357..43a8f9ec 100644 --- a/lua/app/ui/activity/tourn_arena/tourn_arena_bounty_comp.lua +++ b/lua/app/ui/activity/tourn_arena/tourn_arena_bounty_comp.lua @@ -84,9 +84,12 @@ function TournArenaBountyComp:refresh(notUpdatePos) self.lineLevel:setVisible(true) self.lineLevel:setAnchoredPositionY(-topRecoveryOffset - curLevel * cellHeight) end - self.progLevel:setAnchoredPositionY((topRecoveryOffset + downRecoveryOffset) / 2 - cellHeight / 2 - 10) - self.progLevel:setSizeDeltaY(cellHeight * (maxLevel - 1)) - self.imgProgLevel.value = DataManager.TournArenaData:getBountyTotalScore() / DataManager.TournArenaData:getLevelTotalScore(#DataManager.TournArenaData:getBountyIdList()) + self.progLevel:setAnchoredPositionY((topRecoveryOffset + downRecoveryOffset) / 2 - cellHeight / 2 - 40) + self.progLevel:setSizeDeltaY(cellHeight * (maxLevel - 1) - 40) + + local prog = (curLevel - 1) / #DataManager.TournArenaData:getBountyIdList() + prog = prog + (DataManager.TournArenaData:getBountyLevelScore() / DataManager.TournArenaData:getLevelTotalScore(#DataManager.TournArenaData:getBountyIdList())) + self.imgProgLevel.value = prog self.maskLevel:setAnchoredPositionY(-topRecoveryOffset - curLevel * cellHeight) self.maskLevel:setSizeDeltaY(cellHeight * maxLevel + GConst.UI_SCREEN_HEIGHT) self.scrollrectComp:updateAllCell() diff --git a/lua/app/ui/activity/tourn_arena/tourn_arena_rank_comp.lua b/lua/app/ui/activity/tourn_arena/tourn_arena_rank_comp.lua index 6bc51719..543c5982 100644 --- a/lua/app/ui/activity/tourn_arena/tourn_arena_rank_comp.lua +++ b/lua/app/ui/activity/tourn_arena/tourn_arena_rank_comp.lua @@ -133,19 +133,18 @@ function TournArenaRankComp:showSelfRank(step) self.txName:setText(DataManager.PlayerData:getNickname()) self.txScore:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_16)..":"..score) - local isReceived = DataManager.TournArenaData:isReceivedRankReward() + local isReceived = step ~= DataManager.TournArenaData:getCurRankStep() and DataManager.TournArenaData:isReceivedRankReward() local rewards = DataManager.TournArenaData:getRewardByRank(rank) for index, cell in ipairs(self.rewardCells) do if score > 0 and rewards[index] then cell:setVisible(true) + cell:refreshByConfig(rewards[index], isReceived, isReceived) if step ~= DataManager.TournArenaData:getCurRankStep() and DataManager.TournArenaData:isReachRankReward() then - cell:refreshByConfig(rewards[index], isReceived, isReceived) cell.baseObject:addRedPoint(50, 50, 0.6) cell:addClickListener(function() ModuleManager.TournArenaManager:reqRankReward() end) else - cell:refreshByConfig(rewards[index]) cell.baseObject:removeRedPoint() cell:addClickListener(nil) end diff --git a/lua/app/ui/activity/tourn_wave/tourn_wave_bounty_comp.lua b/lua/app/ui/activity/tourn_wave/tourn_wave_bounty_comp.lua index cf9e3095..b773b1d8 100644 --- a/lua/app/ui/activity/tourn_wave/tourn_wave_bounty_comp.lua +++ b/lua/app/ui/activity/tourn_wave/tourn_wave_bounty_comp.lua @@ -93,10 +93,12 @@ function TournWaveBountyComp:refresh(notUpdatePos) self.lineLevel:setVisible(true) self.lineLevel:setAnchoredPositionY(-topRecoveryOffset - curLevel * cellHeight) end - self.progLevel:setAnchoredPositionY((topRecoveryOffset + downRecoveryOffset) / 2 - cellHeight / 2 - 10) - self.progLevel:setSizeDeltaY(cellHeight * (maxLevel - 1)) + self.progLevel:setAnchoredPositionY((topRecoveryOffset + downRecoveryOffset) / 2 - cellHeight / 2 - 40) + self.progLevel:setSizeDeltaY(cellHeight * (maxLevel - 1) - 40) - self.imgProgLevel.value = DataManager.TournWaveData:getBountyTotalScore() / DataManager.TournWaveData:getLevelTotalScore(#DataManager.TournWaveData:getBountyIdList()) + local prog = (curLevel - 1) / #DataManager.TournWaveData:getBountyIdList() + prog = prog + (DataManager.TournWaveData:getBountyLevelScore() / DataManager.TournWaveData:getLevelTotalScore(#DataManager.TournWaveData:getBountyIdList())) + self.imgProgLevel.value = prog self.maskLevel:setAnchoredPositionY(-topRecoveryOffset - curLevel * cellHeight) self.maskLevel:setSizeDeltaY(cellHeight * maxLevel + GConst.UI_SCREEN_HEIGHT) self.scrollrectComp:updateAllCell() diff --git a/lua/app/ui/activity/tourn_wave/tourn_wave_rank_comp.lua b/lua/app/ui/activity/tourn_wave/tourn_wave_rank_comp.lua index 98d0435b..126da359 100644 --- a/lua/app/ui/activity/tourn_wave/tourn_wave_rank_comp.lua +++ b/lua/app/ui/activity/tourn_wave/tourn_wave_rank_comp.lua @@ -133,19 +133,18 @@ function TournWaveRankComp:showSelfRank(step) self.txName:setText(DataManager.PlayerData:getNickname()) self.txScore:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_16)..":"..score) - local isReceived = DataManager.TournWaveData:isReceivedRankReward() + local isReceived = step ~= DataManager.TournWaveData:getCurRankStep() and DataManager.TournWaveData:isReceivedRankReward() local rewards = DataManager.TournWaveData:getRewardByRank(rank) for index, cell in ipairs(self.rewardCells) do if score > 0 and rewards[index] then cell:setVisible(true) + cell:refreshByConfig(rewards[index], isReceived, isReceived) if step ~= DataManager.TournWaveData:getCurRankStep() and DataManager.TournWaveData:isReachRankReward() then - cell:refreshByConfig(rewards[index], isReceived, isReceived) cell.baseObject:addRedPoint(50, 50, 0.6) cell:addClickListener(function() ModuleManager.TournWaveManager:reqRankReward() end) else - cell:refreshByConfig(rewards[index]) cell.baseObject:removeRedPoint() cell:addClickListener(nil) end