装备

lua/app/config/strings/cn/global.lua

@@ -696,9 +696,9 @@ local localization_global =
     ["EQUIP_PARTS_5"] = "鞋子",
     ["EQUIP_PARTS_6"] = "护手",
     ["EQUIP_HERO_DESC_1"] = "没有多余装备",
-    ["EQUIP_HERO_LV_1"] = "强化共鸣{0}级",
+    ["EQUIP_HERO_LV_1"] = "强化共鸣等级",
-    ["EQUIP_HERO_LV_2"] = "品质共鸣{0}级",
+    ["EQUIP_HERO_LV_2"] = "品质共鸣等级",
-    ["EQUIP_HERO_LV_3"] = "精炼共鸣{0}级",
+    ["EQUIP_HERO_LV_3"] = "精炼共鸣等级",
     ["EQUIP_HERO_DESC_2"] = "一键穿戴",
     ["EQUIP_HERO_DESC_3"] = "装备培养",
     ["EQUIP_HERO_DESC_4"] = "装备共鸣",

lua/app/global/global_func.lua

@@ -2124,7 +2124,14 @@ end
 
 function GFunc.getAttrNameByType(type)
 	local key = GFunc.getAttrIdByName(type)
-	return I18N:getText("attr", key, "desc")
+	return I18N:getText("attr", key, "name")
 end
 --@endregion
+
+-- 设置文本长度
+function GFunc.setTextLength(textObj)
+	local meshProComp = textObj:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO)
+	local contentWidth = meshProComp.preferredWidth
+	textObj:setSizeDeltaX(contentWidth)
+end
 return GFunc

lua/app/module/gm/gm_const.lua

@@ -30,6 +30,12 @@ Example: del_item]],
 Example: clear_item]],
 		type = "clear_item"
 	},
+	{
+		title = "全装备",
+		desc = [[全装备 type:all_equips
+Example: all_equips]],
+		type = "all_equips"
+	},
 	{
 		title = "每日重置",
 		desc = [[每日重置 type:reset_by_day

lua/app/ui/common/cell/equip_cell.lua

@@ -38,6 +38,7 @@ function EquipCell:refresh(entity, slotId, showMask, showCheck, showLock)
 	else
 		self.lvTx:setText("")
 	end
+	if slotId then
 		local part = entity:getPart()
 		local uid = entity:getUid()
 		if uid and uid > 0 then
@@ -51,6 +52,10 @@ function EquipCell:refresh(entity, slotId, showMask, showCheck, showLock)
 		else
 			self.refineBg:setActive(false)
 		end
+	else
+		self.lvTx:setText("")
+		self.refineBg:setActive(false)
+	end
 end
 
 function EquipCell:refreshByCfg(id, showMask, showCheck, showLock)
@@ -90,8 +95,11 @@ end
 function EquipCell:refreshEmpty(part, showSelect)
 	self.qltImg:setSprite(GConst.ATLAS_PATH.ICON_EQUIP, "frame_0")
 	-- self.iconImg:setActive(true)
-	self.iconImg:setSprite(GConst.ATLAS_PATH.ICON_EQUIP, "101")
+	self.iconImg:setSprite(GConst.ATLAS_PATH.ICON_EQUIP, "force_frame_" .. part)
 
+	self.lvTx:setText("")
+	self.refineBg:setActive(false)
+	self.starNode:setActive(false)
 	self:showMask(false)
 	self:showCheck(false)
 	self:showLock(false)

lua/app/ui/equip/cell/equip_list_cell.lua

@@ -4,11 +4,15 @@ function EquipListCell:init()
 	local uiMap = self.baseObject:genAllChildren()
 	self.equipCell = uiMap["cell.equip_cell"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.EQUIP_CELL)
 	self.nameTx = uiMap["cell.name_tx"]
-	self.powerTx = uiMap["cell.power_tx"]
+	self.powerTx = uiMap["cell.power_node.power_tx"]
 	self.wearBtn = uiMap["cell.wear_btn"]
 	self.wearBtnIcon = uiMap["cell.wear_btn.icon"]
 	self.wearBtnTx = uiMap["cell.wear_btn.text"]
+	self.powerNode = uiMap["cell.power_node"]
+	self.powerDescTx = uiMap["cell.power_node.power_desc_tx"]
 	self.wearBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_30))
+	self.powerDescTx:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_DESC_10))
+	GFunc.setTextLength(self.powerDescTx)
 
 	self.wearBtn:addClickListener(function()
 		ModuleManager.EquipManager:onEquipWearReq(self.slotId, {self.equipEntity:getUid()})
@@ -22,6 +26,8 @@ function EquipListCell:refresh(equipEntity, slotId, equipPart)
 	self.nameTx:setText(equipEntity:getNameQltColor())
 	self.powerTx:setText(equipEntity:getPower())
 	self.equipCell:refresh(equipEntity, slotId)
+	GFunc.setTextLength(self.powerTx)
+	self.powerNode:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT):RefreshLayout()
 
 	local useHero = DataManager.EquipData:getEquipUseHero(equipEntity:getUid())
 	if useHero then

