diff --git a/Assets/MemoryBox/arScene/arScene.unity b/Assets/MemoryBox/arScene/arScene.unity index 45a405e9222800beb1046ca214687a91b5671aa7..8fb7cd23861532b3b40db6c70abbb7f317e5f8fc 100644 --- a/Assets/MemoryBox/arScene/arScene.unity +++ b/Assets/MemoryBox/arScene/arScene.unity @@ -442,16 +442,16 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 106367896} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 5.3871436} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1293853817} - m_RootOrder: 8 + m_Father: {fileID: 2030408298} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 1.7437, y: -1113} - m_SizeDelta: {x: -96.513, y: 92} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 622.49, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &106367898 MonoBehaviour: @@ -1843,16 +1843,16 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 368213997} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 5.3871436} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1293853817} - m_RootOrder: 10 + m_Father: {fileID: 2030408298} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -6.5126038, y: -2001} - m_SizeDelta: {x: -400, y: 35} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 267, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &368213999 MonoBehaviour: @@ -2617,6 +2617,41 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &551216364 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 551216365} + m_Layer: 0 + m_Name: PictureContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &551216365 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 551216364} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 14.813503} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1539769881} + - {fileID: 1716188650} + m_Father: {fileID: 2030408298} + 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: 311.25, y: -231.05} + m_SizeDelta: {x: 622.5, y: 462.1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &563673018 GameObject: m_ObjectHideFlags: 0 @@ -3621,7 +3656,7 @@ MonoBehaviour: m_HandleRect: {fileID: 985360928} m_Direction: 2 m_Value: 0.9999998 - m_Size: 0.4674433 + m_Size: 0.5190803 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -5479,16 +5514,16 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1197905903} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 5.3871436} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1293853817} - m_RootOrder: 9 + m_Father: {fileID: 2030408298} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 1.7438, y: -1850} - m_SizeDelta: {x: -96.513, y: 92} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 622.49, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1197905905 MonoBehaviour: @@ -6127,12 +6162,7 @@ RectTransform: - {fileID: 854802310} - {fileID: 1997577005} - {fileID: 781622759} - - {fileID: 1539769881} - - {fileID: 1613787919} - - {fileID: 1704763488} - - {fileID: 106367897} - - {fileID: 1197905904} - - {fileID: 368213998} + - {fileID: 2030408298} m_Father: {fileID: 1630150336} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7218,15 +7248,15 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1502813311} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 5.3871436} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1613787919} - m_RootOrder: 0 + m_Father: {fileID: 1887593736} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -51, y: -18.613647} + m_AnchoredPosition: {x: -51.00122, y: 23.536499} m_SizeDelta: {x: 98, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1502813313 @@ -7521,17 +7551,16 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1539769880} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -5.3871436} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1716188650} - m_Father: {fileID: 1293853817} - m_RootOrder: 5 + m_Children: [] + m_Father: {fileID: 551216365} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -310, y: -1015} - m_SizeDelta: {x: 0, y: -1909.8} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -1.0500488} + m_SizeDelta: {x: -2.3399658, y: 420.09387} m_Pivot: {x: 0, y: 1} --- !u!114 &1539769882 MonoBehaviour: @@ -7544,8 +7573,8 @@ MonoBehaviour: m_Script: {fileID: -1254083943, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_AspectMode: 2 - m_AspectRatio: 1.550125 + m_AspectMode: 1 + m_AspectRatio: 1.4762416 --- !u!114 &1539769883 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7567,7 +7596,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 4bf0634b52b6641ec9b66bfb6088920e, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -7749,17 +7778,16 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1613787918} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 5.3871436} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1502813312} - m_Father: {fileID: 1293853817} - m_RootOrder: 6 + m_Children: [] + m_Father: {fileID: 1887593736} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 60.037598, y: -1463} - m_SizeDelta: {x: -120, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0.0087890625, y: -3.3499756} + m_SizeDelta: {x: 622.49, y: 271} m_Pivot: {x: 0, y: 1} --- !u!114 &1613787920 MonoBehaviour: @@ -8119,7 +8147,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0.00024414062} - m_SizeDelta: {x: 0, y: 2738.3} + m_SizeDelta: {x: 0, y: 2465.9} m_Pivot: {x: 0, y: 1} --- !u!1 &1636607176 GameObject: @@ -8435,16 +8463,16 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1704763487} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 5.3871436} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1293853817} - m_RootOrder: 7 + m_Father: {fileID: 2030408298} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 1.7436695, y: -1540} - m_SizeDelta: {x: -96.513, y: 92} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 622.49, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1704763489 MonoBehaviour: @@ -8698,16 +8726,16 @@ RectTransform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1716188649} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -5.3871436} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1539769881} - m_RootOrder: 0 + m_Father: {fileID: 551216365} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: -35.19995} + m_AnchoredPosition: {x: -1, y: 5.7559814} m_SizeDelta: {x: 127.9, y: 25.2} m_Pivot: {x: 1, y: 0} --- !u!114 &1716188651 @@ -9752,6 +9780,41 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1886370084} +--- !u!1 &1887593735 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1887593736} + m_Layer: 0 + m_Name: TextContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1887593736 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1887593735} + 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: 1613787919} + - {fileID: 1502813312} + m_Father: {fileID: 2030408298} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 311.25, y: -158.25} + m_SizeDelta: {x: 622.5, y: 316.5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1917059638 GameObject: m_ObjectHideFlags: 0 @@ -10387,6 +10450,82 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1998210757} +--- !u!1 &2030408297 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 2030408298} + - component: {fileID: 2030408300} + - component: {fileID: 2030408299} + m_Layer: 0 + m_Name: Layout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2030408298 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2030408297} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -5.3871436} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 551216365} + - {fileID: 106367897} + - {fileID: 1887593736} + - {fileID: 1704763488} + - {fileID: 1197905904} + - {fileID: 368213998} + m_Father: {fileID: 1293853817} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 2.2437742, y: -1510.4} + m_SizeDelta: {x: 622.5, y: 999.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2030408299 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2030408297} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 1 + m_Spacing: 30 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &2030408300 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2030408297} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &2036110387 GameObject: m_ObjectHideFlags: 0