From fde89edddbff30400b952a80ec5b0d5d5841dbb0 Mon Sep 17 00:00:00 2001
From: Fang <ky_fang@juzugame.com>
Date: Fri, 11 Aug 2023 16:34:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E5=89=AF=E6=9C=AC=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E7=A4=BC=E5=8C=85=E5=85=A5=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