diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildMainCityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildMainCityPanel.prefab index fef3eff06f..ffbab3e286 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildMainCityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildMainCityPanel.prefab @@ -393,7 +393,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: -4, y: -125} + m_AnchoredPosition: {x: -4, y: 9.7} m_SizeDelta: {x: 160, y: 42.81} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &249928196 @@ -627,7 +627,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: -136.78, y: 491} + m_AnchoredPosition: {x: 289, y: 5} m_SizeDelta: {x: 300.45, y: 251.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &427977002 @@ -651,14 +651,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: 1, b: 1, a: 0} 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: f99ee5da65520004386be844fcb78145, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -739,11 +739,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4082977241631064924} - 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: 88, y: -117} + m_AnchoredPosition: {x: -7, y: -149} m_SizeDelta: {x: 160, y: 42.81} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &503416775 @@ -1004,7 +1004,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &533022050 RectTransform: m_ObjectHideFlags: 0 @@ -1022,7 +1022,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: 230.3, y: -339.3} + m_AnchoredPosition: {x: 705, y: -339.3} m_SizeDelta: {x: 433.6, y: 371.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &533022053 @@ -1575,9 +1575,9 @@ RectTransform: m_Father: {fileID: 532567276} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 541.16, y: -50} m_SizeDelta: {x: 1077.68, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &760142332 @@ -1616,7 +1616,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: -161.9, y: -122.2} + m_AnchoredPosition: {x: 441, y: -364} m_SizeDelta: {x: 310.9, y: 262.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &760142336 @@ -1640,14 +1640,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: 1, b: 1, a: 0} 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: 3c57ece93e2ddab44966c2b07d5f21fa, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1844,8 +1844,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: -386, y: 194} - m_SizeDelta: {x: 294.2, y: 246.4} + m_AnchoredPosition: {x: -460.73, y: 187.25998} + m_SizeDelta: {x: 286.65, y: 356.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1147302019 CanvasRenderer: @@ -1868,14 +1868,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: 1, b: 1, a: 0.07058824} 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: bdf10f8fc05906f4881e75999a1b2216, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2642,7 +2642,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: -158, y: -42} + m_AnchoredPosition: {x: 99.99997, y: -69} m_SizeDelta: {x: 160, y: 42.81} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1594683419 @@ -2928,7 +2928,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4082977242500346118} - 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} @@ -3073,11 +3073,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4082977242554950421} - 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: 0, y: -104} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 160, y: 42.81} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1809602598 @@ -3158,7 +3158,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: 331, y: 475} + m_AnchoredPosition: {x: 1, y: 453} m_SizeDelta: {x: 400, y: 336} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1834964746 @@ -3182,14 +3182,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: 1, b: 1, a: 0} 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: 39b9c1f4b4f8a3a40a3872bb4df8f581, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3276,8 +3276,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: 228.7, y: 60} - m_SizeDelta: {x: 327.71, y: 303.4} + m_AnchoredPosition: {x: 518.2, y: 230.4} + m_SizeDelta: {x: 251.3, y: 423.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1875573677 CanvasRenderer: @@ -3300,14 +3300,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: 1, b: 1, a: 0} 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: 14c2ef2b2daddbc46beaeeb6761ba571, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3393,9 +3393,9 @@ RectTransform: m_Father: {fileID: 1776449562} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 64.805, y: -67} m_SizeDelta: {x: 146, y: 134} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1957199313 @@ -3690,7 +3690,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: 55, y: -672} + m_AnchoredPosition: {x: 11, y: -203} m_SizeDelta: {x: 248.2, y: 277.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2030871931 @@ -3714,14 +3714,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: 1, b: 1, a: 0} 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: 39b9c1f4b4f8a3a40a3872bb4df8f581, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3806,7 +3806,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: -156, y: -67} + m_AnchoredPosition: {x: -158, y: -72} m_SizeDelta: {x: 160, y: 42.81} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2056968125 @@ -3949,7 +3949,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1295078647590787232 RectTransform: m_ObjectHideFlags: 0 @@ -3966,8 +3966,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: 10} - m_SizeDelta: {x: 75, y: 173} + m_AnchoredPosition: {x: -151, y: -70.8} + m_SizeDelta: {x: 436, y: 101} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6591884182363516576 CanvasRenderer: @@ -3997,7 +3997,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: d755f7a50f2b31e42a29a07e3c28c358, type: 3} + m_Sprite: {fileID: 21300000, guid: f35776c71d493ff43807b8bfb2e7dffa, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4043,7 +4043,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: -314, y: -453} + m_AnchoredPosition: {x: -440, y: -283} m_SizeDelta: {x: 248.2, y: 277.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1833049324287301036 @@ -4067,14 +4067,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: 1, b: 1, a: 0} 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: bdf10f8fc05906f4881e75999a1b2216, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4339,7 +4339,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8920274028299936965} - 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} @@ -4422,7 +4422,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: -43, y: -48} + m_AnchoredPosition: {x: -43, y: -41} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4411939730782304098 @@ -4511,7 +4511,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0.000014404, y: -14.8} - m_SizeDelta: {x: 1080, y: 1749.7} + m_SizeDelta: {x: 1294, y: 1719} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2266373320161737092 CanvasRenderer: @@ -4541,7 +4541,81 @@ 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: 6a105b4c5200f8a45863f7fc2c76df96, type: 3} + m_Sprite: {fileID: 21300000, guid: 90bd6d31f9702fc4d9bb5547987da5a1, 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 &3893344892828032383 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5318824929372016389} + - component: {fileID: 4628588975388787515} + - component: {fileID: 1321168764961702037} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5318824929372016389 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3893344892828032383} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_Children: [] + m_Father: {fileID: 8920274028299936965} + 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: 84, y: 91} + m_SizeDelta: {x: 436, y: 101} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4628588975388787515 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3893344892828032383} + m_CullTransparentMesh: 0 +--- !u!114 &1321168764961702037 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3893344892828032383} + 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: f35776c71d493ff43807b8bfb2e7dffa, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4654,7 +4728,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4082977242500346118} - 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} @@ -5037,7 +5111,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: -75, y: -28} + m_AnchoredPosition: {x: 216, y: -36} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082977241200803730 @@ -5321,7 +5395,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4082977241548290403 RectTransform: m_ObjectHideFlags: 0 @@ -5338,8 +5412,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: 10} - m_SizeDelta: {x: 75, y: 173} + m_AnchoredPosition: {x: 102.99997, y: -69} + m_SizeDelta: {x: 436, y: 101} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082977241548290405 CanvasRenderer: @@ -5369,7 +5443,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: cb1a5bf33746fba4bbbfd698d8ab09d1, type: 3} + m_Sprite: {fileID: 21300000, guid: f35776c71d493ff43807b8bfb2e7dffa, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5408,6 +5482,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4082977242103462506} + - {fileID: 3067533096437538768} - {fileID: 4082977241905790344} - {fileID: 503416773} m_Father: {fileID: 2030871928} @@ -5415,8 +5490,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: -89, y: 7} - m_SizeDelta: {x: 71, y: 290} + m_AnchoredPosition: {x: -0.0000076293945, y: 0.42499} + m_SizeDelta: {x: 248.2, y: 276.85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082977241631064926 CanvasRenderer: @@ -5707,11 +5782,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4082977241631064924} - 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: 12.000011, y: 97.5} + m_AnchoredPosition: {x: 96, y: -117} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082977241905790346 @@ -5998,7 +6073,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 10} - m_SizeDelta: {x: 51, y: 203} + m_SizeDelta: {x: 436, y: 101} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082977242103462508 CanvasRenderer: @@ -6028,7 +6103,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: 3b255087598aaee46bd34b8f0c7ca6d7, type: 3} + m_Sprite: {fileID: 21300000, guid: f35776c71d493ff43807b8bfb2e7dffa, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6148,7 +6223,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: 155, y: -49} + m_AnchoredPosition: {x: -108, y: -49} m_SizeDelta: {x: 71, y: 221} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082977242132848007 @@ -6279,7 +6354,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4082977242159030402 RectTransform: m_ObjectHideFlags: 0 @@ -6297,7 +6372,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 10} - m_SizeDelta: {x: 75, y: 173} + m_SizeDelta: {x: 436, y: 101} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082977242159030404 CanvasRenderer: @@ -6327,7 +6402,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: 9d840712208e95841aa529bd70515cac, type: 3} + m_Sprite: {fileID: 21300000, guid: f35776c71d493ff43807b8bfb2e7dffa, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6373,7 +6448,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: 16, y: -1.5} + m_AnchoredPosition: {x: -16, y: -174} m_SizeDelta: {x: 71, y: 221} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082977242252187455 @@ -6443,11 +6518,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4082977242554950421} - 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: 12.000011, y: 65.00001} + m_AnchoredPosition: {x: 83, y: -75} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082977242327615162 @@ -6671,6 +6746,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4082977240810060127} + - {fileID: 3085582599216609923} - {fileID: 4082977241023041047} - {fileID: 1717606279} m_Father: {fileID: 760142333} @@ -6748,6 +6824,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4082977241693889920} + - {fileID: 697173846539774050} - {fileID: 4082977242327615160} - {fileID: 1809602596} m_Father: {fileID: 427976999} @@ -6829,7 +6906,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: 12.000011, y: 65.00001} + m_AnchoredPosition: {x: 91.9, y: 33.5} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082977242632243173 @@ -6949,6 +7026,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u516C\u4F1A\u540D\u79F0" LanguageIndex: 0 +--- !u!1 &4316806072312691239 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 697173846539774050} + - component: {fileID: 1558438935167261733} + - component: {fileID: 3554650261296871652} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &697173846539774050 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4316806072312691239} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_Children: [] + m_Father: {fileID: 4082977242554950421} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -100} + m_SizeDelta: {x: 436, y: 101} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1558438935167261733 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4316806072312691239} + m_CullTransparentMesh: 0 +--- !u!114 &3554650261296871652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4316806072312691239} + 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: f35776c71d493ff43807b8bfb2e7dffa, 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 &4390539902877866263 GameObject: m_ObjectHideFlags: 0 @@ -7331,6 +7482,80 @@ MonoBehaviour: m_EditorClassIdentifier: m_Delegates: [] delegates: [] +--- !u!1 &6055643986724245431 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3067533096437538768} + - component: {fileID: 6826083137776247397} + - component: {fileID: 2328135507262008942} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3067533096437538768 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6055643986724245431} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_Children: [] + m_Father: {fileID: 4082977241631064924} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -150} + m_SizeDelta: {x: 436, y: 101} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6826083137776247397 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6055643986724245431} + m_CullTransparentMesh: 0 +--- !u!114 &2328135507262008942 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6055643986724245431} + 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: f35776c71d493ff43807b8bfb2e7dffa, 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 &6181129926514043469 GameObject: m_ObjectHideFlags: 0 @@ -7405,6 +7630,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6553924192659310140 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3085582599216609923} + - component: {fileID: 7231497518100183036} + - component: {fileID: 260008064072786854} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3085582599216609923 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6553924192659310140} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_Children: [] + m_Father: {fileID: 4082977242500346118} + 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: -178, y: 30} + m_SizeDelta: {x: 436, y: 101} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7231497518100183036 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6553924192659310140} + m_CullTransparentMesh: 0 +--- !u!114 &260008064072786854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6553924192659310140} + 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: f35776c71d493ff43807b8bfb2e7dffa, 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 &7504221265438304480 GameObject: m_ObjectHideFlags: 0 @@ -7666,7 +7965,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.95686275, g: 0.9254902, b: 0.7647059, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -7674,7 +7973,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 26 m_FontStyle: 0 m_BestFit: 0 @@ -7791,7 +8090,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8920274028299936965} - 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} @@ -7864,6 +8163,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8920274028045604787} + - {fileID: 5318824929372016389} - {fileID: 8920274028121475139} - {fileID: 2701096353396148775} m_Father: {fileID: 1833049324287301033} @@ -7871,7 +8171,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: -88.6, y: -194} + m_AnchoredPosition: {x: -88.6, y: -200} m_SizeDelta: {x: 71, y: 290} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8920274028299936963