lua/app/ui/equip/equip_get_resonate_ui.lua

@@ -22,21 +22,19 @@ function EquipGetEesonateUI:onLoadRootComplete()
 		self:closeUI()
 	end)
 
-	self.layout = uiMap["equip_get_resonate_ui.attr_bg.layout"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT)
+	self.layout = uiMap["equip_get_resonate_ui.bg.b'gattr_bg.layout"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT)
-	self.attrNextValueTx = uiMap["equip_get_resonate_ui.attr_bg.layout.attr_next_value_tx"]
+	self.attrNextValueTx = uiMap["equip_get_resonate_ui.bg.attr_bg.layout.attr_next_value_tx"]
-	-- self.effect = uiMap["equip_get_resonate_ui.vfx_b13_ui_equip_gongmin_b01"]
+	-- self.effect = uiMap["equip_get_resonate_ui.bg.vfx_b13_ui_equip_gongmin_b01"]
-	uiMap["equip_get_resonate_ui.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_DESC_33))
+	uiMap["equip_get_resonate_ui.bg.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_DESC_33))
 	-- self.spineTitle:playAnimComplete("born", false, true, function()
 	--     self.spineTitle:playAnim("idle", true, true)
 	-- end)
-	uiMap["equip_get_resonate_ui.name_tx"]:setText(I18N:getGlobalText("EQUIP_HERO_LV_" .. self.type, self.lvNew))
+	uiMap["equip_get_resonate_ui.bg.name_tx"]:setText(I18N:getGlobalText("EQUIP_HERO_LV_" .. self.type, self.lvNew))
 	-- self.effect:play()
-	uiMap["equip_get_resonate_ui.attr_bg.attr_name_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.TAG_4_1))
+	uiMap["equip_get_resonate_ui.bg.attr_bg.attr_name_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.ATTR_ATK))
-	uiMap["equip_get_resonate_ui.attr_bg.layout.attr_curr_value_tx"]:setText(self.attrNum)
+	uiMap["equip_get_resonate_ui.bg.attr_bg.layout.attr_curr_value_tx"]:setText(self.attrNum)
 	self.attrNextValueTx:setText(self.attrNextNum)
-	local meshProCompNext = self.attrNextValueTx:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO)
+	GFunc.setTextLength(self.attrNextValueTx)
-	local nowTipsNextX = meshProCompNext.preferredWidth
-	self.attrNextValueTx:setSizeDeltaX(nowTipsNextX)
 	self.layout:RefreshLayout()
 end
 

lua/app/ui/equip/equip_growth_ui.lua

@@ -37,8 +37,8 @@ function EquipGrowthUI:onLoadRootComplete()
 	self.equipCell = uiMap["equip_growth_ui.bg.equip_cell"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.EQUIP_CELL)
 
 	-- 强化
-	self.upCurrLvTx = uiMap["equip_growth_ui.bg.page_info_1.curr_lv_tx"]
+	self.upCurrLvTx = uiMap["equip_growth_ui.bg.page_info_1.bg1.curr_lv_tx"]
-	self.upNextLvTx = uiMap["equip_growth_ui.bg.page_info_1.next_lv_tx"]
+	self.upNextLvTx = uiMap["equip_growth_ui.bg.page_info_1.bg2.next_lv_tx"]
 	self.upDescTx = uiMap["equip_growth_ui.bg.page_info_1.attr_bg.desc_tx"]
 	self.upAttrNameTx = uiMap["equip_growth_ui.bg.page_info_1.attr_bg.attr_name_tx"]
 	self.upAttrCurrTx = uiMap["equip_growth_ui.bg.page_info_1.attr_bg.attr_curr_tx"]
@@ -108,6 +108,10 @@ function EquipGrowthUI:onLoadRootComplete()
 	for i = 1, 6 do
 		self.equipCells[i] = uiMap["equip_growth_ui.bg.equip_list.equip_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.EQUIP_CELL)
 		self.equipCells[i]:addClickListener(function()
+			local eid = DataManager.EquipData:getPartEquipUid(self.slotId, i)
+			if not eid or eid <= 0 then
+				return
+			end
 			if self.equipPart == i then
 				return
 			end
@@ -133,7 +137,7 @@ function EquipGrowthUI:onLoadRootComplete()
 		end)
 	end
 
-	uiMap["equip_growth_ui.bg.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.BAG_DESC_1))
+	uiMap["equip_growth_ui.bg.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_DESC_18))
 
 	self:bind(DataManager.HeroData, "isDirty", function()
 		self:onRefresh()
@@ -176,12 +180,12 @@ function EquipGrowthUI:refreshPageBtn()
 	for i = 1, 2 do
 		if self.page == i then
 			self.pageInfos[i]:setActive(true)
-			self.pageBtns[i]:setSprite(GConst.ATLAS_PATH.COMMON, "common_tab_1")
+			self.pageBtns[i]:setSprite(GConst.ATLAS_PATH.COMMON, "common_menu_1")
 			self.pageBtnTxs[i]:setText(self.btnTxs[i])
 		else
 			self.pageInfos[i]:setActive(false)
-			self.pageBtns[i]:setSprite(GConst.ATLAS_PATH.COMMON, "common_tab_2")
+			self.pageBtns[i]:setSprite(GConst.ATLAS_PATH.COMMON, "common_menu_2")
-			self.pageBtnTxs[i]:setText("<color=#72778C>" .. self.btnTxs[i] .. "</color>")
+			self.pageBtnTxs[i]:setText(self.btnTxs[i])
 		end
 	end
 end
@@ -207,7 +211,7 @@ function EquipGrowthUI:refreshPageUp()
 	-- 	self.equipCell:refreshEmpty(self.equipPart)
 	-- end
 
-	self.upCurrLvTx:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_12) .. lv)
+	self.upCurrLvTx:setText(lv)
 	self.upDescTx:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_14))
 	local lv1 = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.LV_UP, self.equipPart)
 	self.upDescTx1:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_ACTIVATION_1, lv1))
