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

Merge branch 'master' into dev_20230919

Browse Source
This commit is contained in:
xiekaidong 2023-09-12 14:42:04 +08:00
commit 577d7392e2
5 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lua/app/config/arena_rank.lua
View File

@ -3303,8 +3303,8 @@ local arena_rank = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=46000, ["num"]=25000,
["num_for_nothing"]="Ug5cA2U=" ["num_for_nothing"]="VA1cA2U="
}, },
{ {
["type"]=1, ["type"]=1,
@ -5383,8 +5383,8 @@ local arena_rank = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=54000, ["num"]=25000,
["num_for_nothing"]="UwxcA2U=" ["num_for_nothing"]="VA1cA2U="
}, },
{ {
["type"]=1, ["type"]=1,

12
lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua
View File

@ -88,15 +88,15 @@ end
function ActBossRushManager:rspEndBattle(result) function ActBossRushManager:rspEndBattle(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then if result.err_code == GConst.ERROR_STR.SUCCESS then
local wave = result.max_wave or 0
local round = result.min_round or 0
DataManager.ActBossRushData:addWaveCount(wave)
DataManager.ActBossRushData:updateWaveAndRound(wave, round)
ModuleManager.BattleManager:showBossRushBattleResultUI(GConst.BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH, result.reqData and result.reqData.combatReport, result.reqData and result.reqData.task_stat)
if result.reqData then if result.reqData then
ModuleManager.TaskManager:addFightTaskProgress(result.reqData.task_stat) ModuleManager.TaskManager:addFightTaskProgress(result.reqData.task_stat)
DataManager.ActBossRushData:addWaveCount(result.reqData.task_stat[GConst.BattleConst.BATTLE_TASK_FIELD.PASS_WAVE] or 0)
end end
local wave = result.max_wave or 0
local round = result.min_round or 0
DataManager.ActBossRushData:updateWaveAndRound(wave, round)
ModuleManager.BattleManager:showBossRushBattleResultUI(GConst.BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH, result.reqData and result.reqData.combatReport, result.reqData and result.reqData.task_stat)
end end
end end

3
lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua
View File

@ -92,6 +92,9 @@ function FourteenDayEntranceUI:onLoadRootComplete()
self:bind(DataManager.FourteenDayData, "isDirty", function() self:bind(DataManager.FourteenDayData, "isDirty", function()
self:onRefresh() self:onRefresh()
end) end)
self:bind(DataManager.ShopData, "isDirty", function()
self:refreshRedPoint()
end)
end end
function FourteenDayEntranceUI:onRefresh() function FourteenDayEntranceUI:onRefresh()

2
lua/app/ui/main_city/main_city_ui.lua
View File

@ -688,7 +688,7 @@ function MainCityUI:refreshRightBtns()
self.rightSideBar:setSizeDeltaY(-minY) self.rightSideBar:setSizeDeltaY(-minY)
self.rightArrowImg:setLocalScale(1, isClose and -1 or 1, 1) self.rightArrowImg:setLocalScale(1, isClose and -1 or 1, 1)
self.rightArrowBtn:setVisible(true) self.rightArrowBtn:setVisible(true)
self.rightArrowBtn:setAnchoredPositionY(self.rightSideBar:fastGetAnchoredPositionY() + y + arrowHeight/2 + SIDE_BAR_BORDER_OFFSET) self.rightArrowBtn:setAnchoredPositionY(self.rightSideBar:fastGetAnchoredPositionY() + minY + arrowHeight/2 + SIDE_BAR_BORDER_OFFSET)
if otherColumn then if otherColumn then
self.rightArrowBtn:setAnchoredPositionX(-133) self.rightArrowBtn:setAnchoredPositionX(-133)
else else

15
lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua
View File

@ -460,22 +460,7 @@ end
-- 是否有兑换红点 -- 是否有兑换红点
function FourteenDayData:hasExchangeRedPoint() function FourteenDayData:hasExchangeRedPoint()
local isFullUnlock = true
for index, data in ipairs(self:getExchangeShowIdsSort()) do
if not self:isExchangeUnlock(data.id) then
isFullUnlock = false
break
end
end
if not isFullUnlock then
return not self:getTodayExchangeCheck() return not self:getTodayExchangeCheck()
else
for index, data in ipairs(self:getExchangeShowIdsSort()) do
if self:canExchange(data.id) then
return true
end
end
end
end end
function FourteenDayData:getTodayExchangeCheck() function FourteenDayData:getTodayExchangeCheck()