diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab index d120466145..9dee5f4b75 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab @@ -1536,80 +1536,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &773493715476284862 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 694760365003239870} - - component: {fileID: 697837042366115822} - - component: {fileID: 805615872229860552} - m_Layer: 5 - m_Name: Bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &694760365003239870 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 773493715476284862} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2778119602345671483} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &697837042366115822 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 773493715476284862} - m_CullTransparentMesh: 0 ---- !u!114 &805615872229860552 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 773493715476284862} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - 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: 21300000, guid: 9658c5a8f1777e74d9a8915414aaa5ac, type: 3} - 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 &773774220536202640 GameObject: m_ObjectHideFlags: 0 @@ -1718,12 +1644,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 2778119602345671483} - m_RootOrder: 2 + m_Father: {fileID: 6233933400349217064} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 417.2, y: 630.6} + m_AnchoredPosition: {x: 417.2, y: 66} m_SizeDelta: {x: 142, y: 131} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &697118250466200742 @@ -5222,6 +5148,7 @@ GameObject: m_Component: - component: {fileID: 5895856323007929039} - component: {fileID: 3898314206317427175} + - component: {fileID: 8087194531459420139} m_Layer: 0 m_Name: Content m_TagString: Untagged @@ -5244,14 +5171,13 @@ RectTransform: - {fileID: 6155825235263467664} - {fileID: 1323328217239937113} - {fileID: 1290847290199451447} - - {fileID: 2041658285895753670} m_Father: {fileID: 2778119602345671483} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -51.450012} - m_SizeDelta: {x: 920, y: 1233.1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 460, y: 0} + m_SizeDelta: {x: 920, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3898314206317427175 MonoBehaviour: @@ -5272,10 +5198,24 @@ MonoBehaviour: m_Bottom: 0 m_ChildAlignment: 1 m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!114 &8087194531459420139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2453878810572281153} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &2456801146375888563 GameObject: m_ObjectHideFlags: 0 @@ -8038,6 +7978,44 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3748950197918012084 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6233933400349217064} + m_Layer: 5 + m_Name: other + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6233933400349217064 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3748950197918012084} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2133564154517955022} + - {fileID: 694762005450041926} + - {fileID: 6223836349611834001} + m_Father: {fileID: 2778119602345671483} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3787231434654199887 GameObject: m_ObjectHideFlags: 0 @@ -10333,7 +10311,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6223836349611834001 RectTransform: m_ObjectHideFlags: 0 @@ -10346,8 +10324,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1976903910325902947} - m_Father: {fileID: 2778119602345671483} - m_RootOrder: 4 + m_Father: {fileID: 6233933400349217064} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -14131,7 +14109,6 @@ GameObject: - component: {fileID: 7009139964256499432} - component: {fileID: 1233282166592705828} - component: {fileID: 7506645931245581222} - - component: {fileID: 88395527017583553} m_Layer: 0 m_Name: Button m_TagString: Untagged @@ -14146,18 +14123,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7223032231362597018} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4924777543454380687} - {fileID: 124666416754824053} - m_Father: {fileID: 5895856323007929039} - m_RootOrder: 4 + m_Father: {fileID: 2778119602345671483} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 460, y: -1164} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 260, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6760836772324445785 @@ -14258,26 +14235,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &88395527017583553 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7223032231362597018} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!1 &7294175564942577139 GameObject: m_ObjectHideFlags: 0 @@ -14967,6 +14924,8 @@ GameObject: - component: {fileID: 2546993476903879026} - component: {fileID: 9137815746482230246} - component: {fileID: 6788805738883482725} + - component: {fileID: 4227615780468202893} + - component: {fileID: 2592564729086439109} m_Layer: 5 m_Name: Frame m_TagString: Untagged @@ -14985,18 +14944,16 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 694760365003239870} - - {fileID: 2133564154517955022} - - {fileID: 694762005450041926} + - {fileID: 6233933400349217064} - {fileID: 5895856323007929039} - - {fileID: 6223836349611834001} + - {fileID: 2041658285895753670} m_Father: {fileID: 694931557968458218} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -19} - m_SizeDelta: {x: 920, y: 1336} + m_SizeDelta: {x: 920, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2546993476903879026 CanvasRenderer: @@ -15055,8 +15012,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 3e71ed27c496acc4b92fe95a6e2d6339, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 60da54ea70faabc49823d0462d3ae80d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -15064,6 +15021,43 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &4227615780468202893 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7433469143862602047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 100 + m_Bottom: 20 + m_ChildAlignment: 1 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &2592564729086439109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7433469143862602047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 1 --- !u!1 &7501062666466015348 GameObject: m_ObjectHideFlags: 0 @@ -17151,12 +17145,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 2778119602345671483} - m_RootOrder: 1 + m_Father: {fileID: 6233933400349217064} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 610} + m_AnchoredPosition: {x: 0, y: 55} m_SizeDelta: {x: 393.09998, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9176599685513035298 diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaOtherTeamPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaOtherTeamPanel.lua index 5be9765186..87b2ddad6d 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaOtherTeamPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaOtherTeamPanel.lua @@ -9,11 +9,12 @@ local time=0 local enemyId function WorldArenaOtherTeamPanel:InitComponent() self.spLoader = SpriteLoader.New() - self.btnBack = Util.GetGameObject(self.gameObject, "Frame/BackBtn") + self.btnBack = Util.GetGameObject(self.gameObject, "Frame/other/BackBtn") self.mask = Util.GetGameObject(self.gameObject, "mask") - self.content = Util.GetGameObject(self.gameObject, "Content") - self.costImg=Util.GetGameObject(self.content, "Button/Image"):GetComponent("Image") - self.costTxt=Util.GetGameObject(self.content, "Button/Image/num"):GetComponent("Text") + self.Frame = Util.GetGameObject(self.gameObject, "Frame") + self.content = Util.GetGameObject(self.gameObject, "Frame/Content") + self.costImg=Util.GetGameObject(self.gameObject, "Frame/Button/Image"):GetComponent("Image") + self.costTxt=Util.GetGameObject(self.gameObject, "Frame/Button/Image/num"):GetComponent("Text") --玩家信息 self.playerInfo = Util.GetGameObject(self.content, "playerInfo") self.playerHead = Util.GetGameObject(self.playerInfo, "head") @@ -41,11 +42,11 @@ function WorldArenaOtherTeamPanel:InitComponent() --神印信息 self.imprintInfo = Util.GetGameObject(self.content, "imprintInfo") self.imprintGrid = Util.GetGameObject(self.imprintInfo, "Imprints") - self.imprintPre = Util.GetGameObject(self.gameObject, "imprintPre") + self.imprintPre = Util.GetGameObject(self.gameObject, "Frame/other/imprintPre") self.imprintItemList = {} --挑战 - self.btnChallenge = Util.GetGameObject(self.content, "Button") - self.challengeTxt=Util.GetGameObject(self.content, "Button/Text"):GetComponent("Text") + self.btnChallenge = Util.GetGameObject(self.Frame, "Button") + self.challengeTxt=Util.GetGameObject(self.Frame, "Button/Text"):GetComponent("Text") end @@ -100,6 +101,7 @@ function WorldArenaOtherTeamPanel:OnShow() self.challengeTxt.gameObject:SetActive(time>0) self.challengeTxt.text="免费挑战" WorldArenaOtherTeamPanel:Refresh() + end function WorldArenaOtherTeamPanel:OnSortingOrderChange() @@ -120,6 +122,9 @@ function WorldArenaOtherTeamPanel:Refresh() else self.btnChallenge:SetActive(false) end + + ForceRebuildLayout(self.content.transform) + ForceRebuildLayout(self.Frame.transform) end) end