diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationExamplePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationExamplePopup.prefab index 56cb032660..a54b696995 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationExamplePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationExamplePopup.prefab @@ -531,7 +531,7 @@ RectTransform: 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: -9, y: 172} + m_AnchoredPosition: {x: 0, y: 48} m_SizeDelta: {x: 857.6, y: 1166.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222411315382998450 @@ -617,8 +617,8 @@ RectTransform: 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.399, y: 41.31} - m_SizeDelta: {x: 763.713, y: 853.42} + m_AnchoredPosition: {x: -0.399, y: 41.310017} + m_SizeDelta: {x: 763.7, y: 853.42} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1741692233933420 GameObject: @@ -802,7 +802,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.35998535, y: -36.8} + m_AnchoredPosition: {x: -0.35998535, y: -36.799988} m_SizeDelta: {x: -93.8, y: -156.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222669763981094538 @@ -880,10 +880,10 @@ RectTransform: m_Father: {fileID: 1101174418310466814} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 116.45001, y: -80} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222333619797484748 CanvasRenderer: @@ -1021,10 +1021,10 @@ RectTransform: m_Father: {fileID: 1541546303153885359} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 164, y: 164} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8124770451927770147 CanvasRenderer: @@ -1240,7 +1240,7 @@ RectTransform: m_GameObject: {fileID: 311480606033427625} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3851902887478362421} m_Father: {fileID: 4197753038175421035} @@ -1350,7 +1350,6 @@ GameObject: m_Component: - component: {fileID: 4117077747940653903} - component: {fileID: 2025923945950757196} - - component: {fileID: 8914020444627344103} m_Layer: 5 m_Name: Tabs m_TagString: Untagged @@ -1387,35 +1386,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 316318307208344205} m_CullTransparentMesh: 0 ---- !u!114 &8914020444627344103 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 316318307208344205} - 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: 0} - m_RaycastTarget: 0 - 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 &401833668195509738 GameObject: m_ObjectHideFlags: 0 @@ -1676,10 +1646,10 @@ RectTransform: m_Father: {fileID: 1101174418310466814} m_RootOrder: 3 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 116.45001, y: -250} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4942903299579192121 CanvasRenderer: @@ -1707,7 +1677,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3410862752957380037 RectTransform: m_ObjectHideFlags: 0 @@ -1729,7 +1699,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -1.14, y: 88.16} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 763.713, y: 677} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3842121277346338411 CanvasRenderer: @@ -2408,10 +2378,10 @@ RectTransform: m_Father: {fileID: 3410862752957380037} m_RootOrder: 1 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: 761.24, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 381.8565, y: -133} + m_SizeDelta: {x: 761.24, y: 136} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7060935192687086099 CanvasRenderer: @@ -2490,10 +2460,10 @@ RectTransform: m_Father: {fileID: 3410862752957380037} 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: 763.713, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 381.8565, y: -30} + m_SizeDelta: {x: 763.713, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4035293872152545044 CanvasRenderer: @@ -2883,7 +2853,7 @@ RectTransform: m_GameObject: {fileID: 2543782636276667667} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3114554809433934110} m_Father: {fileID: 4197753038175421035} @@ -3312,10 +3282,10 @@ RectTransform: m_Father: {fileID: 4829099466351135248} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 164, y: 164} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6782222731216506391 CanvasRenderer: @@ -3392,10 +3362,10 @@ RectTransform: m_Father: {fileID: 1101174418310466814} m_RootOrder: 1 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 296.45, y: -80} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &480171419868752341 CanvasRenderer: @@ -3590,10 +3560,10 @@ RectTransform: m_Father: {fileID: 6537202055566257413} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 164, y: 164} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7805379142430684483 CanvasRenderer: @@ -3746,7 +3716,7 @@ RectTransform: 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.0000038146973, y: 0.000020981} + m_AnchoredPosition: {x: 0.0000038146973, y: -3} m_SizeDelta: {x: 761.6, y: 132.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1328302097253286411 @@ -3769,8 +3739,8 @@ MonoBehaviour: m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 5, y: 10} - m_Spacing: {x: 120, y: 0} + m_CellSize: {x: 120, y: 120} + m_Spacing: {x: -20, y: 0} m_Constraint: 0 m_ConstraintCount: 2 --- !u!1 &4294966961115010919 @@ -3923,10 +3893,10 @@ RectTransform: m_Father: {fileID: 3995197448299882000} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 164, y: 164} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &326012879877315923 CanvasRenderer: @@ -3997,10 +3967,10 @@ RectTransform: m_Father: {fileID: 7407503702423772238} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 164, y: 164} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8995960426613163027 CanvasRenderer: @@ -4071,10 +4041,10 @@ RectTransform: m_Father: {fileID: 3410862752957380037} m_RootOrder: 3 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: 761.43, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 381.8565, y: -599} + m_SizeDelta: {x: 761.43, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7053376929880406488 CanvasRenderer: @@ -4201,10 +4171,10 @@ RectTransform: m_Father: {fileID: 1101174418310466814} m_RootOrder: 5 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 476.45, y: -250} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2012296775433170280 CanvasRenderer: @@ -4252,10 +4222,10 @@ RectTransform: m_Father: {fileID: 1101174418310466814} m_RootOrder: 2 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 476.45, y: -80} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8923910072249726255 CanvasRenderer: @@ -4412,7 +4382,7 @@ RectTransform: m_GameObject: {fileID: 5464768547275731089} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4848543537011792635} m_Father: {fileID: 4197753038175421035} @@ -5570,7 +5540,7 @@ RectTransform: 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: 0} + m_AnchoredPosition: {x: -61.4, y: 0.000031789} m_SizeDelta: {x: 158, y: 158} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6591834185277516299 @@ -5722,10 +5692,10 @@ RectTransform: m_Father: {fileID: 1101174418310466814} m_RootOrder: 4 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 296.45, y: -250} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7303321032801429525 CanvasRenderer: @@ -5841,10 +5811,10 @@ RectTransform: m_Father: {fileID: 3413278702522399211} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 164, y: 164} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5647358469039000523 CanvasRenderer: @@ -6365,7 +6335,7 @@ RectTransform: m_GameObject: {fileID: 7978838553549431034} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1476232864172567186} m_Father: {fileID: 4197753038175421035} @@ -6504,10 +6474,10 @@ RectTransform: m_Father: {fileID: 3410862752957380037} m_RootOrder: 2 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: 592.9, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 381.8565, y: -371} + m_SizeDelta: {x: 592.9, y: 330} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8564973585709270053 CanvasRenderer: @@ -6590,7 +6560,7 @@ RectTransform: m_GameObject: {fileID: 8363493241711778873} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7073342162830938610} m_Father: {fileID: 4197753038175421035} @@ -6719,7 +6689,7 @@ RectTransform: m_GameObject: {fileID: 8532249834896136534} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8794377225828430379} m_Father: {fileID: 4197753038175421035} diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationExamplePopup.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationExamplePopup.lua index d1fb6b67ed..5eedd3daa9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationExamplePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationExamplePopup.lua @@ -22,7 +22,7 @@ function FormationExamplePopup:InitComponent() this.scroll=Util.GetGameObject(this.panel,"Scroll") this.scrollPre=Util.GetGameObject(this.panel,"Scroll/Pre") this.scrollView = SubUIManager.Open(SubUIConfig.ScrollFitterView, this.scroll.transform, - this.scrollPre, Vector2.New(912.5, 1090.6), 1, 10) + this.scrollPre, Vector2.New(764,854), 1, 10) this.scrollView.moveTween.MomentumAmount = 1 this.scrollView.moveTween.Strength = 2 end