diff --git a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab index 6a04572168..3e2973c327 100644 --- a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab @@ -2946,8 +2946,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 22, y: 29.07} - m_SizeDelta: {x: 166.19, y: 42.59} + m_AnchoredPosition: {x: 23.58, y: 29.07} + m_SizeDelta: {x: 139.33, y: 42.59} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9106388405961325089 CanvasRenderer: @@ -3556,8 +3556,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 229.1, y: 28.57} - m_SizeDelta: {x: 168.91, y: 41.59} + m_AnchoredPosition: {x: 227.62, y: 28.57} + m_SizeDelta: {x: 144.23, y: 41.59} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7218534637907293873 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index de506e0106..07a8a1c30d 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -471,7 +471,8 @@ PanelType = { Celebration = {14,16,50003},--社稷大典 YiJingBaoKu = {14,16,1004},--易经宝库 LingShouBaoGe = {14,16,1204},--灵兽宝阁 - HongMengProp = {100,16} -- 鸿蒙阵 + HongMengProp = {100,16}, -- 鸿蒙阵 + HongMengTower = {100,16,14,3},-- 鸿蒙碑 } diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua index 609c151dce..47ca15b149 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua @@ -127,11 +127,12 @@ function HongMengEnvoyPanel:BindEvent() function() -- body LogGreen("回调函数") - Gold = Gold - data.LevelUp[1][2] - GrowthAmulet = GrowthAmulet - data.LevelUp[2][2] + HarmonyManager.hongmengAdditions[1].value = HarmonyManager.hongmengAdditions[1].value + 1 - self.TextGold.text = Gold - self.TextGrowthAmulet.text = GrowthAmulet + local data = HarmonyManager:GetHongMengUpData() + + self.TextGold.text = data.LevelUp[1][2] + self.TextGrowthAmulet.text = data.LevelUp[1][2] local sum = HarmonyManager:HongMengTowerUpLimit() self.GradeText.text = string.format("%d/%d", HarmonyManager.hongmengAdditions[1].value, sum) @@ -231,21 +232,7 @@ end function HongMengEnvoyPanel:UpdateFun(data) print(data.gridId) - -- for key, value in pairs(HarmonyManager.hongmengGuards) do - -- -- body - -- if value.gridId == data.gridId then - -- -- body - -- if value.heroId ~= "" then - -- -- body - -- value.heroId = "" - -- value.time = data.time + GetTimeStamp() - -- print("卸载成功",key,"data",data.time,"value",value.time) - -- else - -- value.heroId = data.heroId - -- value.time = 0 - -- end - -- end - -- end + self:RunTimerFun() self:UpdateShow(HarmonyManager.hongmengGuards) @@ -293,11 +280,11 @@ function HongMengEnvoyPanel:OnOpen(equipSId) for i = 1, #self.contents do self.contents[i].view:OnOpen() end + local data = HarmonyManager:GetHongMengUpData() + self.TextGold.text = data.LevelUp[1][2] + self.TextGrowthAmulet.text = data.LevelUp[2][2] - self.TextGold.text = Gold - self.TextGrowthAmulet.text = GrowthAmulet local sum = HarmonyManager:HongMengTowerUpLimit() - self.GradeText.text = string.format("%d/%d", HarmonyManager.hongmengAdditions[1].value, sum) self:IsUpBtnGray() self:InitTextMum() @@ -327,7 +314,7 @@ function HongMengEnvoyPanel:InitTextMum() end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function HongMengEnvoyPanel:OnShow() - self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.HongMengProp}) + self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.HongMengTower}) end --界面关闭时调用(用于子类重写) @@ -338,7 +325,7 @@ function HongMengEnvoyPanel:OnClose() if self.timerEffect then -- body self.timerEffect:Stop() - print("关闭倒计时") + --print("关闭倒计时") end end @@ -348,7 +335,7 @@ function HongMengEnvoyPanel:OnDestroy() if self.timerEffect then -- body self.timerEffect:Stop() - print("关闭倒计时") + -- print("关闭倒计时") end ClearRedPointObject(RedPointType.HongMeng_UpTower,self.UpBtnRedPoint) end