diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreMainPanel.prefab index 2f35640919..caecd96595 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreMainPanel.prefab @@ -1091,6 +1091,80 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &2985671166249418088 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5540647608522149965} + - component: {fileID: 2579407824971701164} + - component: {fileID: 5542281000289817628} + m_Layer: 5 + m_Name: ima1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5540647608522149965 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2985671166249418088} + 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: 5446418940014741044} + 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: 0} + m_SizeDelta: {x: 112, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2579407824971701164 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2985671166249418088} + m_CullTransparentMesh: 0 +--- !u!114 &5542281000289817628 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2985671166249418088} + 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: 19f184c33d6b1fe43883dc621e36613f, 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 &3063400038253272979 GameObject: m_ObjectHideFlags: 0 @@ -2450,12 +2524,12 @@ GameObject: - component: {fileID: 7865480884348546566} - component: {fileID: 1460192689275038041} m_Layer: 5 - m_Name: exploreIma + m_Name: explore m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5446418940014741044 RectTransform: m_ObjectHideFlags: 0 @@ -2466,7 +2540,10 @@ RectTransform: 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_Children: + - {fileID: 5540647608522149965} + - {fileID: 3496576134404402255} + - {fileID: 3092005644335171559} m_Father: {fileID: 6875560361487186785} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2586,6 +2663,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6257460938938164328 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3092005644335171559} + - component: {fileID: 4256677153118309311} + - component: {fileID: 89713659492463398} + m_Layer: 5 + m_Name: ima3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3092005644335171559 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6257460938938164328} + 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: 5446418940014741044} + 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} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 112, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4256677153118309311 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6257460938938164328} + m_CullTransparentMesh: 0 +--- !u!114 &89713659492463398 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6257460938938164328} + 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: 9d763b426b1b70b40aedd4a1c8a181b4, 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 &6628175028958009239 GameObject: m_ObjectHideFlags: 0 @@ -3148,6 +3299,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &7436225066891227261 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3496576134404402255} + - component: {fileID: 302265699671637550} + - component: {fileID: 7681368151514513578} + m_Layer: 5 + m_Name: ima2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3496576134404402255 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7436225066891227261} + 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: 5446418940014741044} + 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: 0} + m_SizeDelta: {x: 112, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &302265699671637550 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7436225066891227261} + m_CullTransparentMesh: 0 +--- !u!114 &7681368151514513578 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7436225066891227261} + 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: a95128062a937f247a253382f4c95cc9, 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 &7706157188442330221 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab index f45049df14..9bc38d57f5 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab @@ -242,7 +242,7 @@ GameObject: - component: {fileID: 3147802429380697465} - component: {fileID: 8242743868382833820} m_Layer: 5 - m_Name: Image + m_Name: line m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -260,12 +260,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8530505960820723933} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 7.54} - m_SizeDelta: {x: 900, y: 4.03} + m_SizeDelta: {x: 0, y: 7.540001} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3147802429380697465 CanvasRenderer: @@ -289,14 +289,14 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 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: 36e05fe912e1e9e47aef85f30fd11d93, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: f30bf38c24a00694dba03295d1981811, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1537,17 +1537,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 704108099892099954} - 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: [] - m_Father: {fileID: 7644492056687066972} - m_RootOrder: 2 + m_Father: {fileID: 1816408236878896668} + 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: 123.06, y: -35} - m_SizeDelta: {x: 83, y: 24} + m_AnchoredPosition: {x: 104.5, y: -26.435} + m_SizeDelta: {x: 0, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4048250634787269212 CanvasRenderer: @@ -1590,7 +1590,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 2000 + m_Text: --- !u!1 &716355452871641581 GameObject: m_ObjectHideFlags: 0 @@ -1856,80 +1856,6 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1 &962191090539801002 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3384226376186820921} - - component: {fileID: 3352581906189306360} - - component: {fileID: 670971819071808497} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3384226376186820921 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 962191090539801002} - 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: 5457873113540345585} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -0.000076293945} - m_SizeDelta: {x: 900, y: 5} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &3352581906189306360 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 962191090539801002} - m_CullTransparentMesh: 0 ---- !u!114 &670971819071808497 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 962191090539801002} - 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: 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: 36e05fe912e1e9e47aef85f30fd11d93, 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 &1078813538634872949 GameObject: m_ObjectHideFlags: 0 @@ -2188,7 +2114,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 27.8, y: -9.6599} + m_AnchoredPosition: {x: 27.8, y: -14.1} m_SizeDelta: {x: 160, y: 51.51} m_Pivot: {x: 0, y: 1} --- !u!222 &1124979048482131543 @@ -2260,6 +2186,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1609347712766809928} - {fileID: 5516915725917312286} - {fileID: 9119707593250197069} - {fileID: 4138335063191641407} @@ -2272,11 +2199,11 @@ RectTransform: - {fileID: 8688963407803709749} - {fileID: 858562508225589780} m_Father: {fileID: 8530505960820723933} - m_RootOrder: 0 + 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: -3.3, y: 0.000012398} + m_AnchoredPosition: {x: -3.3, y: 1.02398} m_SizeDelta: {x: 893.4, y: 202.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1305481513269907105 @@ -2428,12 +2355,12 @@ RectTransform: - {fileID: 3420156258954679526} - {fileID: 8085554643529219223} m_Father: {fileID: 5457873113540345585} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -3.3, y: -93.8} - m_SizeDelta: {x: 893.4, y: 189} + m_AnchoredPosition: {x: -3.3, y: -98.500015} + m_SizeDelta: {x: 893.4, y: 198.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1388094534513899425 GameObject: @@ -2847,7 +2774,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 450, y: -104} - m_SizeDelta: {x: 900, y: 197.7} + m_SizeDelta: {x: 900, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &4991609003910263707 MonoBehaviour: @@ -2916,12 +2843,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3029355539889997812} - m_RootOrder: 1 + 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: 87.5, y: -23.3} - m_SizeDelta: {x: 130.85, y: 30} + m_AnchoredPosition: {x: 87.5, y: -3.8} + m_SizeDelta: {x: 130.85, y: 46.55} m_Pivot: {x: 0, y: 1} --- !u!222 &6175954865206953111 CanvasRenderer: @@ -3377,7 +3304,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5457873113540345585} - m_RootOrder: 0 + 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} @@ -3752,7 +3679,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -130.38, y: -140.5} + m_AnchoredPosition: {x: -130.38, y: -148.3} m_SizeDelta: {x: 203.84998, y: 58.03} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3222076879814346723 @@ -3870,7 +3797,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -130.38, y: -141.5} + m_AnchoredPosition: {x: -130.38, y: -148.3} m_SizeDelta: {x: 203.84998, y: 58.03} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7563001748029032217 @@ -4135,7 +4062,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7644492056687066972} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4313,7 +4240,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 450, y: -262.5} + m_AnchoredPosition: {x: 450, y: -64.8} m_SizeDelta: {x: 900, y: 119.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2740151535180593362 @@ -4894,7 +4821,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 454.14, y: -33.940002} + m_AnchoredPosition: {x: 454.14, y: -39.3} m_SizeDelta: {x: 901.79, y: 51.509995} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6238209311415372031 @@ -5425,12 +5352,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3029355539889997812} - m_RootOrder: 2 + 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: 257, y: -23.3} - m_SizeDelta: {x: 73, y: 30} + m_AnchoredPosition: {x: 257, y: -3.8} + m_SizeDelta: {x: 73, y: 46.55} m_Pivot: {x: 0, y: 1} --- !u!222 &1612501726270142804 CanvasRenderer: @@ -5474,6 +5401,80 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u76EE\u6807" +--- !u!1 &3593954006154650869 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5113731559754135852} + - component: {fileID: 3808799251157897183} + - component: {fileID: 5222433748127436777} + m_Layer: 5 + m_Name: bgdi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5113731559754135852 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3593954006154650869} + 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: 5457873113540345585} + 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 &3808799251157897183 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3593954006154650869} + m_CullTransparentMesh: 0 +--- !u!114 &5222433748127436777 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3593954006154650869} + 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: 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: 5eb7fbeffdba3c448a555d0a7da444cf, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3615869417253630473 GameObject: m_ObjectHideFlags: 0 @@ -6139,7 +6140,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -130.38, y: -141.5} + m_AnchoredPosition: {x: -130.38, y: -148.3} m_SizeDelta: {x: 203.84998, y: 58.03} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7693763141959272963 @@ -6560,8 +6561,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -134.54001, y: -35.6} - m_SizeDelta: {x: 218, y: 88} + m_AnchoredPosition: {x: -123.2, y: -49.545} + m_SizeDelta: {x: 200, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5814188985522218443 CanvasRenderer: @@ -6591,7 +6592,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: 7f7cdabfab0b95c41828e1ddca64a2b6, type: 3} + m_Sprite: {fileID: 21300000, guid: e5308f0e08ecd9b4d8a38310c189e3bb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6635,7 +6636,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 450, y: -0} - m_SizeDelta: {x: 900, y: 0} + m_SizeDelta: {x: 900, y: 5} m_Pivot: {x: 0.5, y: 1} --- !u!114 &8679767192226356083 MonoBehaviour: @@ -6652,10 +6653,10 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 0 + m_Top: 5 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 0 + m_Spacing: 3.61 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -6789,7 +6790,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 450, y: -104} - m_SizeDelta: {x: 900, y: 351.3} + m_SizeDelta: {x: 900, y: 153.6} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1103144245032003519 MonoBehaviour: @@ -6860,11 +6861,11 @@ RectTransform: m_Children: - {fileID: 2208860994986350036} m_Father: {fileID: 3029355539889997812} - m_RootOrder: 3 + 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: 424.9, y: -36.549995} + m_AnchoredPosition: {x: 423.65, y: -29.5} m_SizeDelta: {x: 187.3, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3654798453273645482 @@ -6974,7 +6975,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3029355539889997812} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7013,11 +7014,11 @@ RectTransform: m_Children: - {fileID: 3181486912426266052} m_Father: {fileID: 3029355539889997812} - m_RootOrder: 7 + m_RootOrder: 8 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: 290.2, y: -33.64} + m_AnchoredPosition: {x: 290.2, y: -27.699997} m_SizeDelta: {x: 203.85, y: 58.03} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1740395087232270423 @@ -7857,7 +7858,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 340.11, y: -128.295} + m_AnchoredPosition: {x: 340.11, y: -137.9} m_SizeDelta: {x: 643.18, y: 135.20001} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2860327502804025555 @@ -8528,7 +8529,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 @@ -8679,7 +8680,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3029355539889997812} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8829,12 +8830,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3029355539889997812} - m_RootOrder: 4 + 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: 601.7, y: -23.3} - m_SizeDelta: {x: 73, y: 30} + m_AnchoredPosition: {x: 601.7, y: -3.8} + m_SizeDelta: {x: 73, y: 46.55} m_Pivot: {x: 0, y: 1} --- !u!222 &2133230399831492597 CanvasRenderer: @@ -9444,7 +9445,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8530505960820723933 RectTransform: m_ObjectHideFlags: 0 @@ -9456,15 +9457,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3029355539889997812} - {fileID: 7661841457168521978} + - {fileID: 3029355539889997812} m_Father: {fileID: 7159837365308353879} 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: 450, y: -101.35} - m_SizeDelta: {x: 900, y: 202.7} + m_AnchoredPosition: {x: 450, y: -111.3} + m_SizeDelta: {x: 900, y: 212.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7119074799155928230 GameObject: @@ -9594,7 +9595,8 @@ GameObject: - component: {fileID: 1816408236878896668} - component: {fileID: 45783679607002300} - component: {fileID: 2852013886341425940} - - component: {fileID: 5200498807796110865} + - component: {fileID: 4831472164183593944} + - component: {fileID: 4016790358142723233} m_Layer: 5 m_Name: bg m_TagString: Untagged @@ -9612,14 +9614,15 @@ RectTransform: 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_Children: + - {fileID: 5984338146974608031} m_Father: {fileID: 7644492056687066972} - m_RootOrder: 0 + 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: 218.52, y: -33.52} - m_SizeDelta: {x: 286.15, y: 52.87} + m_AnchoredPosition: {x: 185.56, y: -35} + m_SizeDelta: {x: 208, y: 52.87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &45783679607002300 CanvasRenderer: @@ -9658,7 +9661,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &5200498807796110865 +--- !u!114 &4831472164183593944 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9667,17 +9670,34 @@ MonoBehaviour: m_GameObject: {fileID: 7179219334632391966} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: 70 - m_PreferredHeight: 70 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 + m_Padding: + m_Left: 10 + m_Right: 9 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 +--- !u!114 &4016790358142723233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7179219334632391966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &7224651724357584003 GameObject: m_ObjectHideFlags: 0 @@ -10538,11 +10558,11 @@ RectTransform: m_Children: - {fileID: 6627285922979105498} m_Father: {fileID: 3029355539889997812} - m_RootOrder: 0 + 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: 55.7, y: -41.390015} + m_AnchoredPosition: {x: 55.700012, y: -29.5} m_SizeDelta: {x: 52, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &688165294946439067 @@ -10803,16 +10823,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1816408236878896668} - {fileID: 7304397920212240477} - - {fileID: 5984338146974608031} + - {fileID: 1816408236878896668} m_Father: {fileID: 3414804649060553228} 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: -367.1, y: -15.905} - m_SizeDelta: {x: 164.56, y: 70} + m_SizeDelta: {x: 289.56, y: 70} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6766546576535640258 CanvasRenderer: @@ -10843,7 +10862,7 @@ MonoBehaviour: m_Spacing: 11.56 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 + m_ChildControlWidth: 0 m_ChildControlHeight: 0 --- !u!114 &8554566056446228061 MonoBehaviour: @@ -11123,11 +11142,11 @@ RectTransform: m_Children: - {fileID: 1921812906483718387} m_Father: {fileID: 3029355539889997812} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 799.2, y: -36.55} + m_AnchoredPosition: {x: 799.2, y: -29.5} m_SizeDelta: {x: 140.52, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2442473608387177621 @@ -11236,16 +11255,16 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 5113731559754135852} - {fileID: 2280535422004432553} - {fileID: 5568991561432925223} - - {fileID: 3384226376186820921} m_Father: {fileID: 1571007141842140142} 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: 450, y: -98.85} - m_SizeDelta: {x: 900, y: 197.7} + m_AnchoredPosition: {x: 450, y: -106.3} + m_SizeDelta: {x: 900, y: 212.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8107894537552319360 GameObject: @@ -11930,11 +11949,11 @@ RectTransform: - {fileID: 7832479885785443318} - {fileID: 133757787038533325} m_Father: {fileID: 3029355539889997812} - m_RootOrder: 8 + m_RootOrder: 9 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: 300.35504, y: -33.64} + m_AnchoredPosition: {x: 300.35504, y: -27.7} m_SizeDelta: {x: 64.31, y: 35.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4214633719435064483 @@ -12491,6 +12510,80 @@ RectTransform: m_AnchoredPosition: {x: 0.46, y: 0.28} m_SizeDelta: {x: 61.28, y: 60.39} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &9009661085824824965 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1609347712766809928} + - component: {fileID: 3640989078280240115} + - component: {fileID: 5473995391274305140} + m_Layer: 5 + m_Name: line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1609347712766809928 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9009661085824824965} + 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: 3029355539889997812} + 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: 454.14, y: -26.92} + m_SizeDelta: {x: 901.79, y: 51.509995} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3640989078280240115 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9009661085824824965} + m_CullTransparentMesh: 0 +--- !u!114 &5473995391274305140 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9009661085824824965} + 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: 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: f30bf38c24a00694dba03295d1981811, 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 &9055192973060332235 GameObject: m_ObjectHideFlags: 0 @@ -12528,11 +12621,11 @@ RectTransform: - {fileID: 151521462983788533} - {fileID: 3576632681046206703} m_Father: {fileID: 3029355539889997812} - m_RootOrder: 6 + m_RootOrder: 7 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: -104.3, y: -33.640015} + m_AnchoredPosition: {x: -105, y: -27.4} m_SizeDelta: {x: 643.18, y: 135.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1605235959788632088 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua index ca197c101e..3a33338773 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua @@ -13,8 +13,9 @@ function this:InitComponent(gameObject) --topBar/btnBack this.itempre = Util.GetGameObject(gameObject, "itempre") this.itemRoot = Util.GetGameObject(gameObject, "scroll") + this.cost = Util.GetGameObject(gameObject, "bottomLayout/cost") this.icon = Util.GetGameObject(gameObject, "bottomLayout/cost/icon"):GetComponent("Image") - this.num = Util.GetGameObject(gameObject, "bottomLayout/cost/num"):GetComponent("Text") + this.num = Util.GetGameObject(gameObject, "bottomLayout/cost/bg/num"):GetComponent("Text") this.exploringBtn = Util.GetGameObject(gameObject, "bottomLayout/exploringBtn") this.mapTip = Util.GetGameObject(gameObject, "mapTip") this.mapTimeTip = Util.GetGameObject(gameObject, "mapTimeTip") @@ -253,6 +254,7 @@ function this.SetExploreCost(forId) else this.num.text = string.format("%s/%s","ffddbb",num,this.haveNum) end + ForceRebuildLayout(this.cost.transform) end function this.SetPos(gobj,pos,formationId)