From 09889ce0d48e6e3a25850c3abf183cfebb7dbaf8 Mon Sep 17 00:00:00 2001
From: fatiao <515948292@qq.com>
Date: Fri, 27 Feb 2026 18:43:39 +0800
Subject: [PATCH] =?UTF-8?q?UIMain=E7=A4=BC=E5=8C=85=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Content/Prefabs/UI/UIMain/UIMain.prefab | 12 ++++++------
 Assets/Lua/UI/UIMain/UIMainView.lua            | 14 ++++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Assets/Content/Prefabs/UI/UIMain/UIMain.prefab b/Assets/Content/Prefabs/UI/UIMain/UIMain.prefab
index dfd04c54b..34767bc7c 100644
--- a/Assets/Content/Prefabs/UI/UIMain/UIMain.prefab
+++ b/Assets/Content/Prefabs/UI/UIMain/UIMain.prefab
@@ -5747,9 +5747,9 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1026245000878456729}
   - {fileID: 2083680694179472189}
   - {fileID: 1255818985860962369}
+  - {fileID: 1026245000878456729}
   - {fileID: 5817223106339050662}
   - {fileID: 8786045984710172170}
   - {fileID: 4541294311229291331}
@@ -5805,7 +5805,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 20
   m_ChildAlignment: 1
-  m_Spacing: 10
+  m_Spacing: 20
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
@@ -12091,7 +12091,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u9650\u65F6\u793C\u5305"
+  m_text: "\u6210\u957F\u793C\u5305"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
   m_sharedMaterial: {fileID: 2100000, guid: 2a55426dee1005f4ba060aaad88233c4, type: 2}
@@ -21198,7 +21198,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
+  m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -51095,13 +51095,13 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u8D85\u503C\u9996\u5145"
+  m_text: "\u6BCF\u65E5\u793C\u5305"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
   m_sharedMaterial: {fileID: 2100000, guid: 2a55426dee1005f4ba060aaad88233c4, type: 2}
diff --git a/Assets/Lua/UI/UIMain/UIMainView.lua b/Assets/Lua/UI/UIMain/UIMainView.lua
index 66bf7121a..d712353b1 100644
--- a/Assets/Lua/UI/UIMain/UIMainView.lua
+++ b/Assets/Lua/UI/UIMain/UIMainView.lua
@@ -173,11 +173,14 @@ function UIMainView:OnClickFirstChargeGift()
 	--local curUIId = ManagerContainer.LuaUIMgr:GetCurUIId()
 	--ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIActivityFirstRecharge)
 	--ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIActivityLimitedGift)
-	local giftId = self:CanPopUpGiftDialog()
-	if giftId > 0 then
-		ManagerContainer.PlayerPrefsMgr:SetInt(Enum.StoreCacheKey.LAST_LIMIT_GIFT, giftId)
-		ManagerContainer.LuaUIMgr:OpenLimitRechargeUI(giftId)
-	end
+
+	-- local giftId = self:CanPopUpGiftDialog()
+	-- if giftId > 0 then
+	-- 	ManagerContainer.PlayerPrefsMgr:SetInt(Enum.StoreCacheKey.LAST_LIMIT_GIFT, giftId)
+	-- 	ManagerContainer.LuaUIMgr:OpenLimitRechargeUI(giftId)
+	-- end
+	local curUIId = ManagerContainer.LuaUIMgr:GetCurUIId()
+	ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIRuneShop, {Enum.RuneShopType.Gifts, 1}, curUIId)
 end
 function UIMainView:CanPopUpGiftDialog()
 	local giftId = ManagerContainer.LuaUIMgr:CheckRechargeGiftId()
@@ -188,7 +191,6 @@ function UIMainView:CanPopUpGiftDialog()
 	return 0
 end
 function UIMainView:CheckAutoPopUpGiftDialog()
-	LogError(Enum.StoreCacheKey.LAST_LIMIT_GIFT)
 	local giftId = self:CanPopUpGiftDialog()
 	local lastLimitGiftId = ManagerContainer.PlayerPrefsMgr:GetInt(Enum.StoreCacheKey.LAST_LIMIT_GIFT, 0)
 	if giftId > 0 and lastLimitGiftId == 0 then