From 1d36eecccedb3665adb6a817f0b7af296980fbe5 Mon Sep 17 00:00:00 2001
From: puxuan <413323644@qq.com>
Date: Wed, 29 Oct 2025 16:37:37 +0800
Subject: [PATCH] fix bug

---
 lua/app/global/global_const.lua      |  4 ++--
 lua/app/module/hero/hero_manager.lua | 12 ++----------
 lua/app/module/task/task_const.lua   |  1 +
 lua/app/module/task/task_manager.lua |  7 +++++++
 lua/app/ui/hero/hero_info_comp.lua   |  2 +-
 lua/app/ui/hero/star_info_comp.lua   |  2 +-
 lua/app/userdata/hero/hero_data.lua  | 11 +++++++++++
 7 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua
index 53fa81bb..f57147a3 100644
--- a/lua/app/global/global_const.lua
+++ b/lua/app/global/global_const.lua
@@ -543,8 +543,8 @@ GConst.QLT_LABLE = {
 
 GConst.ENTITY_TYPE = {
 	ITEM_ENTITY = 1,
-	EQUIP_ENTITY = 2,
-	JEWELRY_ENTITY = 3,
+	EQUIP_ENTITY = 3,
+	-- JEWELRY_ENTITY = 3,
 }
 
 GConst.MATCH_ATKP_PERSONAL = {
diff --git a/lua/app/module/hero/hero_manager.lua b/lua/app/module/hero/hero_manager.lua
index 058242cb..02dd4af4 100644
--- a/lua/app/module/hero/hero_manager.lua
+++ b/lua/app/module/hero/hero_manager.lua
@@ -45,15 +45,6 @@ function HeroManager:upgradeHeroFinish(result)
 		DataManager.HeroData:setDirty()
 		DataManager.HeroData:calcPower()
 
-		local heroes = DataManager.HeroData:getAllHeroes()
-		local count = 0
-		for i,v in ipairs(heroes) do
-			if v:getLv() >= 5 then
-				count = count + 1
-			end
-		end
-		ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_HERO_LVUP_5, count)
-
 		AudioManager:playEffect(AudioManager.EFFECT_ID.HERO_UP)
 	end
 end
@@ -81,7 +72,8 @@ function HeroManager:heroStarReqFinish(result)
 
 		local qlt = DataManager.HeroData:getHeroQlt(result.hero.id)
 		if qlt == 5 then
-			ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_STAR_HERO_5, 1)
+			local maxStarQlt5 = DataManager.HeroData:getMaxStarQlt5()
+			ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_STAR_HERO_5, maxStarQlt5)
 		end
 
 		AudioManager:playEffect(AudioManager.EFFECT_ID.HERO_UP)
diff --git a/lua/app/module/task/task_const.lua b/lua/app/module/task/task_const.lua
index 9f55a778..67920e91 100644
--- a/lua/app/module/task/task_const.lua
+++ b/lua/app/module/task/task_const.lua
@@ -63,6 +63,7 @@ TaskConst.TASK_TYPE = {
 TaskConst.RELPACE_TASK_TYPE = {
     TaskConst.TASK_TYPE.X_HERO_MAX_LV_REACH,
     TaskConst.TASK_TYPE.X_HERO_LVUP_5,
+    TaskConst.TASK_TYPE.X_STAR_HERO_5,
 }
 
 return TaskConst
\ No newline at end of file
diff --git a/lua/app/module/task/task_manager.lua b/lua/app/module/task/task_manager.lua
index 4c0ddb43..7afa4eb6 100644
--- a/lua/app/module/task/task_manager.lua
+++ b/lua/app/module/task/task_manager.lua
@@ -213,6 +213,13 @@ function TaskManager:xHeroLvUp(level)
         DataManager.TaskData:setMaxHeroLv(level)
         self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_HERO_MAX_LV_REACH, level)
     end
+    local heroes = DataManager.HeroData:getAllHeroes()
+    local allLvs = {}
+    for _, v in pairs(heroes) do
+        table.insert(allLvs, v:getLv())
+    end
+    table.sort(allLvs, function(a, b) return a > b end)
+    ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_HERO_LVUP_5, allLvs[5] or 0)
 end
 
 function TaskManager:xHeroFragmentGot(count)
diff --git a/lua/app/ui/hero/hero_info_comp.lua b/lua/app/ui/hero/hero_info_comp.lua
index 8c14c7d9..33614580 100644
--- a/lua/app/ui/hero/hero_info_comp.lua
+++ b/lua/app/ui/hero/hero_info_comp.lua
@@ -79,7 +79,7 @@ function HeroInfoComp:refreshLvInfo()
 		local lv = self.heroEntity:getLv()
 		for i, v in ipairs(list) do
 			if lv == v then
-				self.scrollRectComp:moveToIndex(i - 1)
+				self.scrollRectComp:moveToIndex(i)
 				self.vfx04:setAnchoredPositionY(-34 - (i - 1) * 58)
 				self.vfx04:setActive(true)
 				break
diff --git a/lua/app/ui/hero/star_info_comp.lua b/lua/app/ui/hero/star_info_comp.lua
index 2c92bce2..17a47752 100644
--- a/lua/app/ui/hero/star_info_comp.lua
+++ b/lua/app/ui/hero/star_info_comp.lua
@@ -99,7 +99,7 @@ function StarInfoComp:refreshStarInfo()
 	self.vfx04:setActive(false)
 	if self.starUp then
 		local star = self.heroEntity:getStar()
-		self.scrollRectComp:moveToIndex(star - 1)
+		self.scrollRectComp:moveToIndex(star)
 		self.vfx04:setAnchoredPositionY(-34 - (star - 1) * 58)
 		self.vfx04:setActive(true)
 		self.vfx04:play()
diff --git a/lua/app/userdata/hero/hero_data.lua b/lua/app/userdata/hero/hero_data.lua
index 44452c72..5c13ebf3 100644
--- a/lua/app/userdata/hero/hero_data.lua
+++ b/lua/app/userdata/hero/hero_data.lua
@@ -210,6 +210,17 @@ function HeroData:getAllHeroesBIStr()
 	return str
 end
 
+function HeroData:getMaxStarQlt5()
+	local star = 0
+	for k,v in pairs(self.heroes) do
+		local qlt = v:getQlt()
+		if qlt == 5 then
+			star = math.max(star, v:getStar())
+		end
+	end
+	return star
+end
+
 -- 获取所有英雄列表（等级>品质>id）
 function HeroData:getAllHeroesSort(formationType, elementType)
 	local formationMap