@@ -219,7 +223,7 @@ function EquipGrowthUI:refreshPageUp()
 	local currAttrNum = GFunc.getFinalAttrValue(currAttr.type, currAttr.num + resonateAttrNum)
 	self.upAttrCurrTx:setText(currAttrNum)
 	if not isLvMax then
-		self.upNextLvTx:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_12) .. (lv + 1))
+		self.upNextLvTx:setText(lv + 1)
 		local nextAttr = equipEntity:getBaseAttrWithLv(lv + 1)
 		local nextAttrNum = GFunc.getFinalAttrValue(nextAttr.type, nextAttr.num + resonateAttrNum)
 		self.upAttrNextTx:setText(nextAttrNum)

lua/app/ui/equip/equip_info_ui.lua

@@ -93,12 +93,14 @@ function EquipInfoUI:refreshInfo()
 	self.partTx:setText(self.entity:getPartName())
 	self.powerTx:setText(self.entity:getPower())
 	local attr = self.entity:getBaseAttr()
-	self.attrNameTx:setText(GFunc.getAttrDesc(attr.type, attr.num))
+	self.attrNameTx:setText(GFunc.getAttrNameByType(attr.type))
 	self.attrValueTx:setText(attr.num // GConst.DEFAULT_FACTOR)
 
-	local txW = self.attrValueTx:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO).preferredWidth
+	local meshProCompNext = self.attrValueAddTx:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO)
-	self.attrValueTx:setSizeDeltaX(txW)
+	local nowTipsNextX = meshProCompNext.preferredWidth
-	self.attrValueAddTx:setAnchoredPositionX(self.attrValueTx:getAnchoredPositionX() + txW + 5)
+	self.attrValueAddTx:setSizeDeltaX(nowTipsNextX)
+	local anchorX = nowTipsNextX - 40
+	self.attrValueTx:setAnchoredPositionX(anchorX)
 end
 
 function EquipInfoUI:refreshPreview()
