From f89bf8319be9ff0437d563d11375ffa4199161ec Mon Sep 17 00:00:00 2001 From: VladimirDivak Date: Fri, 7 Jul 2023 19:06:04 +0500 Subject: [PATCH] add ar game scene / add ui --- Assets/Images/UI/Frame.png | Bin 2125 -> 0 bytes Assets/Images/UI/ScanFrame.png | Bin 0 -> 9339 bytes .../UI/{Frame.png.meta => ScanFrame.png.meta} | 18 +- Assets/Images/UI/YellowCircle.png | Bin 0 -> 1672 bytes Assets/Images/UI/YellowCircle.png.meta | 159 ++ Assets/Meshes/Achives/Butterfly.meta | 8 - Assets/Meshes/Achives/Circle.meta | 8 - Assets/Meshes/Achives/Flower.meta | 8 - Assets/Meshes/Achives/Hands.meta | 8 - Assets/Meshes/Achives/Magic.meta | 8 - Assets/Meshes/Achives/Mask.meta | 8 - Assets/Meshes/Achives/Random.meta | 8 - Assets/Meshes/Achives/Sailboat.meta | 8 - Assets/Scenes/GameScene.unity | 1626 +++++++++++------ Assets/Scenes/MainMenu.unity | 176 +- Assets/Scripts/Core/MainMenu/MainMenu.cs | 8 + Assets/Scripts/UI/ARTopBar.cs | 29 + Assets/Scripts/UI/ARTopBar.cs.meta | 11 + .../XR/XRGeneralSettingsPerBuildTarget.asset | 9 +- Packages/manifest.json | 2 + Packages/packages-lock.json | 22 +- ProjectSettings/EditorBuildSettings.asset | 3 + ProjectSettings/ProjectSettings.asset | 28 +- ProjectSettings/QualitySettings.asset | 2 +- 24 files changed, 1396 insertions(+), 761 deletions(-) delete mode 100644 Assets/Images/UI/Frame.png create mode 100644 Assets/Images/UI/ScanFrame.png rename Assets/Images/UI/{Frame.png.meta => ScanFrame.png.meta} (94%) create mode 100644 Assets/Images/UI/YellowCircle.png create mode 100644 Assets/Images/UI/YellowCircle.png.meta delete mode 100644 Assets/Meshes/Achives/Butterfly.meta delete mode 100644 Assets/Meshes/Achives/Circle.meta delete mode 100644 Assets/Meshes/Achives/Flower.meta delete mode 100644 Assets/Meshes/Achives/Hands.meta delete mode 100644 Assets/Meshes/Achives/Magic.meta delete mode 100644 Assets/Meshes/Achives/Mask.meta delete mode 100644 Assets/Meshes/Achives/Random.meta delete mode 100644 Assets/Meshes/Achives/Sailboat.meta create mode 100644 Assets/Scripts/UI/ARTopBar.cs create mode 100644 Assets/Scripts/UI/ARTopBar.cs.meta diff --git a/Assets/Images/UI/Frame.png b/Assets/Images/UI/Frame.png deleted file mode 100644 index 7d802c91cbb9e5648edc3703f3c9272a5ac704a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2125 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ʫ^7ZfP&p-X9KT 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 SV1%9k0000HhEl literal 0 HcmV?d00001 diff --git a/Assets/Images/UI/YellowCircle.png.meta b/Assets/Images/UI/YellowCircle.png.meta new file mode 100644 index 0000000..11a7c8d --- /dev/null +++ b/Assets/Images/UI/YellowCircle.png.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: 295df248362b5504f87808324a624230 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/Achives/Butterfly.meta b/Assets/Meshes/Achives/Butterfly.meta deleted file mode 100644 index 813afd4..0000000 --- a/Assets/Meshes/Achives/Butterfly.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f63715c7d7c82dc489d23be08a2f9dc8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Meshes/Achives/Circle.meta b/Assets/Meshes/Achives/Circle.meta deleted file mode 100644 index b341b74..0000000 --- a/Assets/Meshes/Achives/Circle.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e0301ca6f0728b54a9ae845b1cb6c94f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Meshes/Achives/Flower.meta b/Assets/Meshes/Achives/Flower.meta deleted file mode 100644 index 52ee0de..0000000 --- a/Assets/Meshes/Achives/Flower.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 44c25145d4569974badea8b713ce44d7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Meshes/Achives/Hands.meta b/Assets/Meshes/Achives/Hands.meta deleted file mode 100644 index f243149..0000000 --- a/Assets/Meshes/Achives/Hands.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: abb331cc2f31b2144bfc356f19830a0f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Meshes/Achives/Magic.meta b/Assets/Meshes/Achives/Magic.meta deleted file mode 100644 index 2a16ab1..0000000 --- a/Assets/Meshes/Achives/Magic.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8f2a691880f107e4f972f18f6ac6dd63 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Meshes/Achives/Mask.meta b/Assets/Meshes/Achives/Mask.meta deleted file mode 100644 index 26ee46e..0000000 --- a/Assets/Meshes/Achives/Mask.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ed44f92c8e85ba9439fcb72e9f4c38d6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Meshes/Achives/Random.meta b/Assets/Meshes/Achives/Random.meta deleted file mode 100644 index 85ba613..0000000 --- a/Assets/Meshes/Achives/Random.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f53e233002479654b81293afdd203051 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Meshes/Achives/Sailboat.meta b/Assets/Meshes/Achives/Sailboat.meta deleted file mode 100644 index e5ef903..0000000 --- a/Assets/Meshes/Achives/Sailboat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 893f74fd4a85bf544be5f2cefd4f2772 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 9d14b92..f3e9a57 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -124,7 +124,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &302706448 +--- !u!1 &89059425 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -132,153 +132,75 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 302706449} - - component: {fileID: 302706452} - - component: {fileID: 302706451} - - component: {fileID: 302706450} + - component: {fileID: 89059426} + - component: {fileID: 89059428} + - component: {fileID: 89059427} m_Layer: 5 - m_Name: HeaderText + m_Name: LocationIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &302706449 +--- !u!224 &89059426 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 302706448} + m_GameObject: {fileID: 89059425} 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 795675613} + m_Father: {fileID: 2132239657} 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: 329, y: 0} + m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &302706450 +--- !u!114 &89059427 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 302706448} + m_GameObject: {fileID: 89059425} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!114 &302706451 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 302706448} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u042D\u0442\u043E\u0442 AR-\u043A\u0432\u0435\u0441\u0442 \u043F\u0440\u0435\u0434\u043B\u0430\u0433\u0430\u0435\u0442 - \u044F\u043D\u0434\u0435\u043A\u0441\u043E\u0438\u0434\u0430\u043C \u043D\u0430\u0439\u0442\u0438 - 10 \u0430\u0447\u0438\u0432\u043E\u043A \u0438\_\u043F\u043E\u043B\u0443\u0447\u0438\u0442\u044C - \u0437\u0430 \u044D\u0442\u043E \u043F\u0440\u0438\u0437\u044B" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 6109aefe671f7ef4aaa1dcbd5791e1e6, type: 2} - m_sharedMaterial: {fileID: 1817443946518195601, guid: 6109aefe671f7ef4aaa1dcbd5791e1e6, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &302706452 + m_Sprite: {fileID: 21300000, guid: 0c844052746864042b2fb5f83da35b06, 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &89059428 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 302706448} + m_GameObject: {fileID: 89059425} m_CullTransparentMesh: 1 ---- !u!1 &521053777 +--- !u!1 &261133832 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -286,116 +208,232 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 521053780} - - component: {fileID: 521053779} - - component: {fileID: 521053778} - - component: {fileID: 521053781} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera + - component: {fileID: 261133833} + - component: {fileID: 261133835} + - component: {fileID: 261133834} + m_Layer: 5 + m_Name: Bottom + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &521053778 -AudioListener: +--- !u!224 &261133833 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 521053777} - m_Enabled: 1 ---- !u!20 &521053779 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 521053777} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &521053780 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 521053777} + m_GameObject: {fileID: 261133832} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} + m_Children: + - {fileID: 1303956042} + - {fileID: 537435585} + m_Father: {fileID: 1486020967} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &521053781 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 56} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &261133834 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 521053777} + m_GameObject: {fileID: 261133832} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + 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 &261133835 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 261133832} + m_CullTransparentMesh: 1 +--- !u!1 &267421592 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 267421593} + - component: {fileID: 267421595} + - component: {fileID: 267421594} + m_Layer: 5 + m_Name: ScanFrame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &267421593 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 267421592} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 795675613} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 319, y: 319} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &267421594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 267421592} + 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.99607843, g: 0.83137256, b: 0.16862746, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 077feea8f0a3f4e499f92aa8efbc3f29, 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &267421595 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 267421592} + m_CullTransparentMesh: 1 +--- !u!1 &537435584 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 537435585} + - component: {fileID: 537435587} + - component: {fileID: 537435586} + m_Layer: 5 + m_Name: Container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &537435585 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 537435584} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 726602615} + - {fileID: 1615717930} + m_Father: {fileID: 261133833} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -16, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &537435586 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 537435584} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &537435587 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 537435584} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 4 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &723924816 GameObject: m_ObjectHideFlags: 0 @@ -491,8 +529,85 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &726602614 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 726602615} + - component: {fileID: 726602617} + - component: {fileID: 726602616} + m_Layer: 5 + m_Name: Counter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &726602615 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 726602614} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1403986939} + m_Father: {fileID: 537435585} + 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: 48, y: 48} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &726602616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 726602614} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 295df248362b5504f87808324a624230, 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &726602617 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 726602614} + m_CullTransparentMesh: 1 --- !u!1 &795675612 GameObject: m_ObjectHideFlags: 0 @@ -502,8 +617,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 795675613} - - component: {fileID: 795675615} - - component: {fileID: 795675614} m_Layer: 5 m_Name: Container m_TagString: Untagged @@ -523,59 +636,207 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 302706449} - - {fileID: 1879331060} - - {fileID: 1590214829} - - {fileID: 1618715682} + - {fileID: 1486020967} - {fileID: 1718157696} + - {fileID: 267421593} m_Father: {fileID: 934835006} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -64, y: 0} + m_SizeDelta: {x: -64, y: -128} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &795675614 +--- !u!1 &881330665 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 881330666} + m_Layer: 5 + m_Name: Top + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &881330666 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 881330665} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2132239657} + - {fileID: 2033363079} + m_Father: {fileID: 1486020967} + 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} + m_Pivot: {x: 0.5, y: 1} +--- !u!1 &926923758 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 926923759} + - component: {fileID: 926923762} + - component: {fileID: 926923761} + - component: {fileID: 926923760} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &926923759 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 926923758} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2132239657} + 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: 117.06, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &926923760 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 795675612} + m_GameObject: {fileID: 926923758} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 0 + m_HorizontalFit: 2 m_VerticalFit: 2 ---- !u!114 &795675615 +--- !u!114 &926923761 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 795675612} + m_GameObject: {fileID: 926923758} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 52 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u041C\u043E\u0441\u043A\u0432\u0430, \u041A\u0440\u0430\u0441\u043D\u0430\u044F + \u0420\u043E\u0437\u0430" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 4a8bdc23e21468d4080d35faaec8d41c, type: 2} + m_sharedMaterial: {fileID: -5998402004293396020, guid: 4a8bdc23e21468d4080d35faaec8d41c, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &926923762 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 926923758} + m_CullTransparentMesh: 1 --- !u!1 &934835005 GameObject: m_ObjectHideFlags: 0 @@ -586,7 +847,6 @@ GameObject: m_Component: - component: {fileID: 934835006} - component: {fileID: 934835010} - - component: {fileID: 934835009} - component: {fileID: 934835007} - component: {fileID: 934835008} m_Layer: 5 @@ -643,36 +903,6 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 ---- !u!114 &934835009 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 934835005} - 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: 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_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 &934835010 CanvasRenderer: m_ObjectHideFlags: 0 @@ -855,8 +1085,159 @@ Transform: m_Children: - {fileID: 1048800711} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1303956041 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1303956042} + - component: {fileID: 1303956045} + - component: {fileID: 1303956044} + - component: {fileID: 1303956043} + m_Layer: 5 + m_Name: CollectionText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1303956042 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1303956041} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 261133833} + m_RootOrder: 0 + 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: 16, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1303956043 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1303956041} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &1303956044 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1303956041} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u041A\u043E\u043B\u043B\u0435\u043A\u0446\u0438\u044F \u0430\u0447\u0438\u0432\u043E\u043A" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 4a8bdc23e21468d4080d35faaec8d41c, type: 2} + m_sharedMaterial: {fileID: -5998402004293396020, guid: 4a8bdc23e21468d4080d35faaec8d41c, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1303956045 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1303956041} + m_CullTransparentMesh: 1 --- !u!1 &1334164782 GameObject: m_ObjectHideFlags: 0 @@ -869,7 +1250,7 @@ GameObject: - component: {fileID: 1334164786} - component: {fileID: 1334164785} - component: {fileID: 1334164784} - - component: {fileID: 1334164783} + - component: {fileID: 1334164788} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -877,20 +1258,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1334164783 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1334164782} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ca30badc3005aaa4ba9f9742c2f24e7a, type: 3} - m_Name: - m_EditorClassIdentifier: - _splash: {fileID: 0} - _warning: {fileID: 0} --- !u!114 &1334164784 MonoBehaviour: m_ObjectHideFlags: 0 @@ -973,7 +1340,24 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &1590214828 +--- !u!114 &1334164788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1334164782} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 034a857c40cde1242bdfdbdaf8258957, type: 3} + m_Name: + m_EditorClassIdentifier: + _icon: {fileID: 89059427} + _PriseIcon: {fileID: 21300000, guid: a396a150acbda85488f51a221cd97aa5, type: 3} + _topText: {fileID: 926923761} + _background: {fileID: 261133834} + _counter: {fileID: 1403986941} +--- !u!1 &1403986938 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -981,64 +1365,199 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1590214829} - - component: {fileID: 1590214832} - - component: {fileID: 1590214831} - - component: {fileID: 1590214830} + - component: {fileID: 1403986939} + - component: {fileID: 1403986942} + - component: {fileID: 1403986941} + - component: {fileID: 1403986940} m_Layer: 5 - m_Name: Image + m_Name: CounterText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1590214829 +--- !u!224 &1403986939 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1590214828} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1403986938} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 795675613} - m_RootOrder: 2 + m_Father: {fileID: 726602615} + 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: 280, y: 252} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 1, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1590214830 +--- !u!114 &1403986940 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1590214828} + m_GameObject: {fileID: 1403986938} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &1590214831 + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &1403986941 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1590214828} + m_GameObject: {fileID: 1403986938} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: '0/10 + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 4a8bdc23e21468d4080d35faaec8d41c, type: 2} + m_sharedMaterial: {fileID: -5998402004293396020, guid: 4a8bdc23e21468d4080d35faaec8d41c, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1403986942 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1403986938} + m_CullTransparentMesh: 1 +--- !u!1 &1486020966 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1486020967} + - component: {fileID: 1486020969} + - component: {fileID: 1486020968} + - component: {fileID: 1486020970} + m_Layer: 5 + m_Name: TopPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1486020967 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1486020966} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 881330666} + - {fileID: 261133833} + m_Father: {fileID: 795675613} + 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 96} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1486020968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1486020966} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1052,8 +1571,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7db8af1a79dfcf34daed35078d0131bf, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9cd8eb77b691c9643b2d9722f4d38fc3, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1061,15 +1580,28 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1590214832 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &1486020969 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1590214828} + m_GameObject: {fileID: 1486020966} m_CullTransparentMesh: 1 +--- !u!114 &1486020970 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1486020966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 --- !u!1 &1595177034 GameObject: m_ObjectHideFlags: 0 @@ -1163,7 +1695,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &1595177037 MonoBehaviour: @@ -1185,7 +1717,7 @@ MonoBehaviour: m_ShadowLayerMask: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} ---- !u!1 &1618715681 +--- !u!1 &1615717929 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1193,152 +1725,73 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1618715682} - - component: {fileID: 1618715685} - - component: {fileID: 1618715684} - - component: {fileID: 1618715683} + - component: {fileID: 1615717930} + - component: {fileID: 1615717932} + - component: {fileID: 1615717931} m_Layer: 5 - m_Name: H2Text + m_Name: Arrow m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1618715682 +--- !u!224 &1615717930 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1618715681} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1615717929} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 795675613} - m_RootOrder: 3 + m_Father: {fileID: 537435585} + 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: 164.5, y: -553.335} - m_SizeDelta: {x: 329, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1618715683 +--- !u!114 &1615717931 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1618715681} + m_GameObject: {fileID: 1615717929} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!114 &1618715684 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1618715681} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u0410\u0447\u0438\u0432\u043A\u0438 \u0441\u043F\u0440\u044F\u0442\u0430\u043D\u044B - \u0432 \u0440\u0430\u0437\u043D\u044B\u0445 \u043C\u0435\u0441\u0442\u0430\u0445 - \u043E\u0444\u0438\u0441\u043E\u0432, \u0433\u0434\u0435 \u043B\u044E\u0431\u044F\u0442 - \u043E\u0442\u0434\u043E\u0445\u043D\u0443\u0442\u044C \u043D\u0430\u0448\u0438 - \u043A\u043E\u043B\u043B\u0435\u0433\u0438." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 6109aefe671f7ef4aaa1dcbd5791e1e6, type: 2} - m_sharedMaterial: {fileID: 1817443946518195601, guid: 6109aefe671f7ef4aaa1dcbd5791e1e6, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 2986344448 - m_fontColor: {r: 0, g: 0, b: 0, a: 0.69803923} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1618715685 + m_Sprite: {fileID: 21300000, guid: 800529b02a01d724090468da038a08cd, 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1615717932 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1618715681} + m_GameObject: {fileID: 1615717929} m_CullTransparentMesh: 1 --- !u!1001 &1718157695 PrefabInstance: @@ -1355,17 +1808,17 @@ PrefabInstance: - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} propertyPath: m_Pivot.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} propertyPath: m_RootOrder - value: 4 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} @@ -1385,7 +1838,7 @@ PrefabInstance: - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} propertyPath: m_SizeDelta.x - value: 300 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} @@ -1462,6 +1915,11 @@ PrefabInstance: propertyPath: m_Name value: Button objectReference: {fileID: 0} + - target: {fileID: 5197310303783711596, guid: d09763cc04526ee478a95d5e0e0d9ae4, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8240985729626531650, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} propertyPath: m_TargetGraphic @@ -1470,7 +1928,7 @@ PrefabInstance: - target: {fileID: 8240985729626531650, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8240985729626531650, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} @@ -1522,161 +1980,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1879331059 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1879331060} - - component: {fileID: 1879331063} - - component: {fileID: 1879331062} - - component: {fileID: 1879331061} - m_Layer: 5 - m_Name: H2Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1879331060 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1879331059} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 795675613} - 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: 164.5, y: -150.45} - m_SizeDelta: {x: 329, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1879331061 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1879331059} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!114 &1879331062 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1879331059} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u043F\u0435\u0440\u0432\u044B\u0435 50 \u0443\u0447\u0430\u0441\u0442\u043D\u0438\u043A\u043E\u0432 - \u043F\u043E\u043B\u0443\u0447\u0430\u0442 \u0431\u0438\u043B\u0435\u0442\u044B - \u043D\u0430 \u043A\u0440\u0443\u0442\u044B\u0435 \u0444\u0435\u0441\u0442\u0438\u0432\u0430\u043B\u0438, - \u0430 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0435 200 \u0447\u0435\u043B\u043E\u0432\u0435\u043A - - \u043A\u043B\u0430\u0441\u0441\u043D\u044B\u0439 \u043C\u0435\u0440\u0447." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 6109aefe671f7ef4aaa1dcbd5791e1e6, type: 2} - m_sharedMaterial: {fileID: 1817443946518195601, guid: 6109aefe671f7ef4aaa1dcbd5791e1e6, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 2986344448 - m_fontColor: {r: 0, g: 0, b: 0, a: 0.69803923} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1879331063 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1879331059} - m_CullTransparentMesh: 1 --- !u!1 &1987188584 GameObject: m_ObjectHideFlags: 0 @@ -1740,8 +2043,105 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2033363078 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2033363079} + - component: {fileID: 2033363082} + - component: {fileID: 2033363081} + - component: {fileID: 2033363080} + m_Layer: 5 + m_Name: Div + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2033363079 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2033363078} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 881330666} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &2033363080 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2033363078} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &2033363081 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2033363078} + 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.92941177, g: 0.92941177, b: 0.92941177, a: 1} + m_RaycastTarget: 0 + 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 &2033363082 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2033363078} + m_CullTransparentMesh: 1 --- !u!1 &2097436434 GameObject: m_ObjectHideFlags: 0 @@ -1803,5 +2203,85 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2132239656 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2132239657} + - component: {fileID: 2132239659} + - component: {fileID: 2132239658} + m_Layer: 5 + m_Name: TopContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2132239657 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132239656} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 89059426} + - {fileID: 926923759} + m_Father: {fileID: 881330666} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2132239658 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132239656} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &2132239659 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132239656} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 8 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 863dffa..ac91cb9 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -1379,7 +1379,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 1, y: 0} - m_SizeDelta: {x: 0, y: 48} + m_SizeDelta: {x: 287.3, y: 48} m_Pivot: {x: 0, y: 0.5} --- !u!114 &478207540 MonoBehaviour: @@ -1456,10 +1456,10 @@ RectTransform: m_Father: {fileID: 1103782727} 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: 181, y: 0} - m_SizeDelta: {x: 362, y: 48} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 164.5, y: -372.44} + m_SizeDelta: {x: 329, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &486445998 MonoBehaviour: @@ -1977,10 +1977,10 @@ RectTransform: m_Father: {fileID: 1580615350} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 164.5, y: -553.335} - m_SizeDelta: {x: 329, y: 37.51} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 329, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &661195100 MonoBehaviour: @@ -2145,10 +2145,10 @@ RectTransform: m_Father: {fileID: 1103782727} 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: 181, y: 0} - m_SizeDelta: {x: 362, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 164.5, y: -272.44} + m_SizeDelta: {x: 329, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &694874761 MonoBehaviour: @@ -2210,7 +2210,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &768891368 RectTransform: m_ObjectHideFlags: 0 @@ -2426,10 +2426,10 @@ RectTransform: m_Father: {fileID: 478207539} 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: 159.65, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 159.65, y: -24} + m_SizeDelta: {x: 231.3, y: 32.82} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &824014269 MonoBehaviour: @@ -2625,7 +2625,7 @@ PrefabInstance: - target: {fileID: 4074150049153538249, guid: 26437d23774c4554696005f30156d508, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4074150049153538249, guid: 26437d23774c4554696005f30156d508, type: 3} @@ -2635,12 +2635,12 @@ PrefabInstance: - target: {fileID: 4074150049153538249, guid: 26437d23774c4554696005f30156d508, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4074150049153538249, guid: 26437d23774c4554696005f30156d508, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 329 objectReference: {fileID: 0} - target: {fileID: 4074150049153538249, guid: 26437d23774c4554696005f30156d508, type: 3} @@ -2685,12 +2685,12 @@ PrefabInstance: - target: {fileID: 4074150049153538249, guid: 26437d23774c4554696005f30156d508, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 164.5 objectReference: {fileID: 0} - target: {fileID: 4074150049153538249, guid: 26437d23774c4554696005f30156d508, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -32 objectReference: {fileID: 0} - target: {fileID: 4074150049153538249, guid: 26437d23774c4554696005f30156d508, type: 3} @@ -2861,12 +2861,12 @@ PrefabInstance: - target: {fileID: 9203981373416093932, guid: 26437d23774c4554696005f30156d508, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 62.52 objectReference: {fileID: 0} - target: {fileID: 9203981373416093932, guid: 26437d23774c4554696005f30156d508, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 16.41 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 26437d23774c4554696005f30156d508, type: 3} @@ -3578,10 +3578,10 @@ RectTransform: m_Father: {fileID: 1103782727} 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: 181, y: 0} - m_SizeDelta: {x: 362, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 164.5, y: -109.44} + m_SizeDelta: {x: 329, y: 124} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1090266334 MonoBehaviour: @@ -3828,7 +3828,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -64, y: 0} + m_SizeDelta: {x: -64, y: -455.56} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1103782728 MonoBehaviour: @@ -3904,9 +3904,9 @@ RectTransform: m_Father: {fileID: 1580615350} 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: 164.5, y: -356.58002} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 280, y: 252} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1109074732 @@ -4037,7 +4037,7 @@ PrefabInstance: - target: {fileID: 4699163184515956614, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4699163184515956614, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} @@ -4047,12 +4047,12 @@ PrefabInstance: - target: {fileID: 4699163184515956614, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4699163184515956614, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 329 objectReference: {fileID: 0} - target: {fileID: 4699163184515956614, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} @@ -4097,12 +4097,12 @@ PrefabInstance: - target: {fileID: 4699163184515956614, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 164.5 objectReference: {fileID: 0} - target: {fileID: 4699163184515956614, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -80 objectReference: {fileID: 0} - target: {fileID: 4699163184515956614, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} @@ -4127,12 +4127,12 @@ PrefabInstance: - target: {fileID: 9139180770919036643, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 80.24 objectReference: {fileID: 0} - target: {fileID: 9139180770919036643, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 18.76 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} @@ -4478,7 +4478,7 @@ PrefabInstance: - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} @@ -4488,12 +4488,12 @@ PrefabInstance: - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 329 objectReference: {fileID: 0} - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} @@ -4538,12 +4538,12 @@ PrefabInstance: - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 164.5 objectReference: {fileID: 0} - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -102 objectReference: {fileID: 0} - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} @@ -4664,10 +4664,10 @@ RectTransform: m_Father: {fileID: 1861854231} 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: 85.380005, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 85.380005, y: -22} + m_SizeDelta: {x: 106.76, y: 18.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1344348387 MonoBehaviour: @@ -5014,7 +5014,7 @@ PrefabInstance: - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} @@ -5024,7 +5024,7 @@ PrefabInstance: - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} @@ -5074,12 +5074,12 @@ PrefabInstance: - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} propertyPath: m_AnchoredPosition.x - value: 164.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} propertyPath: m_AnchoredPosition.y - value: -646.09 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1535856271733750747, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} @@ -5125,7 +5125,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 1626926758} + objectReference: {fileID: 1032801807} - target: {fileID: 8240985729626531650, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState @@ -5134,12 +5134,12 @@ PrefabInstance: - target: {fileID: 8240985729626531650, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: ShowNextMenu + value: LoadingNextLevel objectReference: {fileID: 0} - target: {fileID: 8240985729626531650, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: UIMenu, Assembly-CSharp + value: MainMenu, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 8240985729626531650, guid: d09763cc04526ee478a95d5e0e0d9ae4, type: 3} @@ -5200,10 +5200,10 @@ RectTransform: m_Father: {fileID: 1580615350} 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: 164.5, y: -150.45} - m_SizeDelta: {x: 329, y: 56.26} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 329, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1520870243 MonoBehaviour: @@ -5362,7 +5362,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -64, y: -183.90997} + m_SizeDelta: {x: -64, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1580615351 MonoBehaviour: @@ -5423,7 +5423,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1626926757 RectTransform: m_ObjectHideFlags: 0 @@ -5694,10 +5694,10 @@ RectTransform: m_Father: {fileID: 1103782727} 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: 181, y: 0} - m_SizeDelta: {x: 362, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 164.5, y: -11.72} + m_SizeDelta: {x: 329, y: 23.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1647358468 MonoBehaviour: @@ -5844,9 +5844,9 @@ RectTransform: m_Father: {fileID: 478207539} 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: 24, y: -24} m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1731745203 @@ -6017,9 +6017,9 @@ RectTransform: m_Father: {fileID: 1861854231} 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: 12, y: -22} m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1828184937 @@ -6093,10 +6093,10 @@ RectTransform: m_Father: {fileID: 1103782727} 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: 0, y: 1} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 164.5, y: -195.94} + m_SizeDelta: {x: 329, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1834168856 MonoBehaviour: @@ -6416,7 +6416,7 @@ RectTransform: 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_SizeDelta: {x: -254.23999, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1861854232 MonoBehaviour: @@ -6946,10 +6946,10 @@ RectTransform: m_Father: {fileID: 1580615350} 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: 164.5, y: -35.16} - m_SizeDelta: {x: 329, y: 70.32} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 329, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2063036789 MonoBehaviour: @@ -7816,7 +7816,7 @@ PrefabInstance: - target: {fileID: 4699163184515956614, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4699163184515956614, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} @@ -7826,12 +7826,12 @@ PrefabInstance: - target: {fileID: 4699163184515956614, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4699163184515956614, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 329 objectReference: {fileID: 0} - target: {fileID: 4699163184515956614, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} @@ -7876,12 +7876,12 @@ PrefabInstance: - target: {fileID: 4699163184515956614, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 164.5 objectReference: {fileID: 0} - target: {fileID: 4699163184515956614, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -24 objectReference: {fileID: 0} - target: {fileID: 4699163184515956614, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} @@ -7906,12 +7906,12 @@ PrefabInstance: - target: {fileID: 9139180770919036643, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 160.11 objectReference: {fileID: 0} - target: {fileID: 9139180770919036643, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 18.76 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 42a7e4c9f75066f46a25dd7951ad2684, type: 3} diff --git a/Assets/Scripts/Core/MainMenu/MainMenu.cs b/Assets/Scripts/Core/MainMenu/MainMenu.cs index 580dfaf..b7fbfd5 100644 --- a/Assets/Scripts/Core/MainMenu/MainMenu.cs +++ b/Assets/Scripts/Core/MainMenu/MainMenu.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using Cysharp.Threading.Tasks; +using Zenject; using UnityEngine; using DG.Tweening; @@ -9,6 +10,8 @@ public class MainMenu : MonoBehaviour [SerializeField] CanvasGroup _splash; [SerializeField] UIMenu _warning; + [Inject] private readonly SceneLoadingService _sceneLoadingService; + private IEnumerator Start() { _splash.gameObject.SetActive(true); @@ -25,4 +28,9 @@ public class MainMenu : MonoBehaviour .SetEase(Ease.Linear) .OnComplete(() => _splash.gameObject.SetActive(false)); } + + public async void LoadingNextLevel() + { + await _sceneLoadingService.LoadSceneAsync(1); + } } diff --git a/Assets/Scripts/UI/ARTopBar.cs b/Assets/Scripts/UI/ARTopBar.cs new file mode 100644 index 0000000..f379c18 --- /dev/null +++ b/Assets/Scripts/UI/ARTopBar.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; + +using TMPro; +using Zenject; +using UnityEngine; +using UnityEngine.UI; + +public class ARTopBar : MonoBehaviour +{ + [SerializeField] private Image _icon; + [SerializeField] private Sprite _PriseIcon; + [Space] + [SerializeField] private TMP_Text _topText; + [Space] + [SerializeField] private Image _background; + [Space] + [SerializeField] private TMP_Text _counter; + + [Inject] private readonly ClientDataService _clientDataService; + + private void Start() + { + _topText.text = _clientDataService + .citiesTranslation[_clientDataService.data.city]; + + _counter.text = $"{_clientDataService.data.games.Count.ToString()}/10"; + } +} diff --git a/Assets/Scripts/UI/ARTopBar.cs.meta b/Assets/Scripts/UI/ARTopBar.cs.meta new file mode 100644 index 0000000..36bf464 --- /dev/null +++ b/Assets/Scripts/UI/ARTopBar.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 034a857c40cde1242bdfdbdaf8258957 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/XRGeneralSettingsPerBuildTarget.asset b/Assets/XR/XRGeneralSettingsPerBuildTarget.asset index 3655d0e..111bf2c 100644 --- a/Assets/XR/XRGeneralSettingsPerBuildTarget.asset +++ b/Assets/XR/XRGeneralSettingsPerBuildTarget.asset @@ -77,8 +77,7 @@ MonoBehaviour: m_RequiresSettingsUpdate: 0 m_AutomaticLoading: 0 m_AutomaticRunning: 0 - m_Loaders: - - {fileID: 11400000, guid: ee2c418dc9f8ff34c801113e6944d930, type: 2} + m_Loaders: [] --- !u!114 &719864783367365274 MonoBehaviour: m_ObjectHideFlags: 0 @@ -108,7 +107,8 @@ MonoBehaviour: m_RequiresSettingsUpdate: 0 m_AutomaticLoading: 0 m_AutomaticRunning: 0 - m_Loaders: [] + m_Loaders: + - {fileID: 11400000, guid: 31a4764f61c5ff14f891988fb1dec4e4, type: 2} --- !u!114 &1821513691786657311 MonoBehaviour: m_ObjectHideFlags: 0 @@ -124,7 +124,8 @@ MonoBehaviour: m_RequiresSettingsUpdate: 0 m_AutomaticLoading: 0 m_AutomaticRunning: 0 - m_Loaders: [] + m_Loaders: + - {fileID: 11400000, guid: 9b5979a0477e4d746a273454a5e68d97, type: 2} --- !u!114 &4173450204114613297 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index 9c204fe..c32c7c7 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -15,6 +15,8 @@ "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.5", "com.unity.ugui": "1.0.0", "com.unity.vectorgraphics": "2.0.0-preview.21", + "com.unity.xr.arcore": "4.2.8", + "com.unity.xr.arkit": "4.2.8", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 928a2f3..5a16c1e 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -24,7 +24,7 @@ }, "com.unity.editorcoroutines": { "version": "1.0.0", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" @@ -146,7 +146,7 @@ }, "com.unity.subsystemregistration": { "version": "1.1.0", - "depth": 3, + "depth": 2, "source": "registry", "dependencies": { "com.unity.modules.subsystems": "1.0.0" @@ -240,11 +240,11 @@ "url": "https://packages.unity.com" }, "com.unity.xr.arcore": { - "version": "4.2.7", - "depth": 1, + "version": "4.2.8", + "depth": 0, "source": "registry", "dependencies": { - "com.unity.xr.arsubsystems": "4.2.7", + "com.unity.xr.arsubsystems": "4.2.8", "com.unity.xr.management": "4.0.1", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0" @@ -263,12 +263,12 @@ "url": "https://packages.unity.com" }, "com.unity.xr.arkit": { - "version": "4.2.7", - "depth": 1, + "version": "4.2.8", + "depth": 0, "source": "registry", "dependencies": { "com.unity.editorcoroutines": "1.0.0", - "com.unity.xr.arsubsystems": "4.2.7", + "com.unity.xr.arsubsystems": "4.2.8", "com.unity.xr.management": "4.0.1" }, "url": "https://packages.unity.com" @@ -284,8 +284,8 @@ "url": "https://packages.unity.com" }, "com.unity.xr.arsubsystems": { - "version": "4.2.7", - "depth": 2, + "version": "4.2.8", + "depth": 1, "source": "registry", "dependencies": { "com.unity.subsystemregistration": "1.1.0", @@ -329,7 +329,7 @@ }, "com.unity.xr.management": { "version": "4.3.3", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.modules.subsystems": "1.0.0", diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 9c1b764..546ef07 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,6 +8,9 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/MainMenu.unity guid: 99c9720ab356a0642a771bea13969a05 + - enabled: 1 + path: Assets/Scenes/GameScene.unity + guid: ff4689c691985ec478be611aacd0a9bb m_configObjects: UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: 9659f2d0f10835541847bc634804cb31, type: 2} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 5919450..1ff6278 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany - productName: YandexTeamGame + companyName: GRAFF Interactive + productName: Yandex Quest defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -135,7 +135,11 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 0.1.0 - preloadedAssets: [] + preloadedAssets: + - {fileID: 719864783367365274, guid: 6c12ec9668af8e148aa84befe0615795, type: 2} + - {fileID: 11400000, guid: 1872bb7729e197046b75ede8e3e31595, type: 2} + - {fileID: 4262027135244520319, guid: 098345cc6294c5645a2ca97e1b7cb887, type: 2} + - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -155,7 +159,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.UnityTechnologies.com.unity.template.urpblank + Android: com.graffinteractive.yandexquest Standalone: com.UnityTechnologies.com.unity.template.urp-blank iPhone: com.Unity-Technologies.com.unity.template.urp-blank buildNumber: @@ -164,7 +168,7 @@ PlayerSettings: tvOS: 0 overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 22 + AndroidMinSdkVersion: 24 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -247,7 +251,7 @@ PlayerSettings: useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 useCustomProguardFile: 0 - AndroidTargetArchitectures: 1 + AndroidTargetArchitectures: 3 AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -508,8 +512,8 @@ PlayerSettings: m_APIs: 10000000 m_Automatic: 1 - m_BuildTarget: AndroidPlayer - m_APIs: 150000000b000000 - m_Automatic: 1 + m_APIs: 0b000000 + m_Automatic: 0 - m_BuildTarget: WebGLSupport m_APIs: 0b000000 m_Automatic: 0 @@ -788,8 +792,10 @@ PlayerSettings: scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} - scriptingBackend: {} - il2cppCompilerConfiguration: {} + scriptingBackend: + Android: 1 + il2cppCompilerConfiguration: + Android: 0 managedStrippingLevel: EmbeddedLinux: 1 GameCoreScarlett: 1 @@ -886,7 +892,7 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: - apiCompatibilityLevel: 6 + apiCompatibilityLevel: 3 activeInputHandler: 2 windowsGamepadBackendHint: 0 cloudProjectId: diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 7ff312e..0d186f9 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -63,7 +63,7 @@ QualitySettings: softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 - vSyncCount: 1 + vSyncCount: 0 lodBias: 1 maximumLODLevel: 0 streamingMipmapsActive: 0