diff --git a/Assets/AddressableAssetsData/AssetGroups/IconsHeroDraw.asset b/Assets/AddressableAssetsData/AssetGroups/IconsHeroDraw.asset index 4ca8186e9..322addd68 100644 --- a/Assets/AddressableAssetsData/AssetGroups/IconsHeroDraw.asset +++ b/Assets/AddressableAssetsData/AssetGroups/IconsHeroDraw.asset @@ -917,6 +917,36 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 663771f11518d424ab533371daba096a + m_Address: Assets/Content/Icons/HeroDraw/Role_6.png + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 3975823daeaaa8c49821e788cbe3b5af + m_Address: Assets/Content/Icons/HeroDraw/Role_5.png + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 1cb46ceb3ab00a94789d30d26bf30cb9 + m_Address: Assets/Content/Icons/HeroDraw/Role_4.png + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 7744b7c24c4810640b2769734a271969 + m_Address: Assets/Content/Icons/HeroDraw/Role_3.png + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: ad4a8b262a2e742478296e7e1be345a6 + m_Address: Assets/Content/Icons/HeroDraw/Role_2.png + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: e3ff2c0a644c9794fb6b98f926feebba + m_Address: Assets/Content/Icons/HeroDraw/Role_1.png + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 8b54c61ef06dca34e89fcf16d0b8c4b3, type: 2} m_SchemaSet: diff --git a/Assets/Content/Icons/HeroDraw/Role1.png b/Assets/Content/Icons/HeroDraw/Role_1.png similarity index 100% rename from Assets/Content/Icons/HeroDraw/Role1.png rename to Assets/Content/Icons/HeroDraw/Role_1.png diff --git a/Assets/Content/Icons/HeroDraw/Role1.png.meta b/Assets/Content/Icons/HeroDraw/Role_1.png.meta similarity index 100% rename from Assets/Content/Icons/HeroDraw/Role1.png.meta rename to Assets/Content/Icons/HeroDraw/Role_1.png.meta diff --git a/Assets/Content/Icons/HeroDraw/Role2.png b/Assets/Content/Icons/HeroDraw/Role_2.png similarity index 100% rename from Assets/Content/Icons/HeroDraw/Role2.png rename to Assets/Content/Icons/HeroDraw/Role_2.png diff --git a/Assets/Content/Icons/HeroDraw/Role2.png.meta b/Assets/Content/Icons/HeroDraw/Role_2.png.meta similarity index 100% rename from Assets/Content/Icons/HeroDraw/Role2.png.meta rename to Assets/Content/Icons/HeroDraw/Role_2.png.meta diff --git a/Assets/Content/Icons/HeroDraw/Role3.png b/Assets/Content/Icons/HeroDraw/Role_3.png similarity index 100% rename from Assets/Content/Icons/HeroDraw/Role3.png rename to Assets/Content/Icons/HeroDraw/Role_3.png diff --git a/Assets/Content/Icons/HeroDraw/Role3.png.meta b/Assets/Content/Icons/HeroDraw/Role_3.png.meta similarity index 100% rename from Assets/Content/Icons/HeroDraw/Role3.png.meta rename to Assets/Content/Icons/HeroDraw/Role_3.png.meta diff --git a/Assets/Content/Icons/HeroDraw/Role4.png b/Assets/Content/Icons/HeroDraw/Role_4.png similarity index 100% rename from Assets/Content/Icons/HeroDraw/Role4.png rename to Assets/Content/Icons/HeroDraw/Role_4.png diff --git a/Assets/Content/Icons/HeroDraw/Role4.png.meta b/Assets/Content/Icons/HeroDraw/Role_4.png.meta similarity index 100% rename from Assets/Content/Icons/HeroDraw/Role4.png.meta rename to Assets/Content/Icons/HeroDraw/Role_4.png.meta diff --git a/Assets/Content/Icons/HeroDraw/Role5.png b/Assets/Content/Icons/HeroDraw/Role_5.png similarity index 100% rename from Assets/Content/Icons/HeroDraw/Role5.png rename to Assets/Content/Icons/HeroDraw/Role_5.png diff --git a/Assets/Content/Icons/HeroDraw/Role5.png.meta b/Assets/Content/Icons/HeroDraw/Role_5.png.meta similarity index 100% rename from Assets/Content/Icons/HeroDraw/Role5.png.meta rename to Assets/Content/Icons/HeroDraw/Role_5.png.meta diff --git a/Assets/Content/Icons/HeroDraw/Role6.png b/Assets/Content/Icons/HeroDraw/Role_6.png similarity index 100% rename from Assets/Content/Icons/HeroDraw/Role6.png rename to Assets/Content/Icons/HeroDraw/Role_6.png diff --git a/Assets/Content/Icons/HeroDraw/Role6.png.meta b/Assets/Content/Icons/HeroDraw/Role_6.png.meta similarity index 100% rename from Assets/Content/Icons/HeroDraw/Role6.png.meta rename to Assets/Content/Icons/HeroDraw/Role_6.png.meta diff --git a/Assets/Lua/UI/UITeam/UITeamView.lua b/Assets/Lua/UI/UITeam/UITeamView.lua index 79f799d3d..8b573d89f 100644 --- a/Assets/Lua/UI/UITeam/UITeamView.lua +++ b/Assets/Lua/UI/UITeam/UITeamView.lua @@ -563,11 +563,12 @@ function UITeamView:SetBattleHeroData(idx, uid, node) node.heroLua.text_name.text.text = I18N.T(heroData.cfgData.Name) --立绘路径 - CommonUtil.LoadIcon(self, "HeroDraw/Role" .. idx, function(sprite) + CommonUtil.LoadIcon(self, "HeroDraw/Role_" .. idx, function(sprite) node.heroLua.img_role.image.sprite = sprite node.heroLua.img_role.image:SetNativeSize() end) local imgpos = node.heroLua.img_role:GetComponent(Enum.TypeInfo.RectTransform) + --图片对齐 if idx==1 then imgpos.localPosition=Vector3(-30,0,0) end