diff --git a/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab index cacbe7cc4d..4e80119871 100644 --- a/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab @@ -101,16 +101,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 97955745} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2135502055} m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} 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: -12, y: -8} m_SizeDelta: {x: 160, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &97955748 @@ -143,7 +143,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 36 + m_FontSize: 40 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 3 @@ -279,7 +279,7 @@ RectTransform: 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: 205, y: 109} + m_SizeDelta: {x: 264, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &183297340 CanvasRenderer: @@ -302,14 +302,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, 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: 71162a8d1456dde45a156c169aeccf54, type: 3} + m_Sprite: {fileID: 21300000, guid: 9693cd56831af6c4899c7c900a05f231, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -348,11 +348,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6957488199155494397} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -0.00024414062, y: 339} + m_AnchoredPosition: {x: -0.00024414062, y: 199} m_SizeDelta: {x: 0.00048828, y: 165.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &247775481 @@ -427,7 +427,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -51} + m_AnchoredPosition: {x: 0, y: -9} m_SizeDelta: {x: 1080, y: 145} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &355285486 @@ -567,16 +567,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 580405897} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1724326238} m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} 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: 2, y: -6} m_SizeDelta: {x: 160, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &580405900 @@ -609,7 +609,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 36 + m_FontSize: 40 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 3 @@ -653,7 +653,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &700415140 RectTransform: m_ObjectHideFlags: 0 @@ -670,8 +670,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: -13, y: -56} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: -11, y: -16} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &700415142 CanvasRenderer: @@ -727,7 +727,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &799112149 RectTransform: m_ObjectHideFlags: 0 @@ -744,8 +744,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: -11, y: -57} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: -11, y: -16} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &799112151 CanvasRenderer: @@ -889,7 +889,7 @@ RectTransform: m_Children: - {fileID: 356820352875512541} m_Father: {fileID: 6957488199155494397} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -950,7 +950,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1137191100 RectTransform: m_ObjectHideFlags: 0 @@ -967,8 +967,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: -14, y: -58} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: -11, y: -16} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1137191102 CanvasRenderer: @@ -1039,8 +1039,8 @@ 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.0021972656, y: 131.75} - m_SizeDelta: {x: 0.0045166, y: -263.5} + m_AnchoredPosition: {x: -0.0021972656, y: -37.4} + m_SizeDelta: {x: 0, y: -249.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1356283800 GameObject: @@ -1394,7 +1394,7 @@ RectTransform: 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: 205, y: 109} + m_SizeDelta: {x: 264, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1447050048 CanvasRenderer: @@ -1417,14 +1417,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, 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: 71162a8d1456dde45a156c169aeccf54, type: 3} + m_Sprite: {fileID: 21300000, guid: 9693cd56831af6c4899c7c900a05f231, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1617,12 +1617,12 @@ RectTransform: - {fileID: 913348685} - {fileID: 580405898} m_Father: {fileID: 3217785936302008136} - m_RootOrder: 5 + 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: 184, y: 188} + m_SizeDelta: {x: 233, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1724326240 CanvasRenderer: @@ -1816,8 +1816,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, y: -11.69} - m_SizeDelta: {x: 260, y: 100} + m_AnchoredPosition: {x: 27, y: -1} + m_SizeDelta: {x: 280, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1784806911 CanvasRenderer: @@ -1840,15 +1840,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.29803923, g: 0.5019608, b: 0.85098046, 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: fa9b45624eb407043825833322436cd3, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9717828f6bab66149bd19fd7c4199c3d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1906,7 +1906,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1784806907} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} m_CullingMode: 0 @@ -1952,7 +1952,7 @@ RectTransform: 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: 205, y: 109} + m_SizeDelta: {x: 264, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1843620650 CanvasRenderer: @@ -1975,14 +1975,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, 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: 71162a8d1456dde45a156c169aeccf54, type: 3} + m_Sprite: {fileID: 21300000, guid: 9693cd56831af6c4899c7c900a05f231, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2024,7 +2024,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 174, y: 159} + m_AnchoredPosition: {x: 942, y: -35} m_SizeDelta: {x: 487.59998, y: 120.599976} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1974345033 @@ -2053,16 +2053,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1974345033} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2082332949} m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} 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: -12, y: -8} m_SizeDelta: {x: 160, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1974345036 @@ -2095,7 +2095,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 36 + m_FontSize: 40 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 3 @@ -2199,12 +2199,12 @@ RectTransform: - {fileID: 180296228} - {fileID: 1974345034} m_Father: {fileID: 3217785936302008136} - m_RootOrder: 4 + 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: 184, y: 188} + m_SizeDelta: {x: 233, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2082332951 CanvasRenderer: @@ -2292,12 +2292,12 @@ RectTransform: - {fileID: 1387075549} - {fileID: 97955746} m_Father: {fileID: 3217785936302008136} - m_RootOrder: 3 + 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: 184, y: 188} + m_SizeDelta: {x: 233, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2135502057 CanvasRenderer: @@ -2380,12 +2380,12 @@ RectTransform: m_Children: - {fileID: 6813234439224986884} m_Father: {fileID: 6363119302992407441} - m_RootOrder: 2 + 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: -445.3, y: -37} - m_SizeDelta: {x: 50.42, y: 31.52} + m_AnchoredPosition: {x: -471.2, y: -40} + m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6359096108276111635 CanvasRenderer: @@ -2402,7 +2402,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 145818116314190293} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -2415,7 +2415,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: c73ac4f44d9a7194488674d4fa335c10, type: 3} + m_Sprite: {fileID: 21300000, guid: 2770c5726ed367640a861fc899b5e9f0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2454,6 +2454,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1832368356873283442} - {fileID: 1347545229466372783} m_Father: {fileID: 2523378884830774546} m_RootOrder: 1 @@ -2461,7 +2462,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 540, y: 660} - m_SizeDelta: {x: 1080, y: 133.58} + m_SizeDelta: {x: 1080, y: 197} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6510185772663606573 CanvasRenderer: @@ -2529,6 +2530,80 @@ MonoBehaviour: isPlayAudio: 1 isHaveCloseBtn: 0 isPlayOnOpen: 0 +--- !u!1 &231387333218399950 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9154754880314837410} + - component: {fileID: 8437984920795320703} + - component: {fileID: 6827769513774035921} + m_Layer: 5 + m_Name: BG2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9154754880314837410 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 231387333218399950} + 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: 2323952898692241848} + 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: 493.05, y: 0} + m_SizeDelta: {x: 568.51, y: 197} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8437984920795320703 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 231387333218399950} + m_CullTransparentMesh: 0 +--- !u!114 &6827769513774035921 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 231387333218399950} + 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: 71dfff3189b19b84b8e68a6674a202db, 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 &244599127200632296 GameObject: m_ObjectHideFlags: 0 @@ -2645,8 +2720,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -314.47305, y: -129.39258} - m_SizeDelta: {x: 89.19, y: 89.19} + m_AnchoredPosition: {x: 396, y: -79.7} + m_SizeDelta: {x: 88, y: 72} m_Pivot: {x: 0.99999994, y: -0.42378804} --- !u!222 &4191423825789448509 CanvasRenderer: @@ -2676,7 +2751,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: 0394ad02a14fc7d4cac24834c2218426, type: 3} + m_Sprite: {fileID: 21300000, guid: c4a860b06a8bc7541908fe0d4725e0d0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2777,12 +2852,12 @@ RectTransform: m_Children: - {fileID: 1364772089253909632} m_Father: {fileID: 111266892991475185} - m_RootOrder: 2 + 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: -154.9, y: -15.5} - m_SizeDelta: {x: 74, y: 34} + m_AnchoredPosition: {x: 60.7, y: -71.9} + m_SizeDelta: {x: 120, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2773060757163125716 CanvasRenderer: @@ -2799,20 +2874,20 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 250588680455181742} - m_Enabled: 0 + 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_Color: {r: 1, g: 1, b: 1, a: 0.6156863} 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: 0405568b65406544aa993064f08b3f92, type: 3} + m_Sprite: {fileID: 21300000, guid: 4295a7ddf67cf2247aaada6dd994657f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2879,7 +2954,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.65882355, g: 0.65882355, b: 0.654902, a: 1} + m_Color: {r: 0.8962264, g: 0.8962264, b: 0.8962264, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2917,7 +2992,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1928415423048910993 RectTransform: m_ObjectHideFlags: 0 @@ -3150,7 +3225,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1770556743108546921 RectTransform: m_ObjectHideFlags: 0 @@ -3397,8 +3472,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: -10.3, y: -0.1} - m_SizeDelta: {x: 56.81, y: 57.32} + m_AnchoredPosition: {x: 0, y: -2.5} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5340445836638054620 CanvasRenderer: @@ -3441,7 +3516,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 27 + m_Text: 200 --- !u!114 &8155756205404837759 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3474,7 +3549,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4235782023543917096 RectTransform: m_ObjectHideFlags: 0 @@ -3656,6 +3731,81 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &722981781816738334 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2323952898692241848} + - component: {fileID: 8641408006774639325} + - component: {fileID: 7624783259405957345} + m_Layer: 5 + m_Name: BG1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2323952898692241848 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 722981781816738334} + 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: 9154754880314837410} + m_Father: {fileID: 1358752685723914932} + 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: -232, y: 0} + m_SizeDelta: {x: 619, y: 197} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8641408006774639325 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 722981781816738334} + m_CullTransparentMesh: 0 +--- !u!114 &7624783259405957345 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 722981781816738334} + 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: 0.6117647, g: 0.4392157, 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: 28a9cc2ade05d324f8d5ee63f62c9521, 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 &755165670824367531 GameObject: m_ObjectHideFlags: 0 @@ -3765,7 +3915,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2523378884830774546 RectTransform: m_ObjectHideFlags: 0 @@ -3823,12 +3973,12 @@ RectTransform: m_Children: - {fileID: 8088171951553668755} m_Father: {fileID: 1347545229466372783} - m_RootOrder: 7 + 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: -445.3, y: -37} - m_SizeDelta: {x: 50.42, y: 31.52} + m_AnchoredPosition: {x: -472.2, y: -40} + m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &150296198608396340 CanvasRenderer: @@ -3845,7 +3995,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 818936736522067504} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -3858,7 +4008,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: c73ac4f44d9a7194488674d4fa335c10, type: 3} + m_Sprite: {fileID: 21300000, guid: 2770c5726ed367640a861fc899b5e9f0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4056,7 +4206,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.27029732, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 6.3999996, y: -0.9} + m_AnchoredPosition: {x: 17, y: -0.9} m_SizeDelta: {x: 57, y: 40.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7397842230526420908 @@ -4133,12 +4283,12 @@ RectTransform: m_Children: - {fileID: 2141924737398080490} m_Father: {fileID: 818382726045345769} - m_RootOrder: 2 + 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: -154.9, y: -15.5} - m_SizeDelta: {x: 74, y: 34} + m_AnchoredPosition: {x: 60.7, y: -71.9} + m_SizeDelta: {x: 120, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3829307035398753033 CanvasRenderer: @@ -4155,20 +4305,20 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1115846892911482494} - m_Enabled: 0 + 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_Color: {r: 1, g: 1, b: 1, a: 0.6156863} 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: 0405568b65406544aa993064f08b3f92, type: 3} + m_Sprite: {fileID: 21300000, guid: 4295a7ddf67cf2247aaada6dd994657f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4431,12 +4581,12 @@ RectTransform: m_Children: - {fileID: 8002643135386345618} m_Father: {fileID: 504826432040856329} - m_RootOrder: 2 + 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: -154.9, y: -15.5} - m_SizeDelta: {x: 74, y: 34} + m_AnchoredPosition: {x: 34.1, y: -52.5} + m_SizeDelta: {x: 120, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7576138132625426419 CanvasRenderer: @@ -4453,20 +4603,20 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1488116224983857945} - m_Enabled: 0 + 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_Color: {r: 1, g: 1, b: 1, a: 0.6156863} 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: 0405568b65406544aa993064f08b3f92, type: 3} + m_Sprite: {fileID: 21300000, guid: 4295a7ddf67cf2247aaada6dd994657f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4505,7 +4655,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3217785936302008136} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4723,12 +4873,12 @@ RectTransform: - {fileID: 4235782023543917096} - {fileID: 4925478682287725553} m_Father: {fileID: 1347545229466372783} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.6104997, y: 0.5} - m_AnchoredPosition: {x: 219.64124, y: 11.299957} - m_SizeDelta: {x: -37.34247, y: 86} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 289, y: 5.100293} + m_SizeDelta: {x: 120, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &165608861573840045 CanvasRenderer: @@ -4758,7 +4908,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: 448174c4a3a50234abe6c9af5b7365da, type: 3} + m_Sprite: {fileID: 21300000, guid: 56aa3a5589f4991429dd73e31a8b54ba, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4838,9 +4988,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 5737306105508154579} - {fileID: 6596574230811826985} - {fileID: 247775479} - {fileID: 954335280} + - {fileID: 5819035664906176004} m_Father: {fileID: 3846062141729905751} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4921,7 +5073,7 @@ RectTransform: 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: 205, y: 109} + m_SizeDelta: {x: 264, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4157882815730046382 CanvasRenderer: @@ -4951,7 +5103,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: 4ea5db9ce28275b4285f6255c7d52acf, type: 3} + m_Sprite: {fileID: 21300000, guid: 7b5d246b7cac8f841ad311cd02b33c78, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5071,8 +5223,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: 2.3000002, y: -4.3} - m_SizeDelta: {x: 50, y: 52} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 180, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7381427996291983308 CanvasRenderer: @@ -5095,15 +5247,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.6117647, g: 0.4431373, b: 0.9960785, 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: 1853841e0900c664a95b6762eb755e06, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9717828f6bab66149bd19fd7c4199c3d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5461,12 +5613,12 @@ RectTransform: - {fileID: 5652904641580187055} - {fileID: 7186476749925642629} m_Father: {fileID: 1347545229466372783} - 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.6104997, y: 0.5} - m_AnchoredPosition: {x: 351.3412, y: 11.299835} - m_SizeDelta: {x: -37.34247, y: 86} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 432.2, y: 2.9002929} + m_SizeDelta: {x: 120, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8244311968155559229 CanvasRenderer: @@ -5496,7 +5648,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: 448174c4a3a50234abe6c9af5b7365da, type: 3} + m_Sprite: {fileID: 21300000, guid: 3b57e5f9eec9c8c419375ca305fd3b2d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5658,8 +5810,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, y: 174} - m_SizeDelta: {x: 260, y: 100} + m_AnchoredPosition: {x: 0, y: -1} + m_SizeDelta: {x: 280, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6026135954506998824 CanvasRenderer: @@ -5682,15 +5834,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.8000001, b: 0, 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: 9657165ee43a7cb44ba1f1d5b522d220, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9717828f6bab66149bd19fd7c4199c3d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5748,7 +5900,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1998077581677697048} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} m_CullingMode: 0 @@ -5948,8 +6100,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: -10.3, y: -0.1} - m_SizeDelta: {x: 56.81, y: 57.32} + m_AnchoredPosition: {x: 0, y: -2.5} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8788341610507918556 CanvasRenderer: @@ -5992,7 +6144,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 27 + m_Text: 200 --- !u!114 &8930836005213207193 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6044,12 +6196,12 @@ RectTransform: - {fileID: 7351080999455740403} - {fileID: 2830990812318116015} m_Father: {fileID: 3217785936302008136} - m_RootOrder: 1 + 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: 184, y: 188} + m_SizeDelta: {x: 233, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6298221130218059591 CanvasRenderer: @@ -6131,17 +6283,17 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 818382726045345769} - - {fileID: 4248299429651092375} - {fileID: 5863603841479394340} + - {fileID: 4248299429651092375} - {fileID: 4035614627241108067} - {fileID: 1067430809627875897} m_Father: {fileID: 3916337637400531520} - 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: 0.43755, y: 0.000011206} - m_SizeDelta: {x: 1080.9, y: 133.58} + m_SizeDelta: {x: 1080.9, y: 197} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2544532941256391199 CanvasRenderer: @@ -6158,7 +6310,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2200335466965029614} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -6180,6 +6332,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2245174805735946200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3886120837557869089} + - component: {fileID: 3504106056010749663} + - component: {fileID: 3768170198966558254} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3886120837557869089 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2245174805735946200} + 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: 1832368356873283442} + 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: 493.05, y: 0} + m_SizeDelta: {x: 568.51, y: 197} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3504106056010749663 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2245174805735946200} + m_CullTransparentMesh: 0 +--- !u!114 &3768170198966558254 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2245174805735946200} + 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: 71dfff3189b19b84b8e68a6674a202db, 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 &2435025991142827925 GameObject: m_ObjectHideFlags: 0 @@ -6210,14 +6436,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5267820730665191806} - - {fileID: 7095944591270575973} - {fileID: 5432536626695267633} + - {fileID: 7095944591270575973} m_Father: {fileID: 6691541230534623963} 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: -128.9, y: -6.0699997} + m_AnchoredPosition: {x: -128.9, y: 17.2} m_SizeDelta: {x: 570, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2747732191452330304 @@ -6409,7 +6635,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -171.03741, y: -1} - m_SizeDelta: {x: 202.59998, y: 86} + m_SizeDelta: {x: 220, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8788197061871045517 CanvasRenderer: @@ -6432,14 +6658,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.8000001, b: 0, 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: 448174c4a3a50234abe6c9af5b7365da, type: 3} + m_Sprite: {fileID: 21300000, guid: 9717828f6bab66149bd19fd7c4199c3d, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6706,8 +6932,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: -8.8, y: -5} - m_SizeDelta: {x: 35, y: 35} + m_AnchoredPosition: {x: -8.8, y: -13} + m_SizeDelta: {x: 45, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6266349407302548147 CanvasRenderer: @@ -6763,7 +6989,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7186476749925642629 RectTransform: m_ObjectHideFlags: 0 @@ -6861,7 +7087,7 @@ RectTransform: 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: 205, y: 109} + m_SizeDelta: {x: 264, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1394353164013927478 CanvasRenderer: @@ -6884,14 +7110,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, 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: 71162a8d1456dde45a156c169aeccf54, type: 3} + m_Sprite: {fileID: 21300000, guid: 5b2c797766dcfe449b050584072a32d2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7035,16 +7261,16 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 504826432040856329} - - {fileID: 4970678282075398141} - {fileID: 5863995872665273804} + - {fileID: 4970678282075398141} - {fileID: 3520090592107469557} m_Father: {fileID: 3652243435284483246} - 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: 0.43755, y: 0.000011206} - m_SizeDelta: {x: 1080.9, y: 133.58} + m_SizeDelta: {x: 1080.9, y: 197} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7937036119926200649 CanvasRenderer: @@ -7061,7 +7287,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2762892744590345325} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -7119,9 +7345,9 @@ RectTransform: m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.6104997, y: 0.5} - m_AnchoredPosition: {x: 270.6305, y: 7.8000183} - m_SizeDelta: {x: -158.43909, y: 86} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 385.9, y: 7.8000183} + m_SizeDelta: {x: 180, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1846937894710088355 CanvasRenderer: @@ -7144,15 +7370,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.6117647, g: 0.4431373, b: 0.9960785, 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: 448174c4a3a50234abe6c9af5b7365da, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9717828f6bab66149bd19fd7c4199c3d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -7314,7 +7540,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1358752685723914932 RectTransform: m_ObjectHideFlags: 0 @@ -7326,14 +7552,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 2323952898692241848} - {fileID: 6691541230534623963} m_Father: {fileID: 6862594919747798903} 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: 540, y: -202.21002} - m_SizeDelta: {x: 1080, y: 133.58} + m_AnchoredPosition: {x: 540, y: 456} + m_SizeDelta: {x: 1080, y: 197} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &483587090094442802 CanvasRenderer: @@ -7800,7 +8027,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: -30.7, y: 4.8} + m_AnchoredPosition: {x: -30.7, y: 0.9} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6100358966550413351 @@ -7824,7 +8051,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -7840,6 +8067,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3077067159912659959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5011779960077541763} + - component: {fileID: 4707113280077877192} + - component: {fileID: 7956140255327411423} + m_Layer: 5 + m_Name: BG2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5011779960077541763 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3077067159912659959} + 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: 1346319460006752978} + 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: 493, y: 0} + m_SizeDelta: {x: 568.51, y: 197} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4707113280077877192 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3077067159912659959} + m_CullTransparentMesh: 0 +--- !u!114 &7956140255327411423 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3077067159912659959} + 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: 71dfff3189b19b84b8e68a6674a202db, 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 &3136183377239314618 GameObject: m_ObjectHideFlags: 0 @@ -8228,7 +8529,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.81960785, b: 0.6862745, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -8276,16 +8577,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3302070201100729469} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2976308146269546717} m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} 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: -12, y: -8} m_SizeDelta: {x: 160, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3856099677672144352 @@ -8318,7 +8619,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 36 + m_FontSize: 40 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 3 @@ -8549,9 +8850,9 @@ RectTransform: m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.6104997, y: 0.5} - m_AnchoredPosition: {x: 150.33044, y: 7.8} - m_SizeDelta: {x: -158.43909, y: 86} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 184.2, y: 7.8} + m_SizeDelta: {x: 180, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7096580360082026337 CanvasRenderer: @@ -8574,15 +8875,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9568628, g: 0.80392164, b: 0.14117648, 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: 448174c4a3a50234abe6c9af5b7365da, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9717828f6bab66149bd19fd7c4199c3d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -8657,13 +8958,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3459701349699933524} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1949135153781524357} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 5, y: -1.4399986} @@ -8699,7 +9000,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 32 + m_FontSize: 38 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 3 @@ -8749,7 +9050,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.77049327} - m_AnchoredPosition: {x: 0.71751, y: -21.8} + m_AnchoredPosition: {x: -145, y: -21.8} m_SizeDelta: {x: 433.23, y: 15.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6658281776955929050 @@ -8773,14 +9074,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.3019608, g: 0.3019608, b: 0.3019608, 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: 26ccd2975b042544497a22c443a4e97a, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8883,13 +9184,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1993505441798457904} - m_Father: {fileID: 5737306105508154579} - m_RootOrder: 0 + m_Father: {fileID: 6957488199155494397} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -0.014892578, y: 50} - m_SizeDelta: {x: -0.030029468, y: 100} + m_AnchoredPosition: {x: 0, y: 46.70036} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &366222055312832294 CanvasRenderer: @@ -8963,7 +9264,7 @@ RectTransform: 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: 205, y: 109} + m_SizeDelta: {x: 264, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7788119326715885539 CanvasRenderer: @@ -8993,7 +9294,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: 4ea5db9ce28275b4285f6255c7d52acf, type: 3} + m_Sprite: {fileID: 21300000, guid: 7b5d246b7cac8f841ad311cd02b33c78, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9153,7 +9454,7 @@ RectTransform: - {fileID: 650939579086666910} - {fileID: 5550150000546493435} m_Father: {fileID: 1347545229466372783} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.6104997, y: 0.5} @@ -9423,7 +9724,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 163, y: 132} + m_AnchoredPosition: {x: 264, y: 4} m_SizeDelta: {x: 487.59998, y: 120.599976} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3965797473257514265 @@ -9555,7 +9856,7 @@ RectTransform: 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: 205, y: 109} + m_SizeDelta: {x: 264, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8725755020759367010 CanvasRenderer: @@ -9585,7 +9886,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: 4ea5db9ce28275b4285f6255c7d52acf, type: 3} + m_Sprite: {fileID: 21300000, guid: 7b5d246b7cac8f841ad311cd02b33c78, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9720,11 +10021,11 @@ RectTransform: m_Children: - {fileID: 1688161210922010067} m_Father: {fileID: 1347545229466372783} - m_RootOrder: 1 + 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: -404.7, y: 3.5} + m_AnchoredPosition: {x: -468.6, y: 30} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7975319869559131857 @@ -9980,6 +10281,81 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5728\u7EBF" LanguageIndex: 0 +--- !u!1 &4178947725925217450 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1832368356873283442} + - component: {fileID: 4358371303916220186} + - component: {fileID: 1098683599808744139} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1832368356873283442 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4178947725925217450} + 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: 3886120837557869089} + m_Father: {fileID: 1598358712703290739} + 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: -232, y: 0} + m_SizeDelta: {x: 619, y: 197} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4358371303916220186 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4178947725925217450} + m_CullTransparentMesh: 0 +--- !u!114 &1098683599808744139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4178947725925217450} + 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: 0.6117647, g: 0.43921572, 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: 28a9cc2ade05d324f8d5ee63f62c9521, 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 &4290460224049917834 GameObject: m_ObjectHideFlags: 0 @@ -10197,8 +10573,8 @@ 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.36645508, y: 59.5} - m_SizeDelta: {x: -0.70813, y: -352.2} + m_AnchoredPosition: {x: -0.36645508, y: -98} + m_SizeDelta: {x: -0.7, y: -359.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4404702729295182053 GameObject: @@ -10230,12 +10606,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6957488199155494397} - m_RootOrder: 0 + m_RootOrder: 1 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.00024414} + m_AnchoredPosition: {x: 0, y: -128.2} + m_SizeDelta: {x: 0, y: -256.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1410360486493681887 CanvasRenderer: @@ -10258,15 +10634,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.78431374, g: 0.78431374, b: 0.78431374, 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: ed187caf2343d6243898f6a7de9e114c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: d60b38522f85d3d42a87fb16628478eb, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -10379,11 +10755,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6610803271868933761} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.27029732, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -14.06041, y: -30.900032} + m_AnchoredPosition: {x: 57.8, y: -71.1} m_SizeDelta: {x: 75.42081, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6150452455557234988 @@ -10434,13 +10810,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "1\u5929\u524D" + m_Text: "\u79BB\u7EBF" LanguageIndex: 0 --- !u!1 &4500842094489856894 GameObject: @@ -10476,7 +10852,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: -49, y: 30} + m_AnchoredPosition: {x: -136.5, y: 30} m_SizeDelta: {x: 284.82, y: 47.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5829180726454289157 @@ -10621,13 +10997,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4579999431422516657} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6015724737134056680} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -10654,7 +11030,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.23137257, g: 0.23137257, b: 0.23137257, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -10663,7 +11039,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 36 + m_FontSize: 40 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 0 @@ -10707,12 +11083,12 @@ RectTransform: m_Children: - {fileID: 7708618621544420821} m_Father: {fileID: 3121497351246217843} - m_RootOrder: 2 + 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: -445.3, y: -37} - m_SizeDelta: {x: 50.42, y: 31.52} + m_AnchoredPosition: {x: -472.2, y: -40} + m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8406542825657264287 CanvasRenderer: @@ -10729,7 +11105,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4631896863080022761} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -10742,7 +11118,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: c73ac4f44d9a7194488674d4fa335c10, type: 3} + m_Sprite: {fileID: 21300000, guid: 2770c5726ed367640a861fc899b5e9f0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -10789,7 +11165,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -146.27979, y: 1.5999985} - m_SizeDelta: {x: 204.27, y: 65.39} + m_SizeDelta: {x: 260, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6087906825317427632 CanvasRenderer: @@ -10812,15 +11188,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.8000001, b: 0, 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: 6d6b014fb4be4e247b02f760eca14db1, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9717828f6bab66149bd19fd7c4199c3d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -10878,7 +11254,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4634310729320753327} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} m_CullingMode: 0 @@ -11018,8 +11394,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: -10.3, y: -0.1} - m_SizeDelta: {x: 56.81, y: 57.32} + m_AnchoredPosition: {x: 0, y: -2.5} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7730769112289633846 CanvasRenderer: @@ -11062,7 +11438,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 27 + m_Text: 200 --- !u!114 &852248855 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11096,7 +11472,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3916337637400531520 RectTransform: m_ObjectHideFlags: 0 @@ -11108,14 +11484,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1346319460006752978} - {fileID: 3121497351246217843} m_Father: {fileID: 6695374628307615825} 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: 540, y: -202.21002} - m_SizeDelta: {x: 1080, y: 133.58} + m_AnchoredPosition: {x: 540, y: 438} + m_SizeDelta: {x: 1080, y: 197} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5757404068372879522 CanvasRenderer: @@ -11201,7 +11578,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2371714775030353427 RectTransform: m_ObjectHideFlags: 0 @@ -11214,11 +11591,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 818382726045345769} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.27029732, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -14.06041, y: -30.900032} + m_AnchoredPosition: {x: 60.6, y: -73.7} m_SizeDelta: {x: 75.42081, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4999280548352415549 @@ -11269,13 +11646,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "1\u5929\u524D" + m_Text: "\u79BB\u7EBF" LanguageIndex: 0 --- !u!1 &4770223211844412947 GameObject: @@ -11311,7 +11688,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: -62.5} + m_AnchoredPosition: {x: 0, y: -6} m_SizeDelta: {x: 113.7, y: 51.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &654671523618622663 @@ -11335,7 +11712,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.98823535, g: 0.97647065, b: 0.96470594, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -11511,8 +11888,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: 2.3000002, y: -4.3} - m_SizeDelta: {x: 60, y: 48} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 180, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &584147985386775375 CanvasRenderer: @@ -11535,15 +11912,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.95294124, g: 0.8000001, b: 0.13333334, 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: dce8273307c86ec488d76fb97e12546c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9717828f6bab66149bd19fd7c4199c3d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -11584,12 +11961,12 @@ RectTransform: - {fileID: 1712878163325904131} - {fileID: 1928415423048910993} m_Father: {fileID: 1347545229466372783} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.6104997, y: 0.5} - m_AnchoredPosition: {x: 89.84119, y: 11.3} - m_SizeDelta: {x: -37.34247, y: 86} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 160, y: 6} + m_SizeDelta: {x: 120, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9209797801640776437 CanvasRenderer: @@ -11619,7 +11996,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: 448174c4a3a50234abe6c9af5b7365da, type: 3} + m_Sprite: {fileID: 21300000, guid: c0aae7af3b041ce4ab5868e07f5b6be0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11704,7 +12081,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: 201, y: -3} + m_AnchoredPosition: {x: 267, y: -3} m_SizeDelta: {x: 381.9, y: 79.899994} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2302512082654518972 @@ -11880,7 +12257,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -105.6001} + m_AnchoredPosition: {x: 0, y: -268} m_SizeDelta: {x: 0.00024414, y: 105.6} m_Pivot: {x: 0, y: 0} --- !u!222 &1709735489990748429 @@ -12143,13 +12520,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4987429560498598606} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6646632391203959697} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -3.6799927, y: -1.4399986} @@ -12185,7 +12562,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 36 + m_FontSize: 38 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 3 @@ -12310,8 +12687,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: 327, y: 0} - m_SizeDelta: {x: 260, y: 90} + m_AnchoredPosition: {x: 372, y: 0} + m_SizeDelta: {x: 260, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3862217738249413897 CanvasRenderer: @@ -12334,15 +12711,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9960785, g: 0.8078432, b: 0.043137256, 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: b1134bbf289f6804196269f211ceb031, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9717828f6bab66149bd19fd7c4199c3d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -12400,7 +12777,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5036026657389426946} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} m_CullingMode: 0 @@ -12508,7 +12885,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5652904641580187055 RectTransform: m_ObjectHideFlags: 0 @@ -12986,8 +13363,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: 15.1, y: -61.6} - m_SizeDelta: {x: 77.21, y: 30} + m_AnchoredPosition: {x: -1.6, y: -2} + m_SizeDelta: {x: 180, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4365722976667964095 CanvasRenderer: @@ -13023,8 +13400,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9803922, g: 0.98823535, b: 1, a: 1} - m_RaycastTarget: 1 + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -13032,18 +13409,18 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 22 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u540C\u610F" + m_Text: "\u901A\u8FC7" LanguageIndex: 0 --- !u!1 &5334970740754666704 GameObject: @@ -13139,6 +13516,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5728\u7EBF" LanguageIndex: 0 +--- !u!1 &5451511336370473147 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8724526289658201682} + - component: {fileID: 7941666022690529030} + - component: {fileID: 6613023986691109819} + m_Layer: 5 + m_Name: BG2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8724526289658201682 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5451511336370473147} + 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: 8207089920042677664} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 186.8, y: 0} + m_SizeDelta: {x: 586.4, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7941666022690529030 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5451511336370473147} + m_CullTransparentMesh: 0 +--- !u!114 &6613023986691109819 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5451511336370473147} + 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: 71dfff3189b19b84b8e68a6674a202db, 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 &5629711967880291713 GameObject: m_ObjectHideFlags: 0 @@ -13248,7 +13699,7 @@ RectTransform: - {fileID: 5943033667905224437} - {fileID: 9103335708516151981} m_Father: {fileID: 1347545229466372783} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.6104997, y: 0.5} @@ -13359,13 +13810,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5662322310821634265} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 838680993329894395} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -4.36, y: 0} @@ -13401,7 +13852,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 40 + m_FontSize: 45 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 3 @@ -13518,14 +13969,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6343228663674261894} - - {fileID: 8772882028327516404} - {fileID: 6580951877312136410} + - {fileID: 8772882028327516404} m_Father: {fileID: 1347545229466372783} 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: -128.9, y: -6.0699997} + m_AnchoredPosition: {x: -128.9, y: 17.2} m_SizeDelta: {x: 570, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2366806254406248552 @@ -13565,6 +14016,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5712188406268731715 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1346319460006752978} + - component: {fileID: 1038624267759750515} + - component: {fileID: 3214953870235978657} + m_Layer: 5 + m_Name: BG1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1346319460006752978 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5712188406268731715} + 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: 5011779960077541763} + m_Father: {fileID: 3916337637400531520} + 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: -232, y: 0} + m_SizeDelta: {x: 619, y: 197} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1038624267759750515 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5712188406268731715} + m_CullTransparentMesh: 0 +--- !u!114 &3214953870235978657 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5712188406268731715} + 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: 0.6117647, g: 0.43921572, 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: 28a9cc2ade05d324f8d5ee63f62c9521, 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 &5780236129836696129 GameObject: m_ObjectHideFlags: 0 @@ -13635,7 +14161,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5737306105508154579} - {fileID: 2976308146269546717} - {fileID: 4102831750850566289} - {fileID: 2135502055} @@ -13646,8 +14171,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0.024902344, y: 130.7002} - m_SizeDelta: {x: 0.050049, y: 264} + m_AnchoredPosition: {x: -0.49975586, y: 1749} + m_SizeDelta: {x: 1, y: 140.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8787084191535891846 MonoBehaviour: @@ -13674,12 +14199,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 85 + m_Left: 21 m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 30 + m_ChildAlignment: 6 + m_Spacing: -10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -13715,11 +14240,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 111266892991475185} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.27029732, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -14.06041, y: -30.900032} + m_AnchoredPosition: {x: 55, y: -72.3} m_SizeDelta: {x: 75.42081, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &60821876493567057 @@ -13770,13 +14295,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "1\u5929\u524D" + m_Text: "\u79BB\u7EBF" LanguageIndex: 0 --- !u!1 &5869393040750854767 GameObject: @@ -13869,7 +14394,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1461379568786738999 RectTransform: m_ObjectHideFlags: 0 @@ -13886,8 +14411,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: -15, y: -56} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: -11, y: -16} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9013096762760539208 CanvasRenderer: @@ -14191,7 +14716,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.27029732, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 6.3999996, y: -0.9} + m_AnchoredPosition: {x: 21.2, y: 1.2} m_SizeDelta: {x: 57, y: 40.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6857581832605231160 @@ -14270,7 +14795,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 163, y: 179.09967} + m_AnchoredPosition: {x: 264, y: 51.09967} m_SizeDelta: {x: 487.59998, y: 120.599976} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6256497383507493080 @@ -14425,7 +14950,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: 11.5, y: 3.6000004} + m_AnchoredPosition: {x: 11.5, y: -0.2999649} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6142383359161775238 @@ -14449,7 +14974,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.2509804, g: 0.2627451, b: 0.32941177, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -14694,8 +15219,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6461141417051072183} - - {fileID: 2722984241121829399} - {fileID: 5277125416202138011} + - {fileID: 2722984241121829399} m_Father: {fileID: 6363119302992407441} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -15137,14 +15662,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5450181546037097522} - - {fileID: 2371714775030353427} - {fileID: 7733706062430447445} + - {fileID: 2371714775030353427} m_Father: {fileID: 3121497351246217843} 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: -128.9, y: -6.0699997} + m_AnchoredPosition: {x: -128.9, y: 17.2} m_SizeDelta: {x: 570, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &285675530711327613 @@ -15218,7 +15743,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.27029732, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 6.3999996, y: -0.9} + m_AnchoredPosition: {x: 18.3, y: -0.9} m_SizeDelta: {x: 57, y: 40.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8819181469399009505 @@ -15264,6 +15789,81 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5728\u7EBF" LanguageIndex: 0 +--- !u!1 &6738763829749420037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8207089920042677664} + - component: {fileID: 7026899889604940597} + - component: {fileID: 7681776392397223467} + m_Layer: 5 + m_Name: BG1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8207089920042677664 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6738763829749420037} + 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: 8724526289658201682} + m_Father: {fileID: 3652243435284483246} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 298.5, y: 0} + m_SizeDelta: {x: 597.1, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7026899889604940597 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6738763829749420037} + m_CullTransparentMesh: 0 +--- !u!114 &7681776392397223467 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6738763829749420037} + 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: 0.6117647, g: 0.43921572, 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: 28a9cc2ade05d324f8d5ee63f62c9521, 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 &6783179813953758558 GameObject: m_ObjectHideFlags: 0 @@ -15487,16 +16087,16 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 111266892991475185} + - {fileID: 6687619312160956029} - {fileID: 8874310963549889162} - {fileID: 7162226723298814473} - - {fileID: 6687619312160956029} m_Father: {fileID: 1358752685723914932} - 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: 0.43755, y: 0.000011206} - m_SizeDelta: {x: 1080.9, y: 133.58} + m_SizeDelta: {x: 1080.9, y: 197} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5135796182930486998 CanvasRenderer: @@ -15513,7 +16113,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6927485388905164458} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -15607,7 +16207,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.65882355, g: 0.65882355, b: 0.654902, a: 1} + m_Color: {r: 0.8980392, g: 0.8980392, b: 0.8980392, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -15661,11 +16261,11 @@ RectTransform: m_Children: - {fileID: 3901002831229655366} m_Father: {fileID: 6691541230534623963} - m_RootOrder: 1 + 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: -404.7, y: 0} + m_AnchoredPosition: {x: -468.6, y: 30} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3612545106809169339 @@ -16014,7 +16614,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.27029732, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 6.3999996, y: -0.9} + m_AnchoredPosition: {x: 24, y: -0.9} m_SizeDelta: {x: 57, y: 40.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &545036212270377721 @@ -16240,12 +16840,12 @@ RectTransform: m_Children: - {fileID: 7923976920057843489} m_Father: {fileID: 6610803271868933761} - m_RootOrder: 2 + 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: -154.9, y: -15.5} - m_SizeDelta: {x: 74, y: 34} + m_AnchoredPosition: {x: 60.7, y: -71.9} + m_SizeDelta: {x: 120, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1590517195324177657 CanvasRenderer: @@ -16262,20 +16862,20 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7782548853939864311} - m_Enabled: 0 + 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_Color: {r: 1, g: 1, b: 1, a: 0.6156863} 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: 0405568b65406544aa993064f08b3f92, type: 3} + m_Sprite: {fileID: 21300000, guid: 4295a7ddf67cf2247aaada6dd994657f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -16315,11 +16915,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 504826432040856329} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.27029732, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -14.06041, y: -30.900032} + m_AnchoredPosition: {x: 26.3, y: -52.1} m_SizeDelta: {x: 75.42081, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6913993577136591351 @@ -16370,13 +16970,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "1\u5929\u524D" + m_Text: "\u79BB\u7EBF" LanguageIndex: 0 --- !u!1 &7822780870031574436 GameObject: @@ -16414,7 +17014,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 127} + m_AnchoredPosition: {x: 0, y: -14} m_SizeDelta: {x: 1080, y: 145} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8531206424835969181 @@ -16640,11 +17240,11 @@ RectTransform: m_Children: - {fileID: 8461871882968481422} m_Father: {fileID: 3121497351246217843} - m_RootOrder: 1 + 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: -404.7, y: 3.5} + m_AnchoredPosition: {x: -468.6, y: 30} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8369071300160124648 @@ -16760,7 +17360,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: -49, y: 30} + m_AnchoredPosition: {x: -136.5, y: 30} m_SizeDelta: {x: 284.82, y: 47.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3798533313285255617 @@ -16838,8 +17438,8 @@ 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.0024414062, y: 15.919922} - m_SizeDelta: {x: 0, y: -23.16} + m_AnchoredPosition: {x: -0.0024414062, y: -43.5} + m_SizeDelta: {x: 0, y: -230.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8292904445909203768 GameObject: @@ -16870,15 +17470,14 @@ 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: - - {fileID: 5819035664906176004} - m_Father: {fileID: 3217785936302008136} + m_Children: [] + m_Father: {fileID: 6957488199155494397} 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.010009766, y: -1.0000305} - m_SizeDelta: {x: -0.020019531, y: 2} + m_AnchoredPosition: {x: 0.014892578, y: 120.90036} + m_SizeDelta: {x: 0.030029468, y: 248.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9050933590847662699 CanvasRenderer: @@ -16901,14 +17500,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607845, g: 0.19607845, b: 0.20784315, a: 1} + m_Color: {r: 0.6981132, g: 0.6948202, b: 0.6948202, a: 0.7137255} 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_Sprite: {fileID: 21300000, guid: 8dbc8e6936f8a1643a3f479c5ad6d44c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -16967,20 +17566,20 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6610803271868933761} + - {fileID: 797907100930714330} - {fileID: 2072415747038129165} - {fileID: 7493053661541063975} - {fileID: 2566986453689731002} - {fileID: 2231049037705509969} - {fileID: 5884302331915450587} - {fileID: 4059621955304308086} - - {fileID: 797907100930714330} m_Father: {fileID: 1598358712703290739} - 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: 0.43755, y: 0.000011206} - m_SizeDelta: {x: 1080.9, y: 133.58} + m_SizeDelta: {x: 1080.9, y: 197} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8506153015581525250 CanvasRenderer: @@ -16997,7 +17596,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8328451721740872697} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -17057,8 +17656,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: 338.3, y: -6.213} - m_SizeDelta: {x: 146.8, y: 63.126} + m_AnchoredPosition: {x: 120.142456, y: -2.56} + m_SizeDelta: {x: 159.08, y: 74.92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4083432037181998826 CanvasRenderer: @@ -17081,15 +17680,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.8196079, b: 0.16862746, 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: b204bd77afb57e14e830d912e88eb357, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9717828f6bab66149bd19fd7c4199c3d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -17147,7 +17746,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8346496885065939159} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} m_CullingMode: 0 @@ -17263,13 +17862,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8350402653298692836} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1784806908} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -3.5899963, y: 0} @@ -17305,7 +17904,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 40 + m_FontSize: 45 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 3 @@ -17543,7 +18142,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 135} + m_AnchoredPosition: {x: 0, y: -14} m_SizeDelta: {x: 1080, y: 145} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8350402654859876506 @@ -17567,15 +18166,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.29803923, g: 0.5019608, b: 0.85098046, 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: a428c01c55a7c42408afbbcf729965ec, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9717828f6bab66149bd19fd7c4199c3d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -17675,7 +18274,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1712878163325904131 RectTransform: m_ObjectHideFlags: 0 @@ -17767,8 +18366,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: -10.3, y: -0.1} - m_SizeDelta: {x: 56.81, y: 57.32} + m_AnchoredPosition: {x: 0, y: -2.5} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3740137563591583991 CanvasRenderer: @@ -17811,7 +18410,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 27 + m_Text: 200 --- !u!114 &4637152764167249458 MonoBehaviour: m_ObjectHideFlags: 0 @@ -17861,7 +18460,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: -49, y: 30} + m_AnchoredPosition: {x: -136.5, y: 30} m_SizeDelta: {x: 284.82, y: 47.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8426444248009345705 @@ -17940,12 +18539,12 @@ RectTransform: - {fileID: 2797270838149696328} - {fileID: 7753665179075271787} m_Father: {fileID: 6691541230534623963} - m_RootOrder: 2 + m_RootOrder: 3 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: 383.8, y: 16.5} - m_SizeDelta: {x: 64, y: 57} + m_AnchoredPosition: {x: 354, y: 0} + m_SizeDelta: {x: 220, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4093213092512453996 CanvasRenderer: @@ -17968,15 +18567,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9960785, g: 0.8078432, b: 0.043137256, 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: e963f7c95efc2204a911765dd51de8ac, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9717828f6bab66149bd19fd7c4199c3d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -18058,11 +18657,11 @@ RectTransform: m_Children: - {fileID: 6681405294293809329} m_Father: {fileID: 6363119302992407441} - m_RootOrder: 1 + 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: -404.7, y: 3.5} + m_AnchoredPosition: {x: -468.6, y: 30} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1818500862087703427 @@ -18181,8 +18780,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, y: 0} - m_SizeDelta: {x: 260, y: 90} + m_AnchoredPosition: {x: 45, y: 0} + m_SizeDelta: {x: 260, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6795276963784613702 CanvasRenderer: @@ -18205,15 +18804,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.29411766, g: 0.48235297, b: 0.80392164, 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: 59ed96b0635ddb642aa2ceb24dcb6add, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9717828f6bab66149bd19fd7c4199c3d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -18271,7 +18870,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8637318310720281871} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} m_CullingMode: 0 @@ -18313,12 +18912,12 @@ RectTransform: m_Children: - {fileID: 2539512539669945009} m_Father: {fileID: 6691541230534623963} - 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: -445.3, y: -37} - m_SizeDelta: {x: 50.42, y: 31.52} + m_AnchoredPosition: {x: -472.2, y: -40} + m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3631591967285799229 CanvasRenderer: @@ -18335,7 +18934,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8680554213069507196} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -18348,7 +18947,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: c73ac4f44d9a7194488674d4fa335c10, type: 3} + m_Sprite: {fileID: 21300000, guid: 2770c5726ed367640a861fc899b5e9f0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -18392,8 +18991,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: 15.1, y: -61.6} - m_SizeDelta: {x: 77.21, y: 30} + m_AnchoredPosition: {x: -1.6000118, y: -2} + m_SizeDelta: {x: 180, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7879464397762516570 CanvasRenderer: @@ -18429,8 +19028,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9803922, g: 0.98823535, b: 1, a: 1} - m_RaycastTarget: 1 + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -18438,12 +19037,12 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 22 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -18641,7 +19240,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 126} + m_AnchoredPosition: {x: 0, y: -15} m_SizeDelta: {x: 1080, y: 145} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8000105512695244636 @@ -18793,7 +19392,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3652243435284483246 RectTransform: m_ObjectHideFlags: 0 @@ -18805,14 +19404,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 8207089920042677664} - {fileID: 6363119302992407441} m_Father: {fileID: 2037088950} 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: 540, y: -202.21002} - m_SizeDelta: {x: 1080, y: 133.58} + m_AnchoredPosition: {x: 540, y: 448} + m_SizeDelta: {x: 1080, y: 197} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1377689565180190327 CanvasRenderer: @@ -18915,7 +19515,7 @@ RectTransform: 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: 205, y: 109} + m_SizeDelta: {x: 264, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8882958054152668317 CanvasRenderer: @@ -18945,7 +19545,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: 4ea5db9ce28275b4285f6255c7d52acf, type: 3} + m_Sprite: {fileID: 21300000, guid: 7b5d246b7cac8f841ad311cd02b33c78, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua index 62148d8ee6..da3e11d73a 100644 --- a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua @@ -586,7 +586,7 @@ function GoodFriendMainPanel:FriendApplicationRefreshData(item, itemData) else Util.GetGameObject(item, "Image/bg"):SetActive(false) Util.GetGameObject(item, "Image/lastOnlineText"):SetActive(true) - Util.GetGameObject(item, "Image/lastOnlineText"):GetComponent("Text").text = this:ShowTime(itemData.offLineTime) + --Util.GetGameObject(item, "Image/lastOnlineText"):GetComponent("Text").text = this:ShowTime(itemData.offLineTime) end Util.AddOnceClick(agreeBtn, function() if GoodFriendManager.IsInBlackList(itemData.id) then