@@ -171,10 +173,10 @@ function EquipInfoUI:refreshAllAttr()
 			cell.attrExtraCell:setActive(true)
 			local extraAttr = attrs[i]
 			local extraAttrId = GFunc.getAttrIdByName(extraAttr.type)
-			cell.attrNameTx:setText(GFunc.getAttrDesc(extraAttr.type, extraAttr.num))
+			cell.attrNameTx:setText(GFunc.getAttrNameByType(extraAttr.type))
 			cell.attrValueTx:setText(GFunc.getFinalAttrValue(extraAttr.type, extraAttr.num))
 			local attrAdd = DataManager.EquipData:getRefineAttrAdd(self.refine, extraAttrId)
-			local anchorX = -3
+			local anchorX = -40
 			if attrAdd.num <= 0 then
 				cell.attrValueAddTx:setActive(false)
 			else

lua/app/ui/equip/equip_list_ui.lua

@@ -50,7 +50,7 @@ function EquipListUI:onRefresh()
 	self:refreshEquipCell()
 	self:refreshScrollrect()
 
-	self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.BAG_DESC_1))
+	self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_DESC_15))
 end
 
 function EquipListUI:refreshEquipCell()

lua/app/ui/equip/equip_resolve_ui.lua

@@ -178,7 +178,7 @@ function EquipResolveUI:openPartSelect()
 	end
 	self.partSeq = DOTweenManager:createSeqWithIntId()
 	local startSize = self.listPart:getSizeDeltaY()
-	local endSize = self.isOpenPartSelect and 485 or 0
+	local endSize = self.isOpenPartSelect and 420 or 0
 	local tween = CS.DG.Tweening.DOTween.To(
 		function()
 			return startSize
@@ -216,7 +216,7 @@ function EquipResolveUI:openQltSelect()
 	end
 	self.qltSeq = DOTweenManager:createSeqWithIntId()
 	local startSize = self.listQlt:getSizeDeltaY()
-	local endSize = self.isOpenQltSelect and 355 or 0
+	local endSize = self.isOpenQltSelect and 368 or 0
 	local tween = CS.DG.Tweening.DOTween.To(
 		function()
 			return startSize

lua/app/ui/equip/equip_resonate_ui.lua

@@ -92,11 +92,11 @@ end
 function EquipResonateUI:refreshPageBtn()
 	for i = 1, 3 do
 		if self.page == i then
-			self.pageBtns[i]:setSprite(GConst.ATLAS_PATH.COMMON, "common_tab_1")
+			self.pageBtns[i]:setSprite(GConst.ATLAS_PATH.COMMON, "common_menu_1")
 			self.pageBtnTxs[i]:setText(self.btnTxs[i])
 		else
-			self.pageBtns[i]:setSprite(GConst.ATLAS_PATH.COMMON, "common_tab_2")
+			self.pageBtns[i]:setSprite(GConst.ATLAS_PATH.COMMON, "common_menu_2")
-			self.pageBtnTxs[i]:setText("<color=#72778C>" .. self.btnTxs[i] .. "</color>")
+			self.pageBtnTxs[i]:setText(self.btnTxs[i])
 		end
 	end
 end

lua/app/ui/hero/equip_info_comp.lua

@@ -3,11 +3,6 @@ local EquipInfoComp = class("EquipInfoComp", LuaComponent)
 function EquipInfoComp:init()
 	local uiMap = self:getUIMap()
 
-	self.atkNameTx = uiMap["equip_info.bg_5.atk_name_tx"]
-	self.atkTx = uiMap["equip_info.bg_5.atk_tx"]
-	self.hpNameTx = uiMap["equip_info.bg_6.hp_name_tx"]
-	self.hpTx = uiMap["equip_info.bg_6.hp_tx"]
-	self.attrBtn = uiMap["equip_info.bg_6.attr_btn"]
 	self.descTx = uiMap["equip_info.equip_node.up.desc_tx"]
 	self.descTx1 = uiMap["equip_info.equip_node.up.desc_tx_1"]
 	self.infoBtn = uiMap["equip_info.equip_node.up.info_btn"]
@@ -18,8 +13,6 @@ function EquipInfoComp:init()
 	self.equipNode = uiMap["equip_info.equip_node"]
 	self.emptyTx = uiMap["equip_info.empty_tx"]
 
-	self.hpNameTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_2))
-	self.atkNameTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_3))
 	self.emptyTx:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_DESC_7))
 	self.upBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_DESC_3))
 	self.autoWaerBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_DESC_2))
