diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index 557e2df4e4..5c3900392a 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -290,7 +290,7 @@ RectTransform: - {fileID: 4509249573467822093} - {fileID: 3757631025663078137} m_Father: {fileID: 7086677512586395648} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5253,8 +5253,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 152083775259277987} - m_Father: {fileID: 7086677512586395648} - m_RootOrder: 0 + m_Father: {fileID: 8221946263362407270} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -56543,7 +56543,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 224987734323317496} - {fileID: 224085485601556682} - {fileID: 1761062799490895474} m_Father: {fileID: 224287801546099592} @@ -56819,7 +56818,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1467830102957527101 RectTransform: m_ObjectHideFlags: 0 @@ -57574,7 +57573,7 @@ RectTransform: - {fileID: 7886016975425210836} - {fileID: 7378491621259619999} m_Father: {fileID: 7086677512586395648} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -57619,14 +57618,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1467830102957527101} + - {fileID: 224987734323317496} m_Father: {fileID: 224287801546099592} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 114.92999, y: -365.90002} + m_AnchoredPosition: {x: 116, y: -42} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7854679572375693773 MonoBehaviour: m_ObjectHideFlags: 0 @@ -57644,8 +57644,8 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 6 - m_Spacing: 0 + m_ChildAlignment: 7 + m_Spacing: 40.5 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua index 36c38abe44..5ed3234e77 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua @@ -25,6 +25,7 @@ function this:InitComponent(gameObject) for i = 1, 3 do self.wishListObj[i] = Util.GetGameObject(gameObject,"wishList/hero ("..i..")") self.bgObjlist[i] = Util.GetGameObject(gameObject,"Bg/bglist/obj"..i) + Util.GetGameObject(self.bgObjlist[i], "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_topkaung") end --tabList self.tabListObj = {} @@ -98,6 +99,7 @@ function this:SetUpHero() for i = 1, 3 do local go = self.wishListObj[i] local frame = Util.GetGameObject(go, "frame"):GetComponent("Image") + frame.sprite = self.spLoader:LoadSprite("t_tongyong_topkaung") local icon = Util.GetGameObject(go, "icon"):GetComponent("Image") local proIcon = Util.GetGameObject(go, "proIcon"):GetComponent("Image") local starGrid = Util.GetGameObject(go, "star") @@ -107,7 +109,7 @@ function this:SetUpHero() if heroId > 0 then go:SetActive(true) local heroData = heroConfig[heroId] - frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.Quality,heroData.Star)) + icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroData.Icon)) proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName)) SetHeroStars(self.spLoader,starGrid, heroData.Star) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index d62c7eb889..dd79e3ff92 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -88,7 +88,7 @@ function RoleInfoPanel:InitComponent() this.powerBtn = Util.GetGameObject(this.roleInfoRoot, "powerBtn") this.force = Util.GetGameObject(this.powerBtn, "value"):GetComponent("Text") this.upLvEffect = Util.GetGameObject(this.powerBtn,"effect") - this.equipBtn=Util.GetGameObject(self.transform,"rightGrid/equipBtn") + this.equipBtn=Util.GetGameObject(self.transform,"leftGrid/equipBtn") this.equipBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_zhuanbeianniu_zh") this.equipBtnRedPoint=Util.GetGameObject(this.equipBtn,"redPoint") this.soulPrintBtn=Util.GetGameObject(self.transform,"rightGrid/soulPrintBtn")