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

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

Browse Source
This commit is contained in:
xiekaidong 2023-08-11 17:50:19 +08:00
commit 5cfb937723
4 changed files with 86 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/app/ui/activity/activity_hero_comp.lua
View File

@ -22,9 +22,7 @@ function ActivityHeroComp:init()
end
function ActivityHeroComp:refresh()
self.spineBanner:playAnimComplete("born", false, true, function()
self.spineBanner:playAnim("idle", true, true)
end)
self.spineBanner:playAnim("animation", true, true)
self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_8))
local gift = DataManager.ShopData:getActGiftConfig()[GConst.ActivityConst.HERO_GIFT_ID_1]

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

@ -317,6 +317,7 @@ function BattleResultUI:refreshArenaBoxNode()
self.arenaBoxImgIcon:setSprite(GConst.ATLAS_PATH.SHOP, "shop_chest_4")
self.arenaBoxTxTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_34))
end
ModuleManager.ArenaManager:markAdBox(self.isWin)
end
function BattleResultUI:refreshArenaGradingSpine(gradingId, isUp)

42
lua/app/ui/dungeon_armor/dungeon_armor_main_ui.lua
View File

@ -1,6 +1,7 @@
local DungeonArmorMainUI = class("DungeonArmorMainUI", BaseUI)
local CHAPTER_LAYER_CELL = "app/ui/dungeon_armor/cell/chapter_cell"
local GIFT_CELL = "app/ui/main_city/cell/side_bar_armor_gift_cell"
function DungeonArmorMainUI:getCurrencyParams()
if self.currencyParams == nil then
@ -48,6 +49,11 @@ function DungeonArmorMainUI:onLoadRootComplete()
self:_addListeners()
self:_bind()
DataManager.ShopData:checkPopGift(PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT)
self:refreshTime()
self:scheduleGlobal(function()
self:refreshTime()
end, 1)
end
function DungeonArmorMainUI:_display()
@ -63,6 +69,7 @@ function DungeonArmorMainUI:_display()
self.btnFund:setActive(not GFunc.isShenhe())
self:refreshFund()
self:initRightBtns()
self:refreshScrollrect()
self:refreshFormation()
self:refreshStarNode()
@ -284,4 +291,39 @@ function DungeonArmorMainUI:refreshFund()
end
end
function DungeonArmorMainUI:refreshTime()
self:refreshRightBtns()
end
function DungeonArmorMainUI:initRightBtns()
if self.rightBtnCells then
return
end
local uiMap = self.root:genAllChildren()
self.rightNode = uiMap["dungeon_armor_main_ui.right_node"]
self.rightArrow = uiMap["dungeon_armor_main_ui.right_node.arrow_node"]
self.rightBtnCells = {}
self.rightBtnCells.giftCell = CellManager:addCellComp(uiMap["dungeon_armor_main_ui.right_node.side_bar.side_bar_cell"], GIFT_CELL)
self.rightArrow:setVisible(false)
self:refreshRightBtns()
end
function DungeonArmorMainUI:refreshRightBtns()
local y = 0
if self.rightBtnCells.giftCell:checkIsOpen() then
y = y - 60
self.rightBtnCells.giftCell:setActive(true)
self.rightBtnCells.giftCell:setVisible(true)
self.rightBtnCells.giftCell:getBaseObject():setAnchoredPositionY(y)
self.rightBtnCells.giftCell:refresh()
else
self.rightBtnCells.giftCell:setVisible(false)
end
-- 暂不处理箭头的问题
self.rightNode:setVisible(y < 0)
end
return DungeonArmorMainUI

42
lua/app/ui/dungeon_weapon/dungeon_weapon_main_ui.lua
View File

@ -1,6 +1,7 @@
local DungeonWeaponMainUI = class("DungeonWeaponMainUI", BaseUI)
local CHAPTER_LAYER_CELL = "app/ui/dungeon_weapon/cell/chapter_layer_cell"
local GIFT_CELL = "app/ui/main_city/cell/side_bar_weapon_gift_cell"
function DungeonWeaponMainUI:getCurrencyParams()
if self.currencyParams == nil then
@ -40,12 +41,18 @@ function DungeonWeaponMainUI:onLoadRootComplete()
self:_addListeners()
self:_bind()
DataManager.ShopData:checkPopGift(PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT)
self:refreshTime()
self:scheduleGlobal(function()
self:refreshTime()
end, 1)
end
function DungeonWeaponMainUI:_display()
local uiMap = self.root:genAllChildren()
uiMap["dungeon_weapon_mian_ui.banner.btn_formation.tx_ok"]:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_4))
self:initRightBtns()
self:refreshScrollrect()
self:refreshFormation()
self:refreshRemianNode()
@ -115,4 +122,39 @@ function DungeonWeaponMainUI:refreshRemianNode()
GFunc.expandImgToFitTx(node, txt, 16.5)
end
function DungeonWeaponMainUI:refreshTime()
self:refreshRightBtns()
end
function DungeonWeaponMainUI:initRightBtns()
if self.rightBtnCells then
return
end
local uiMap = self.root:genAllChildren()
self.rightNode = uiMap["dungeon_weapon_mian_ui.right_node"]
self.rightArrow = uiMap["dungeon_weapon_mian_ui.right_node.arrow_node"]
self.rightBtnCells = {}
self.rightBtnCells.giftCell = CellManager:addCellComp(uiMap["dungeon_weapon_mian_ui.right_node.side_bar.side_bar_cell"], GIFT_CELL)
self.rightArrow:setVisible(false)
self:refreshRightBtns()
end
function DungeonWeaponMainUI:refreshRightBtns()
local y = 0
if self.rightBtnCells.giftCell:checkIsOpen() then
y = y - 60
self.rightBtnCells.giftCell:setActive(true)
self.rightBtnCells.giftCell:setVisible(true)
self.rightBtnCells.giftCell:getBaseObject():setAnchoredPositionY(y)
self.rightBtnCells.giftCell:refresh()
else
self.rightBtnCells.giftCell:setVisible(false)
end
-- 暂不处理箭头的问题
self.rightNode:setVisible(y < 0)
end
return DungeonWeaponMainUI