@@ -46,6 +39,10 @@ function EquipInfoComp:init()
 			end
 		end)
 	end
+	for i = 1, 3 do
+		local descTx = uiMap["equip_info.equip_node.up.suit_desc_tx_" .. i]
+		descTx:setText(I18N:getGlobalText(I18N.GlobalConst["EQUIP_HERO_LV_" .. i]))
+	end
 	self.descTx:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_DESC_4))
 	self.descTx1:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_DESC_5))
 
@@ -63,9 +60,6 @@ function EquipInfoComp:init()
 	self.upBtn:addClickListener(function()
 		ModuleManager.EquipManager:showEquipGrowthUI(self.heroEntity:getMatchType(), 1)
 	end)
-	self.attrBtn:addClickListener(function()
-		UIManager:showUI("app/ui/hero/hero_attr_ui", {heroEntity = self.heroEntity})
-	end)
 	self.infoBtn:addClickListener(function()
 		ModuleManager.EquipManager:showEquipResonateUI(self.heroEntity:getMatchType(), 1)
 	end)
@@ -80,41 +74,10 @@ function EquipInfoComp:setHeroData(heroEntity)
 end
 
 function EquipInfoComp:refresh()
-	self:refreshAttr()
 	self:refreshEquip()
 	self:refreshEquipSuit()
 end
 
-function EquipInfoComp:refreshAttr()
-	self.hpNameTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_2))
-	self.atkNameTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_3))
-
-	local lv = self.heroEntity:getLv()
-	local hpStr
-	local atkStr
-	if not self.heroEntity:isActived() then
-		hpStr = self.heroEntity:getCfgHp(self.heroEntity:getBeginLv()) // GConst.DEFAULT_FACTOR
-		atkStr = self.heroEntity:getCfgAtk(self.heroEntity:getBeginLv()) // GConst.DEFAULT_FACTOR
-	else
-		local curHp = self.heroEntity:getHp() // GConst.DEFAULT_FACTOR
-		local curAtk = self.heroEntity:getAtk() // GConst.DEFAULT_FACTOR
-		local addHp = (self.heroEntity:getCfgHp(lv + 1) - self.heroEntity:getCfgHp()) // GConst.DEFAULT_FACTOR
-		local addAtk = (self.heroEntity:getCfgAtk(lv + 1) - self.heroEntity:getCfgAtk()) // GConst.DEFAULT_FACTOR
-		if addHp <= 0 then
-			hpStr = curHp
-		else
-			hpStr = curHp .. "<color=#A2FF29>+" .. addHp .. "</color>"
-		end
-		if addAtk <= 0 then
-			atkStr = curAtk
-		else
-			atkStr = curAtk .. "<color=#A2FF29>+" .. addAtk .. "</color>"
-		end
-	end
-	self.hpTx:setText(hpStr)
-	self.atkTx:setText(atkStr)
-end
-
 function EquipInfoComp:refreshEquip()
 	local slotId = self.heroEntity:getMatchType()
 	self.curFormation = DataManager.FormationData:getStageFormation()
@@ -137,14 +100,10 @@ function EquipInfoComp:refreshEquip()
 end
 
 function EquipInfoComp:refreshEquipSuit()
-	local suitLvs = {1, 2, 3}
+	local slotId = self.heroEntity:getMatchType()
-	local suitDescs = {
-		I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_LV_1, suitLvs[1]),
-		I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_LV_2, suitLvs[2]),
-		I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_LV_3, suitLvs[3])
-	}
 	for i = 1, 3 do
-		self.suitTxs[i]:setText(suitDescs[i])
+		local lv = DataManager.EquipData:getResonateLevel(i, slotId)
+		self.suitTxs[i]:setText(lv)
 	end
 end
 

lua/app/ui/hero/hero_detail_ui.lua

@@ -19,10 +19,6 @@ local BTN_NORMAL = {
 	"act_common_btn_18_2",
 }
 
-function HeroDetailUI:isFullScreen()
-	return false
-end
-
 function HeroDetailUI:getPrefabPath()
 	return "assets/prefabs/ui/hero/hero_detail_ui.prefab"
 end
@@ -66,16 +62,16 @@ function HeroDetailUI:onLoadRootComplete()
 	self.qltBgTx = uiMap["hero_detail_ui.top.qlt_bg.qlt_tx"]
 	self.starComp = uiMap["hero_detail_ui.top.star_cell"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.STAR_CELL)
 
