diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab index d4f932bf34..9b4e510a46 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab @@ -3005,6 +3005,7 @@ GameObject: - component: {fileID: 2553759180244413173} - component: {fileID: 5559974153339085360} - component: {fileID: 8594897013185962644} + - component: {fileID: 4439679039454687099} m_Layer: 0 m_Name: Scroll m_TagString: Untagged @@ -3076,6 +3077,14 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!222 &4439679039454687099 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3853548438243551823} + m_CullTransparentMesh: 0 --- !u!1 &3886299620309998347 GameObject: m_ObjectHideFlags: 0 @@ -4168,6 +4177,7 @@ GameObject: m_Component: - component: {fileID: 944098213738272631} - component: {fileID: 5438584371727106758} + - component: {fileID: 2618497146617067296} m_Layer: 5 m_Name: star m_TagString: Untagged @@ -4202,6 +4212,29 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5681427206251380380} m_CullTransparentMesh: 0 +--- !u!114 &2618497146617067296 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5681427206251380380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &5719908235039403081 GameObject: m_ObjectHideFlags: 0 @@ -4648,6 +4681,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4908055247632876805} + - component: {fileID: 2567286864525828672} + - component: {fileID: 7336073635758433815} m_Layer: 5 m_Name: GameObject m_TagString: Untagged @@ -4681,6 +4716,43 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2567286864525828672 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6139901755147080176} + m_CullTransparentMesh: 0 +--- !u!114 &7336073635758433815 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6139901755147080176} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &6278859579252585660 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua index a237423c80..0379102f7b 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua @@ -117,7 +117,7 @@ function this:ShowSingleData(go,heroData,index) end local star,starType = heroData.GetStar(1) SetHeroStars(self.spLoader, starGrid, star,starType) - Util.SetParticleSortLayer(starGrid,this.sortingOrder + 1) + Util.SetParticleSortLayer(starGrid,sortingOrder + 1) Util.AddOnceClick(go, function() for i = 1, #self.maskList do self.maskList[i]:SetActive(false)