diff --git a/Assets/Lua/Managers/LuaUIMgr.lua b/Assets/Lua/Managers/LuaUIMgr.lua index 8c41a6319..dcb3a7d0a 100644 --- a/Assets/Lua/Managers/LuaUIMgr.lua +++ b/Assets/Lua/Managers/LuaUIMgr.lua @@ -640,7 +640,7 @@ function LuaUIMgr:OpenLimitRechargeUI() end end if not self:HasOpenPage(Enum.UIPageName.UIActivityLimitedGift) then - self:Open(Enum.UIPageName.UIActivityLimitedGift, true) + --self:Open(Enum.UIPageName.UIActivityLimitedGift, true) end end diff --git a/Assets/Lua/UI/GridViewItem/VipUnlockDesItem_Generate.lua b/Assets/Lua/UI/GridViewItem/VipUnlockDesItem_Generate.lua index 68088332f..a0dc4bf4a 100644 --- a/Assets/Lua/UI/GridViewItem/VipUnlockDesItem_Generate.lua +++ b/Assets/Lua/UI/GridViewItem/VipUnlockDesItem_Generate.lua @@ -1,6 +1,6 @@ ---@class VipUnlockDesItem__Generate_desTxt ---@field public gameObject UnityEngine.GameObject ----@field public text UnityEngine.UI.Text +---@field public text TMPro.TextMeshProUGUI ---@class VipUnlockDesItem__Generate ---@field private gameObject UnityEngine.GameObject @@ -53,7 +53,7 @@ function VipUnlockDesItemView:InitGenerate__2(Root, data) end self.desTxt = tmp - tmp.text = tmp:GetComponent(Enum.TypeInfo.Text) + tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI) end ---@private diff --git a/Assets/Lua/UI/UIMain/UIMainView.lua b/Assets/Lua/UI/UIMain/UIMainView.lua index 69958c80f..dd3dd8086 100644 --- a/Assets/Lua/UI/UIMain/UIMainView.lua +++ b/Assets/Lua/UI/UIMain/UIMainView.lua @@ -166,7 +166,8 @@ function UIMainView:OnClickLimitTimeGift() end function UIMainView:OnClickFirstChargeGift() local curUIId = ManagerContainer.LuaUIMgr:GetCurUIId() - ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIRuneShop, {Enum.RuneShopType.Gifts, Enum.RuneShopSubType.Gold}, curUIId) + --ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIActivityFirstRecharge) + ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIActivityLimitedGift) end function UIMainView:AddEventListener()