-	self.lvTx = uiMap["hero_detail_ui.top.bg_1.bg_4.lv_tx"]
+	self.lvTx = uiMap["hero_detail_ui.top.attr_node.bg_4.lv_tx"]
-	self.bg5 = uiMap["hero_detail_ui.top.bg_1.bg_5"]
+	self.bg5 = uiMap["hero_detail_ui.top.attr_node.bg_5"]
-	self.bg6 = uiMap["hero_detail_ui.top.bg_1.bg_6"]
+	self.bg6 = uiMap["hero_detail_ui.top.attr_node.bg_6"]
-	self.hpNameTx = uiMap["hero_detail_ui.top.bg_1.bg_6.hp_name_tx"]
+	self.hpNameTx = uiMap["hero_detail_ui.top.attr_node.bg_6.hp_name_tx"]
-	self.atkNameTx = uiMap["hero_detail_ui.top.bg_1.bg_5.atk_name_tx"]
+	self.atkNameTx = uiMap["hero_detail_ui.top.attr_node.bg_5.atk_name_tx"]
-	self.hpTx = uiMap["hero_detail_ui.top.bg_1.bg_6.hp_tx"]
+	self.hpTx = uiMap["hero_detail_ui.top.attr_node.bg_6.hp_tx"]
-	self.atkTx = uiMap["hero_detail_ui.top.bg_1.bg_5.atk_tx"]
+	self.atkTx = uiMap["hero_detail_ui.top.attr_node.bg_5.atk_tx"]
-	self.bg4Vfx01 = uiMap["hero_detail_ui.top.bg_1.bg_4.vfx_c1_ui_up_b01"]
+	self.bg4Vfx01 = uiMap["hero_detail_ui.top.attr_node.bg_4.vfx_c1_ui_up_b01"]
-	self.bg5Vfx01 = uiMap["hero_detail_ui.top.bg_1.bg_5.vfx_c1_ui_up_b01"]
+	self.bg5Vfx01 = uiMap["hero_detail_ui.top.attr_node.bg_5.vfx_c1_ui_up_b01"]
-	self.bg6Vfx01 = uiMap["hero_detail_ui.top.bg_1.bg_6.vfx_c1_ui_up_b01"]
+	self.bg6Vfx01 = uiMap["hero_detail_ui.top.attr_node.bg_6.vfx_c1_ui_up_b01"]
 	self.bg5:addClickListener(function()
 		UIManager:showUI("app/ui/hero/hero_attr_ui", {heroEntity = self.heroEntity})
 	end)
@@ -104,6 +100,7 @@ function HeroDetailUI:onLoadRootComplete()
 	end
 
 	self.skillNode = uiMap["hero_detail_ui.top.bg_1"]
+	self.attrNode = uiMap["hero_detail_ui.top.attr_node"]
 	self.skillBg = uiMap["hero_detail_ui.top.bg_1.skill_node.skill_bg"]
 	self.imgSkill = uiMap["hero_detail_ui.top.bg_1.skill_node.skill_bg.skill_icon"]
 	self.skillNameTx = uiMap["hero_detail_ui.top.bg_1.skill_node.skill_bg.skill_name_tx"]
@@ -378,6 +375,7 @@ function HeroDetailUI:showHeroInfo()
 	self.starInfo:setActive(false)
 	self.equipInfo:setActive(false)
 	self.skillNode:setActive(true)
+	self.attrNode:setAnchoredPositionY(-709)
 
 	local power = self.heroEntity:getPower()
 	self.powerTx:setText(GFunc.num2Str2(power, 2))
@@ -397,6 +395,7 @@ function HeroDetailUI:showStarInfo()
 	self.starInfo:setActive(true)
 	self.equipInfo:setActive(false)
 	self.skillNode:setActive(true)
+	self.attrNode:setAnchoredPositionY(-709)
 
 	if not self.compStar then
 		self.starInfo:initPrefabHelper()
@@ -414,6 +413,7 @@ function HeroDetailUI:showEquipInfo()
 	self.starInfo:setActive(false)
 	self.equipInfo:setActive(true)
 	self.skillNode:setActive(false)
+	self.attrNode:setAnchoredPositionY(-527)
 
 	if not self.compEquip then
 		self.equipInfo:initPrefabHelper()