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

Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev

Browse Source
This commit is contained in:
xiekaidong 2023-07-05 17:55:03 +08:00
commit c9b32741cb
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/app/module/arena/arena_manager.lua
View File

@ -25,7 +25,7 @@ function ArenaManager:onSeasonChanged()
if EDITOR_MODE then if EDITOR_MODE then
Logger.logHighlight("赛季改变") Logger.logHighlight("赛季改变")
end end
if not self.isResetting then if self.isResetting then
return return
end end

6
lua/app/ui/battle/battle_result_ui.lua
View File

@ -142,7 +142,8 @@ function BattleResultUI:onLoadRootComplete()
end) end)
self:addEventListener(EventManager.CUSTOM_EVENT.ARENA_AD_BOX_SUCCESS, function() self:addEventListener(EventManager.CUSTOM_EVENT.ARENA_AD_BOX_SUCCESS, function()
self.getedArenaAdBox = true self.getedArenaAdBox = true
self.arenaBoxBtnGet:setActive(false) self:refreshRewards()
self:refreshArenaBoxNode()
end) end)
end end
@ -293,6 +294,9 @@ function BattleResultUI:hasArenaBoxNode()
if not self.isWin and self.arenaTotalCount and (self.arenaTotalCount % GFunc.getConstIntValue("arena_lose_adbox")) ~= 0 then if not self.isWin and self.arenaTotalCount and (self.arenaTotalCount % GFunc.getConstIntValue("arena_lose_adbox")) ~= 0 then
return false return false
end end
if self.getedArenaAdBox then
return false
end
return true return true
end end

11
lua/app/ui/main_city/component/arena_comp.lua
View File

@ -155,10 +155,13 @@ function ArenaComp:refreshShow()
self.imgProg:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = 1 self.imgProg:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = 1
end end
if self.spineGrading then if DataManager.ArenaData:hasSeasonReward() then
self.spineGrading:destroy() self.btnReward:addRedPoint(30, 25, 0.6)
self.spineGrading = nil else
end self.btnReward:removeRedPoint()
end
self.spineRoot:removeAllChildren()
SpineManager:loadUISpineWidgetAsync(gradingIconName.."_spine", self.spineRoot, function(spineObject) SpineManager:loadUISpineWidgetAsync(gradingIconName.."_spine", self.spineRoot, function(spineObject)
self.spineGrading = spineObject self.spineGrading = spineObject
self.spineGrading:setSkin(gradingNumName) self.spineGrading:setSkin(gradingNumName)

4
lua/app/ui/player_info/frame_cell.lua
View File

@ -27,7 +27,9 @@ function FrameCell:refresh(id, isSelect)
end end
self.select:setActive(isSelect) self.select:setActive(isSelect)
self.imgFrame:setSprite(GConst.ATLAS_PATH.ICON_AVATAR, DataManager.PlayerData:getFrameIconId(self.id)) local iconId = DataManager.PlayerData:getFrameIconId(self.id)
self.imgFrame:setSprite(GConst.ATLAS_PATH.ICON_AVATAR, iconId)
self.lock:setSprite(GConst.ATLAS_PATH.ICON_AVATAR, iconId)
self.lock:setActive(not DataManager.PlayerData:isFrameUnlock(self.id)) self.lock:setActive(not DataManager.PlayerData:isFrameUnlock(self.id))
self.use:setActive(DataManager.PlayerData:getUsingFrameId() == self.id) self.use:setActive(DataManager.PlayerData:getUsingFrameId() == self.id)
end end