From eb566b778292d6f726f174bfbd9cdf3afcc36b68 Mon Sep 17 00:00:00 2001 From: Fang Date: Fri, 11 Aug 2023 16:03:00 +0800 Subject: [PATCH 1/3] fix --- lua/app/ui/battle/battle_result_ui.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/app/ui/battle/battle_result_ui.lua b/lua/app/ui/battle/battle_result_ui.lua index 13be9e1b..383ac0e4 100644 --- a/lua/app/ui/battle/battle_result_ui.lua +++ b/lua/app/ui/battle/battle_result_ui.lua @@ -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) From fde89edddbff30400b952a80ec5b0d5d5841dbb0 Mon Sep 17 00:00:00 2001 From: Fang Date: Fri, 11 Aug 2023 16:34:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A3=85=E5=A4=87=E5=89=AF=E6=9C=AC?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=B7=BB=E5=8A=A0=E7=A4=BC=E5=8C=85=E5=85=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dungeon_armor/dungeon_armor_main_ui.lua | 42 +++++++++++++++++++ .../dungeon_weapon/dungeon_weapon_main_ui.lua | 42 +++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/lua/app/ui/dungeon_armor/dungeon_armor_main_ui.lua b/lua/app/ui/dungeon_armor/dungeon_armor_main_ui.lua index de964c9b..2cc749c0 100644 --- a/lua/app/ui/dungeon_armor/dungeon_armor_main_ui.lua +++ b/lua/app/ui/dungeon_armor/dungeon_armor_main_ui.lua @@ -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 \ No newline at end of file diff --git a/lua/app/ui/dungeon_weapon/dungeon_weapon_main_ui.lua b/lua/app/ui/dungeon_weapon/dungeon_weapon_main_ui.lua index 0c8fd1ed..912ef795 100644 --- a/lua/app/ui/dungeon_weapon/dungeon_weapon_main_ui.lua +++ b/lua/app/ui/dungeon_weapon/dungeon_weapon_main_ui.lua @@ -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 \ No newline at end of file From 391e171497aaf692f5d133164b7d8d0d1ce571b4 Mon Sep 17 00:00:00 2001 From: Fang Date: Fri, 11 Aug 2023 17:02:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/activity/activity_hero_comp.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lua/app/ui/activity/activity_hero_comp.lua b/lua/app/ui/activity/activity_hero_comp.lua index 4383b2da..5cf50f75 100644 --- a/lua/app/ui/activity/activity_hero_comp.lua +++ b/lua/app/ui/activity/activity_hero_comp.lua @@ -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]