diff --git a/Assets/Scenes/ARChests.unity b/Assets/Scenes/ARChests.unity index 15ebda6..4473ec4 100644 --- a/Assets/Scenes/ARChests.unity +++ b/Assets/Scenes/ARChests.unity @@ -1078,7 +1078,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2075150843} - 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} @@ -1548,7 +1548,7 @@ Canvas: m_RenderMode: 0 m_Camera: {fileID: 0} m_PlaneDistance: 100 - m_PixelPerfect: 0 + m_PixelPerfect: 1 m_ReceivesEvents: 1 m_OverrideSorting: 0 m_OverridePixelPerfect: 0 @@ -1570,6 +1570,7 @@ RectTransform: m_Children: - {fileID: 117754088} - {fileID: 525158858} + - {fileID: 2140909180} - {fileID: 1213858282} - {fileID: 354920034} - {fileID: 934044169} @@ -1582,6 +1583,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &2140909179 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2140909180} + - component: {fileID: 2140909182} + - component: {fileID: 2140909181} + m_Layer: 5 + m_Name: backdrop + m_TagString: backdrop + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2140909180 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2140909179} + 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: 2075150843} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2140909181 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2140909179} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.69803923} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2140909182 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2140909179} + m_CullTransparentMesh: 1 --- !u!1001 &2051560003621773164 PrefabInstance: m_ObjectHideFlags: 0 @@ -1603,7 +1679,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2051560003732173217, guid: 7e968cfcf2604844bbbb5c55b6877b1a, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 2051560003732173217, guid: 7e968cfcf2604844bbbb5c55b6877b1a, type: 3} propertyPath: m_AnchorMax.x @@ -1700,7 +1776,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6875010322944971259, guid: dec5567b00795ed4ea646582d26f5c0a, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 6875010322944971259, guid: dec5567b00795ed4ea646582d26f5c0a, type: 3} propertyPath: m_AnchorMax.x @@ -1791,6 +1867,38 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2075150843} m_Modifications: + - target: {fileID: 6892048610668196350, guid: c28e2b7b9271e1c49906dc405fb02961, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6892048610668196350, guid: c28e2b7b9271e1c49906dc405fb02961, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6892048610668196350, guid: c28e2b7b9271e1c49906dc405fb02961, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6892048610668196350, guid: c28e2b7b9271e1c49906dc405fb02961, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6892048610668196350, guid: c28e2b7b9271e1c49906dc405fb02961, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6892048610668196350, guid: c28e2b7b9271e1c49906dc405fb02961, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6892048610668196350, guid: c28e2b7b9271e1c49906dc405fb02961, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6892048610668196350, guid: c28e2b7b9271e1c49906dc405fb02961, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6892048611582406521, guid: c28e2b7b9271e1c49906dc405fb02961, type: 3} propertyPath: m_Name value: aboutQuestPrefab @@ -1805,7 +1913,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6892048611582406522, guid: c28e2b7b9271e1c49906dc405fb02961, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6892048611582406522, guid: c28e2b7b9271e1c49906dc405fb02961, type: 3} propertyPath: m_AnchorMax.x @@ -1879,5 +1987,29 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8992783127745785776, guid: c28e2b7b9271e1c49906dc405fb02961, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8992783127745785776, guid: c28e2b7b9271e1c49906dc405fb02961, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8992783127745785776, guid: c28e2b7b9271e1c49906dc405fb02961, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8992783127745785776, guid: c28e2b7b9271e1c49906dc405fb02961, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8992783127745785776, guid: c28e2b7b9271e1c49906dc405fb02961, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8992783127745785776, guid: c28e2b7b9271e1c49906dc405fb02961, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c28e2b7b9271e1c49906dc405fb02961, type: 3} diff --git a/Assets/prefabs/UI/aboutQuestPrefab.prefab b/Assets/prefabs/UI/aboutQuestPrefab.prefab index 2e6bcdc..401a239 100644 --- a/Assets/prefabs/UI/aboutQuestPrefab.prefab +++ b/Assets/prefabs/UI/aboutQuestPrefab.prefab @@ -79,78 +79,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u041E \u041A\u0432\u0435\u0441\u0442\u0435" ---- !u!1 &6892048610668196349 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6892048610668196350} - - component: {fileID: 6892048610668196336} - - component: {fileID: 6892048610668196351} - m_Layer: 5 - m_Name: filter_aboutQuest - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6892048610668196350 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6892048610668196349} - 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: 6892048611582406522} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.44000244, y: 0} - m_SizeDelta: {x: 2560, y: 2560} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6892048610668196336 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6892048610668196349} - m_CullTransparentMesh: 1 ---- !u!114 &6892048610668196351 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6892048610668196349} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 2800000, guid: 3eaea7854f60ecd4f9617de7590dcd73, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 --- !u!1 &6892048610904861918 GameObject: m_ObjectHideFlags: 0 @@ -442,7 +370,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6892048610668196350} - {fileID: 6892048612149349203} m_Father: {fileID: 0} m_RootOrder: 0 @@ -566,7 +493,7 @@ RectTransform: - {fileID: 6892048611632276526} - {fileID: 6892048610200388990} m_Father: {fileID: 6892048611582406522} - m_RootOrder: 1 + 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} @@ -595,7 +522,7 @@ MonoBehaviour: m_EditorClassIdentifier: discr: {fileID: 6892048611632276527} previousBtn: {fileID: 6892048610904861918} - filter: {fileID: 6892048610668196349} + filter: {fileID: 0} --- !u!114 &6892048612149349204 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 2ed13f8..e348ff1 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -17,6 +17,7 @@ TagManager: - tenpoints_tagget - lamp - status + - backdrop layers: - Default - TransparentFX