From e9ad1db4b3206a366ed204fa1e978184287dd6ee Mon Sep 17 00:00:00 2001
From: puxuan <413323644@qq.com>
Date: Sat, 8 Nov 2025 17:16:58 +0800
Subject: [PATCH] fix bug

---
 .../ui/game_setting/select_other_btn_ui.lua    | 18 ++++++++++++++----
 lua/app/ui/main_city/main_city_ui.lua          |  4 ++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/lua/app/ui/game_setting/select_other_btn_ui.lua b/lua/app/ui/game_setting/select_other_btn_ui.lua
index f8f8f68a..0fe1b8f7 100644
--- a/lua/app/ui/game_setting/select_other_btn_ui.lua
+++ b/lua/app/ui/game_setting/select_other_btn_ui.lua
@@ -1,7 +1,7 @@
 local SelectOtherBtnUI = class("SelectOtherBtnUI", BaseUI)
 
-local BTN_OFFSET = -14
-local BTN_INTERVAL = 56
+local BTN_OFFSET = -26
+local BTN_INTERVAL = 59
 
 function SelectOtherBtnUI:ctor()
 end
@@ -28,6 +28,10 @@ function SelectOtherBtnUI:onLoadRootComplete()
 		ModuleManager.MailManager:showMailUI()
 	end)
 
+	local line1 = self.uiMap["select_other_btn_ui.bg.line_1"]
+	local line2 = self.uiMap["select_other_btn_ui.bg.line_2"]
+	local line3 = self.uiMap["select_other_btn_ui.bg.line_3"]
+
 	local cellCount = 0
 	local y = -BTN_OFFSET
 
@@ -47,11 +51,12 @@ function SelectOtherBtnUI:onLoadRootComplete()
 	self.uiMap["select_other_btn_ui.bg.setting_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC))
 
 	if DataManager.MailData:getIsOpen() then
+		line1:setActive(true)
 		cellCount = cellCount + 1
 		y = y - BTN_INTERVAL
 		self.uiMap["select_other_btn_ui.bg.mail_btn"]:setVisible(true)
 		self.uiMap["select_other_btn_ui.bg.mail_btn"]:setAnchoredPositionY(y)
-		
+
 		local redPoint, isAdRedPoint = DataManager.MailData:getRedPoint()
 		if redPoint then
 			if isAdRedPoint then
@@ -64,10 +69,12 @@ function SelectOtherBtnUI:onLoadRootComplete()
 		end
 		self.uiMap["select_other_btn_ui.bg.mail_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.MAIL_NAME))
 	else
+		line1:setActive(false)
 		self.uiMap["select_other_btn_ui.bg.mail_btn"]:setVisible(false)
 	end
 
 	if DataManager.BagData:getIsOpen() then
+		line2:setActive(true)
 		cellCount = cellCount + 1
 		y = y - BTN_INTERVAL
 		local bagBtn = self.uiMap["select_other_btn_ui.bg.bag_btn"]
@@ -83,10 +90,12 @@ function SelectOtherBtnUI:onLoadRootComplete()
 		end)
 		self.uiMap["select_other_btn_ui.bg.bag_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.BAG_DESC_1))
 	else
+		line2:setActive(false)
 		self.uiMap["select_other_btn_ui.bg.bag_btn"]:setVisible(false)
 	end
 
 	if EDITOR_MODE or Platform:getIsDevChannel() then
+		line3:setActive(true)
 		cellCount = cellCount + 1
 		y = y - BTN_INTERVAL
 		local gmBtn = self.uiMap["select_other_btn_ui.bg.gm_btn"]
@@ -97,10 +106,11 @@ function SelectOtherBtnUI:onLoadRootComplete()
 		end)
 		self.uiMap["select_other_btn_ui.bg.gm_btn.text"]:setText("GM")
 	else
+		line3:setActive(false)
 		self.uiMap["select_other_btn_ui.bg.gm_btn"]:setVisible(false)
 	end
 
-	self.uiMap["select_other_btn_ui.bg"]:setSizeDeltaY(cellCount*BTN_INTERVAL - BTN_OFFSET*2)
+	self.uiMap["select_other_btn_ui.bg"]:setSizeDeltaY(cellCount*BTN_INTERVAL + 8)
 end
 
 return SelectOtherBtnUI
\ No newline at end of file
diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua
index 6b395991..ffb5b091 100644
--- a/lua/app/ui/main_city/main_city_ui.lua
+++ b/lua/app/ui/main_city/main_city_ui.lua
@@ -534,7 +534,7 @@ function MainCityUI:refreshTask()
 	self.taskBtn:setVisible(true)
 	local showRedPoint = DataManager.DailyTaskData:showRedPoint()
 	if showRedPoint then
-		self.taskBtn:addRedPoint(32, 28, 1)
+		self.taskBtn:addRedPoint(28, 36, 1)
 	else
 		self.taskBtn:removeRedPoint()
 	end
@@ -615,7 +615,7 @@ end
 
 function MainCityUI:refreshSettingBtn()
 	if (DataManager.MailData:getIsOpen() and DataManager.MailData:getRedPoint()) or DataManager.AIHelperData:getRp() then
-		self.settingBtn:addRedPoint(40, 40, 1)
+		self.settingBtn:addRedPoint(32, 36, 1)
 	else
 		self.settingBtn:removeRedPoint()
 	end