diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index f79553bdbb..180da570f9 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -1258,7 +1258,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &401547586 RectTransform: m_ObjectHideFlags: 0 @@ -3030,7 +3030,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1006421095 RectTransform: m_ObjectHideFlags: 0 @@ -3436,8 +3436,8 @@ RectTransform: m_Father: {fileID: 982944831} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 416.59503, y: -47.3} m_SizeDelta: {x: 277.73, y: 126} m_Pivot: {x: 0.5, y: 0.5} @@ -6685,9 +6685,9 @@ RectTransform: m_Father: {fileID: 982944831} 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: -47.3} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 138.865, y: -47.3} m_SizeDelta: {x: 277.73, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2027413256 @@ -8024,7 +8024,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8418493619564483687 RectTransform: m_ObjectHideFlags: 0 @@ -8041,7 +8041,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: 87, y: 33.7} + m_AnchoredPosition: {x: 94.115, y: 9.0321} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8797475323350896265 @@ -8151,9 +8151,9 @@ RectTransform: m_Father: {fileID: 8479989555407586267} 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: 458.52002, y: -74} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 153, y: 64.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8534846200040473326 @@ -9532,9 +9532,9 @@ RectTransform: m_Father: {fileID: 1126952660353491259} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 350, y: -100} m_SizeDelta: {x: 600, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3596436011982854297 @@ -10828,9 +10828,9 @@ RectTransform: m_Father: {fileID: 7494134846245643573} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 36, y: -18} m_SizeDelta: {x: 254.2, y: 63.5} m_Pivot: {x: 0, y: 1} --- !u!222 &7283828727127792768 @@ -13940,7 +13940,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -444.63525, y: 82} - m_SizeDelta: {x: 1021.02, y: 164} + m_SizeDelta: {x: 0, y: 164} m_Pivot: {x: 0, y: 0.5} --- !u!114 &4745920919532241360 MonoBehaviour: @@ -14103,7 +14103,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 428.97, y: 0.000015258789} - m_SizeDelta: {x: 857.94, y: 0} + m_SizeDelta: {x: 857.94, y: 45} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5582656793896342774 CanvasRenderer: @@ -14516,9 +14516,9 @@ RectTransform: m_Father: {fileID: 8479989555407586267} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 782.52, y: -74} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 153, y: 64.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5088452318213877806 @@ -15341,7 +15341,7 @@ RectTransform: 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: 105.2, y: -7} + m_AnchoredPosition: {x: 105.20001, y: -7} m_SizeDelta: {x: 147.31, y: 81.56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3119782100777589010 @@ -16171,9 +16171,9 @@ RectTransform: m_Father: {fileID: 8479989555407586267} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 620.52, y: -74} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 153, y: 64.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8124929215582228228 @@ -16704,7 +16704,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 1658, y: -1052} - m_SizeDelta: {x: 900, y: 0} + m_SizeDelta: {x: 900, y: 120} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4827792396798163766 CanvasRenderer: @@ -20856,7 +20856,7 @@ GameObject: - component: {fileID: 3312425456517678606} - component: {fileID: 1126742579687953923} m_Layer: 5 - m_Name: Btn5 + m_Name: Btn6 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -20878,9 +20878,9 @@ RectTransform: m_Father: {fileID: 8479989555407586267} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 944.52, y: -74} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 153, y: 64.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &820671683722164319 @@ -21644,9 +21644,9 @@ RectTransform: m_Father: {fileID: 3670451248567414134} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 729.95, y: -43.1} m_SizeDelta: {x: 139.5, y: 50.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1420070111345050450 @@ -24860,9 +24860,9 @@ RectTransform: m_Father: {fileID: 8863448297139295757} 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: -561.75} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 432.5, y: -411.75} m_SizeDelta: {x: 865, y: 387.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5440619234679825355 @@ -26669,9 +26669,9 @@ RectTransform: m_Father: {fileID: 8479989555407586267} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 134.51001, y: -74} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 153.02, y: 64.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8132826141603541157 @@ -27262,8 +27262,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.000012159, y: 0.61001} - m_SizeDelta: {x: 109.24, y: 55.8} + m_AnchoredPosition: {x: -0.000012159, y: -2.1789} + m_SizeDelta: {x: 40, y: 48.422} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8682273186906309905 CanvasRenderer: @@ -27293,7 +27293,7 @@ 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: 7481f1ebd61b03a49ba7fa41d24d8db1, type: 3} + m_Sprite: {fileID: 21300000, guid: 1452a95854211f24794bca0e225ee5f9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -27799,9 +27799,9 @@ RectTransform: m_Father: {fileID: 8863448297139295757} 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: -837} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 432.5, y: -605.5} m_SizeDelta: {x: 865, y: 266} m_Pivot: {x: 0.5, y: 1} --- !u!114 &5787845084316277716 @@ -30127,7 +30127,6 @@ GameObject: m_Component: - component: {fileID: 5720228787099891591} - component: {fileID: 837930725751822826} - - component: {fileID: 7729081391991801139} m_Layer: 0 m_Name: BG m_TagString: Untagged @@ -30162,35 +30161,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4038988099020024362} m_CullTransparentMesh: 0 ---- !u!114 &7729081391991801139 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4038988099020024362} - m_Enabled: 0 - 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: 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: 21300000, guid: 2609ccd74e672d84c8e128abd8dc9428, 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 &4078957674495296889 GameObject: m_ObjectHideFlags: 0 @@ -31070,10 +31040,10 @@ RectTransform: m_Father: {fileID: 1126952660353491259} 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: 600, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 350, y: -90} + m_SizeDelta: {x: 600, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &158801954867338518 CanvasRenderer: @@ -32058,9 +32028,9 @@ RectTransform: m_Father: {fileID: 6569955877061403001} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 36, y: -14} m_SizeDelta: {x: 254.2, y: 63.5} m_Pivot: {x: 0, y: 1} --- !u!222 &8860581549276122775 @@ -32679,9 +32649,9 @@ RectTransform: m_Father: {fileID: 8479989555407586267} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 296.52002, y: -74} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 153, y: 64.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2809588181979660699 @@ -33141,7 +33111,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -0.000025638368} - m_SizeDelta: {x: 916, y: 0} + m_SizeDelta: {x: 916, y: 51} m_Pivot: {x: 0.5, y: 1} --- !u!114 &5918842748614186787 MonoBehaviour: @@ -35446,10 +35416,10 @@ RectTransform: m_Father: {fileID: 8863448297139295757} 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: -331.75} - m_SizeDelta: {x: 865, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 432.5, y: -218} + m_SizeDelta: {x: 865, y: 72.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5183859335168644090 CanvasRenderer: @@ -35794,7 +35764,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -2.03, y: -431.52002} - m_SizeDelta: {x: 864.04, y: 1103} + m_SizeDelta: {x: 864.04, y: 871.5} m_Pivot: {x: 0.5, y: 1} --- !u!114 &2484587132639556036 MonoBehaviour: @@ -41275,9 +41245,9 @@ RectTransform: m_Father: {fileID: 8863448297139295757} 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: -186.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 429.865, y: -109} m_SizeDelta: {x: 859.73, y: 218} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3230228749451359137 @@ -42259,9 +42229,9 @@ RectTransform: m_Father: {fileID: 3670451248567414134} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 36, y: -18} m_SizeDelta: {x: 254.2, y: 63.5} m_Pivot: {x: 0, y: 1} --- !u!222 &329854717992448988 @@ -42833,8 +42803,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: 1, y: 1} - m_SizeDelta: {x: 246, y: 96} + m_AnchoredPosition: {x: 8.065, y: -2.6286} + m_SizeDelta: {x: 198.1, y: 49.322} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4736463155627691357 CanvasRenderer: @@ -43023,7 +42993,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: 68, y: 42} + m_AnchoredPosition: {x: 62.7, y: 17.25} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4378996831111363966 @@ -46519,10 +46489,10 @@ RectTransform: m_Father: {fileID: 8863448297139295757} 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: -796.25} - m_SizeDelta: {x: 865, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 432.5, y: -605.5} + m_SizeDelta: {x: 865, y: 81.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4863705341942113372 CanvasRenderer: @@ -53599,7 +53569,7 @@ GameObject: - component: {fileID: 605141902254682328} - component: {fileID: 4643205583715657859} m_Layer: 5 - m_Name: Btn6 + m_Name: Btn7 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -55468,7 +55438,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.22154781} m_AnchorMax: {x: 0.5, y: 0.22154781} - m_AnchoredPosition: {x: -0.10236, y: -345} + m_AnchoredPosition: {x: -0.10236, y: -344.99997} m_SizeDelta: {x: 916, y: 82.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2251168076811928055 @@ -56349,10 +56319,10 @@ RectTransform: m_Father: {fileID: 3648020101574332683} 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: 819.94, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 447.97, y: -26} + m_SizeDelta: {x: 819.94, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &435024635268583513 CanvasRenderer: @@ -58439,10 +58409,10 @@ RectTransform: m_Father: {fileID: 8863448297139295757} 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: -38.75} - m_SizeDelta: {x: 865, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 432.5, y: 0} + m_SizeDelta: {x: 865, y: 77.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2217457181138367202 CanvasRenderer: