From cd58359de170acd085c0258587221d38953fb1c7 Mon Sep 17 00:00:00 2001
From: puxuan <413323644@qq.com>
Date: Tue, 28 Oct 2025 20:57:39 +0800
Subject: [PATCH] fix bug

---
 lua/app/ui/battle/battle_base_ui.lua        |  3 +++
 lua/app/ui/common/cell/equip_cell.lua       |  1 +
 lua/app/ui/main_city/main_city_ui.lua       | 15 ++++-----------
 lua/app/userdata/equip/equip_data.lua       |  2 +-
 lua/app/userdata/talent/talent_data.lua     |  2 +-
 lua/app/userdata/tutorial/tutorial_data.lua |  6 ++++++
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/lua/app/ui/battle/battle_base_ui.lua b/lua/app/ui/battle/battle_base_ui.lua
index 700ece1e..a3453a7a 100644
--- a/lua/app/ui/battle/battle_base_ui.lua
+++ b/lua/app/ui/battle/battle_base_ui.lua
@@ -317,6 +317,9 @@ end
 
 function BattleBaseUI:initSpeedBtn()
 	local spdBtn = self.uiMap["battle_ui.top_node.speed_btn"]
+    if not spdBtn then
+        return
+    end
 	local spdBtnImg = self.uiMap["battle_ui.top_node.speed_btn.img"]
 	spdBtn:addClickListener(function()
 		if not DataManager.PrivilegeCardData:getIsMonthlyCardActive() then
diff --git a/lua/app/ui/common/cell/equip_cell.lua b/lua/app/ui/common/cell/equip_cell.lua
index 89d1eb80..d8ba9d87 100644
--- a/lua/app/ui/common/cell/equip_cell.lua
+++ b/lua/app/ui/common/cell/equip_cell.lua
@@ -84,6 +84,7 @@ function EquipCell:_refresh(entity, showMask, showCheck, showLock)
 			v:setActive(false)
 		end
 	end
+	self.starNode:setActive(true)
 	self.starNode:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT):RefreshLayout()
 
 	self:showMask(showMask)
diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua
index 7085c8fb..fa65d086 100644
--- a/lua/app/ui/main_city/main_city_ui.lua
+++ b/lua/app/ui/main_city/main_city_ui.lua
@@ -111,7 +111,6 @@ function MainCityUI:onClose()
 end
 
 function MainCityUI:onReshow()
-	self:checkMainPop()
 	-- 检查目前没开的侧边栏功能是否有可以开启的
     if self.sideBarComp then
         self.sideBarComp:onReshow()
@@ -686,7 +685,7 @@ function MainCityUI:checkTutorial(onlyCheck)
 		end
 	end
 
-	if DataManager.TalentData:getIsOpen() then
+	if not DataManager.TutorialData:getIsFuncTutorialFinished2(GConst.TutorialConst.TALENT_OPEN) and DataManager.TalentData:getIsOpen() then
 		if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.TALENT_OPEN, onlyCheck) then
 			return true
 		end
@@ -698,8 +697,8 @@ function MainCityUI:checkTutorial(onlyCheck)
 		end
 	end
 
-	if DataManager.DailyChallengeData:isOpen() then
-		if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.UNLOCK_DAILY_CHALLENGE, onlyCheck) then
+	if not DataManager.TutorialData:getIsFuncTutorialFinished2(GConst.TutorialConst.DAILY_CHALLENGE_OPEN) and DataManager.DailyChallengeData:isOpen() then
+		if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.DAILY_CHALLENGE_OPEN, onlyCheck) then
 			return true
 		end
 	end
@@ -710,13 +709,7 @@ function MainCityUI:checkTutorial(onlyCheck)
 	-- 	end
 	-- end
 
-	if DataManager.DailyChallengeData:isOpen() then
-		if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.DAILY_CHALLENGE_OPEN, onlyCheck) then
-			return true
-		end
-	end
-
-	if DataManager.ArenaData:isOpen() then
+	if not DataManager.TutorialData:getIsFuncTutorialFinished2(GConst.TutorialConst.UNLOCK_ARENA) and DataManager.ArenaData:isOpen() then
 		if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.UNLOCK_ARENA, onlyCheck) then
 			return true
 		end
diff --git a/lua/app/userdata/equip/equip_data.lua b/lua/app/userdata/equip/equip_data.lua
index 9bb625cd..e237f6a8 100644
--- a/lua/app/userdata/equip/equip_data.lua
+++ b/lua/app/userdata/equip/equip_data.lua
@@ -918,7 +918,7 @@ function EquipData:hasEquipRefineRedPoint(slotId, part)
 	end
 	local refine = self:getPartRefine(slotId, part)
 	local needLevel = self:getRefineNeedLevel(refine + 1)
-	if needLevel == nil or needLevel > self:getPartLevel(slotId, part) then
+	if needLevel == nil or needLevel > self:getPartLv(slotId, part) then
 		return false
 	end
 	local itemCost = self:getRefineCost(refine + 1)
diff --git a/lua/app/userdata/talent/talent_data.lua b/lua/app/userdata/talent/talent_data.lua
index 8bde8a0c..faf2008c 100644
--- a/lua/app/userdata/talent/talent_data.lua
+++ b/lua/app/userdata/talent/talent_data.lua
@@ -31,7 +31,7 @@ function TalentData:clear()
 end
 
 function TalentData:getIsOpen()
-	if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.TALENT_OPEN) then
+	if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.TALENT_OPEN, true) then
 		return true
 	end
 	return false
diff --git a/lua/app/userdata/tutorial/tutorial_data.lua b/lua/app/userdata/tutorial/tutorial_data.lua
index 6415d6e0..c2f4e381 100644
--- a/lua/app/userdata/tutorial/tutorial_data.lua
+++ b/lua/app/userdata/tutorial/tutorial_data.lua
@@ -223,6 +223,12 @@ function TutorialData:getIsFuncTutorialFinished(id)
 	return self.funcTutorialMap[id] == true
 end
 
+--@TODO 2025-10-28 20:33:16
+function TutorialData:getIsFuncTutorialFinished2(id)
+	local cfg = ConfigManager:getConfig("tutorial_start")[id]
+	return self:getIsFuncTutorialFinished(cfg.start_id)
+end
+
 function TutorialData:getTutorialIdList()
 	if not self.tutorialIdlist then
 		self.tutorialIdlist = {}