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

fix

Browse Source
This commit is contained in:
Fang 2023-10-08 14:52:48 +08:00
parent 2f953375a5
commit 61e86c3f03
6 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/app/module/activity/tourn_arena/tourn_arena_manager.lua
View File

@ -101,7 +101,7 @@ end
function TournArenaManager:rspRankList(result) function TournArenaManager:rspRankList(result)
DataManager.TournArenaData:setInReset(false) 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) DataManager.TournArenaData:onGetRankData(result.reqData.turn, result.ranks, result.score, result.own_rank)
end end
end end

2
lua/app/module/activity/tourn_wave/tourn_wave_manager.lua
View File

@ -95,7 +95,7 @@ end
function TournWaveManager:rspRankList(result) function TournWaveManager:rspRankList(result)
DataManager.TournWaveData:setInReset(false) 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) DataManager.TournWaveData:onGetRankData(result.reqData.turn, result.ranks, result.score, result.own_rank)
end end
end end

9
lua/app/ui/activity/tourn_arena/tourn_arena_bounty_comp.lua
View File

@ -84,9 +84,12 @@ function TournArenaBountyComp:refresh(notUpdatePos)
self.lineLevel:setVisible(true) self.lineLevel:setVisible(true)
self.lineLevel:setAnchoredPositionY(-topRecoveryOffset - curLevel * cellHeight) self.lineLevel:setAnchoredPositionY(-topRecoveryOffset - curLevel * cellHeight)
end end
self.progLevel:setAnchoredPositionY((topRecoveryOffset + downRecoveryOffset) / 2 - cellHeight / 2 - 10) self.progLevel:setAnchoredPositionY((topRecoveryOffset + downRecoveryOffset) / 2 - cellHeight / 2 - 40)
self.progLevel:setSizeDeltaY(cellHeight * (maxLevel - 1)) self.progLevel:setSizeDeltaY(cellHeight * (maxLevel - 1) - 40)
self.imgProgLevel.value = DataManager.TournArenaData:getBountyTotalScore() / DataManager.TournArenaData:getLevelTotalScore(#DataManager.TournArenaData:getBountyIdList())
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:setAnchoredPositionY(-topRecoveryOffset - curLevel * cellHeight)
self.maskLevel:setSizeDeltaY(cellHeight * maxLevel + GConst.UI_SCREEN_HEIGHT) self.maskLevel:setSizeDeltaY(cellHeight * maxLevel + GConst.UI_SCREEN_HEIGHT)
self.scrollrectComp:updateAllCell() self.scrollrectComp:updateAllCell()

5
lua/app/ui/activity/tourn_arena/tourn_arena_rank_comp.lua
View File

@ -133,19 +133,18 @@ function TournArenaRankComp:showSelfRank(step)
self.txName:setText(DataManager.PlayerData:getNickname()) self.txName:setText(DataManager.PlayerData:getNickname())
self.txScore:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_16)..":"..score) 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) local rewards = DataManager.TournArenaData:getRewardByRank(rank)
for index, cell in ipairs(self.rewardCells) do for index, cell in ipairs(self.rewardCells) do
if score > 0 and rewards[index] then if score > 0 and rewards[index] then
cell:setVisible(true) cell:setVisible(true)
if step ~= DataManager.TournArenaData:getCurRankStep() and DataManager.TournArenaData:isReachRankReward() then
cell:refreshByConfig(rewards[index], isReceived, isReceived) cell:refreshByConfig(rewards[index], isReceived, isReceived)
if step ~= DataManager.TournArenaData:getCurRankStep() and DataManager.TournArenaData:isReachRankReward() then
cell.baseObject:addRedPoint(50, 50, 0.6) cell.baseObject:addRedPoint(50, 50, 0.6)
cell:addClickListener(function() cell:addClickListener(function()
ModuleManager.TournArenaManager:reqRankReward() ModuleManager.TournArenaManager:reqRankReward()
end) end)
else else
cell:refreshByConfig(rewards[index])
cell.baseObject:removeRedPoint() cell.baseObject:removeRedPoint()
cell:addClickListener(nil) cell:addClickListener(nil)
end end

8
lua/app/ui/activity/tourn_wave/tourn_wave_bounty_comp.lua
View File

@ -93,10 +93,12 @@ function TournWaveBountyComp:refresh(notUpdatePos)
self.lineLevel:setVisible(true) self.lineLevel:setVisible(true)
self.lineLevel:setAnchoredPositionY(-topRecoveryOffset - curLevel * cellHeight) self.lineLevel:setAnchoredPositionY(-topRecoveryOffset - curLevel * cellHeight)
end end
self.progLevel:setAnchoredPositionY((topRecoveryOffset + downRecoveryOffset) / 2 - cellHeight / 2 - 10) self.progLevel:setAnchoredPositionY((topRecoveryOffset + downRecoveryOffset) / 2 - cellHeight / 2 - 40)
self.progLevel:setSizeDeltaY(cellHeight * (maxLevel - 1)) 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:setAnchoredPositionY(-topRecoveryOffset - curLevel * cellHeight)
self.maskLevel:setSizeDeltaY(cellHeight * maxLevel + GConst.UI_SCREEN_HEIGHT) self.maskLevel:setSizeDeltaY(cellHeight * maxLevel + GConst.UI_SCREEN_HEIGHT)
self.scrollrectComp:updateAllCell() self.scrollrectComp:updateAllCell()

5
lua/app/ui/activity/tourn_wave/tourn_wave_rank_comp.lua
View File

@ -133,19 +133,18 @@ function TournWaveRankComp:showSelfRank(step)
self.txName:setText(DataManager.PlayerData:getNickname()) self.txName:setText(DataManager.PlayerData:getNickname())
self.txScore:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_16)..":"..score) 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) local rewards = DataManager.TournWaveData:getRewardByRank(rank)
for index, cell in ipairs(self.rewardCells) do for index, cell in ipairs(self.rewardCells) do
if score > 0 and rewards[index] then if score > 0 and rewards[index] then
cell:setVisible(true) cell:setVisible(true)
if step ~= DataManager.TournWaveData:getCurRankStep() and DataManager.TournWaveData:isReachRankReward() then
cell:refreshByConfig(rewards[index], isReceived, isReceived) cell:refreshByConfig(rewards[index], isReceived, isReceived)
if step ~= DataManager.TournWaveData:getCurRankStep() and DataManager.TournWaveData:isReachRankReward() then
cell.baseObject:addRedPoint(50, 50, 0.6) cell.baseObject:addRedPoint(50, 50, 0.6)
cell:addClickListener(function() cell:addClickListener(function()
ModuleManager.TournWaveManager:reqRankReward() ModuleManager.TournWaveManager:reqRankReward()
end) end)
else else
cell:refreshByConfig(rewards[index])
cell.baseObject:removeRedPoint() cell.baseObject:removeRedPoint()
cell:addClickListener(nil) cell:addClickListener(nil)
end end