diff --git a/Assets/MenuButtons22.png b/Assets/MenuButtons22.png new file mode 100644 index 0000000..020e574 Binary files /dev/null and b/Assets/MenuButtons22.png differ diff --git a/Assets/MenuButtons22.png.meta b/Assets/MenuButtons22.png.meta new file mode 100644 index 0000000..edf06df --- /dev/null +++ b/Assets/MenuButtons22.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 52d8967cfe80bba41a2ec6c89c6fab83 +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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 1 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MenuButtons23.png b/Assets/MenuButtons23.png new file mode 100644 index 0000000..6d99e36 Binary files /dev/null and b/Assets/MenuButtons23.png differ diff --git a/Assets/MenuButtons23.png.meta b/Assets/MenuButtons23.png.meta new file mode 100644 index 0000000..7032d0f --- /dev/null +++ b/Assets/MenuButtons23.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 747ebca3fd3d26c4785fc84cd2018b20 +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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 1 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index e8c9061..a6cda5c 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -529,6 +529,78 @@ Transform: m_CorrespondingSourceObject: {fileID: 3862814901187971034, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3} m_PrefabInstance: {fileID: 7693964683212020007} m_PrefabAsset: {fileID: 0} +--- !u!1 &686957953 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 686957954} + - component: {fileID: 686957956} + - component: {fileID: 686957955} + m_Layer: 5 + m_Name: RawImage (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &686957954 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 686957953} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2.152065, y: 1.3535, z: 1.3535} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4158834148864819270} + 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: -1627, y: -468.35712} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &686957955 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 686957953} + 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: 882b5d96dbdfe494a924ac698f98de83, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &686957956 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 686957953} + m_CullTransparentMesh: 1 --- !u!1 &690229187 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6306269600238927148, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} @@ -1241,6 +1313,78 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1191982062 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1191982063} + - component: {fileID: 1191982065} + - component: {fileID: 1191982064} + m_Layer: 5 + m_Name: RawImage (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1191982063 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1191982062} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2.152065, y: 1.3535, z: 1.3535} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4158834148864819270} + 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: -1627, y: -166.92854} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1191982064 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1191982062} + 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: 51dfe6d21bc5bc44482149df2da2db87, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1191982065 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1191982062} + m_CullTransparentMesh: 1 --- !u!4 &1194834060 stripped Transform: m_CorrespondingSourceObject: {fileID: 320690117028550720, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3} @@ -1765,6 +1909,78 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1316445579 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1316445580} + - component: {fileID: 1316445582} + - component: {fileID: 1316445581} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1316445580 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1316445579} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2.152065, y: 1.3535, z: 1.3535} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4158834148864819270} + 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: -1627, y: 122} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1316445581 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1316445579} + 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: 46b23f60177b6b04e982100e6e017ae7, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1316445582 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1316445579} + m_CullTransparentMesh: 1 --- !u!1 &1323038737 GameObject: m_ObjectHideFlags: 0 @@ -3459,6 +3675,78 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1665783432 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1665783433} + - component: {fileID: 1665783435} + - component: {fileID: 1665783434} + m_Layer: 5 + m_Name: control + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1665783433 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665783432} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 19.362, y: 12.908, z: 12.908} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4158834148864819270} + 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: 919, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1665783434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665783432} + 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: 9174d5bfdc601b840b6ab423797493f9, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1665783435 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665783432} + m_CullTransparentMesh: 1 --- !u!1 &1678451168 GameObject: m_ObjectHideFlags: 0 @@ -8597,6 +8885,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1004442600466089558, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_SizeDelta.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 1004442600466089558, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchoredPosition.x + value: -836 + objectReference: {fileID: 0} + - target: {fileID: 1004442600466089558, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchoredPosition.y + value: -443.99994 + objectReference: {fileID: 0} - target: {fileID: 1656765803503857110, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} propertyPath: spawner value: @@ -8701,20 +9001,125 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3848344698517685701, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_SizeDelta.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 3848344698517685701, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchoredPosition.x + value: -836 + objectReference: {fileID: 0} + - target: {fileID: 3848344698517685701, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchoredPosition.y + value: -142.99995 + objectReference: {fileID: 0} + - target: {fileID: 4451940383313008829, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_text + value: Paused + objectReference: {fileID: 0} + - target: {fileID: 4451940383313008829, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_fontColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4451940383313008829, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_fontColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4451940383313008829, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_fontColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4451940383313008829, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_fontColor32.rgba + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: 4609517810214424478, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4609517810214424478, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 52d8967cfe80bba41a2ec6c89c6fab83, type: 3} - target: {fileID: 6216580377014392011, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6502340811104000939, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6502340811104000939, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 747ebca3fd3d26c4785fc84cd2018b20, type: 3} + - target: {fileID: 7109762240877846038, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_Color.a + value: 0.8156863 + objectReference: {fileID: 0} + - target: {fileID: 7109762240877846038, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7109762240877846038, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7109762240877846038, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7301411897347746173, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} propertyPath: m_Name value: UI objectReference: {fileID: 0} + - target: {fileID: 7739002011938232279, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8215571626167240061, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8215571626167240061, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1e19ba71caaa7be40aadcf0cea25a648, type: 3} + - target: {fileID: 8962936137921153219, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9048380344637021873, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_SizeDelta.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 9048380344637021873, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchoredPosition.x + value: -836 + objectReference: {fileID: 0} + - target: {fileID: 9048380344637021873, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 156.00005 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 290886138581533559, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} insertIndex: -1 addedObject: {fileID: 1375820097} + - targetCorrespondingSourceObject: {fileID: 9075173710402410956, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1316445580} + - targetCorrespondingSourceObject: {fileID: 9075173710402410956, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1191982063} + - targetCorrespondingSourceObject: {fileID: 9075173710402410956, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + insertIndex: -1 + addedObject: {fileID: 686957954} + - targetCorrespondingSourceObject: {fileID: 9075173710402410956, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1665783433} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 7301411897347746173, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} insertIndex: -1 @@ -8743,6 +9148,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: pauseMenuUI: {fileID: 0} +--- !u!224 &4158834148864819270 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9075173710402410956, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + m_PrefabInstance: {fileID: 4158834148864819266} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4910321061857220295 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 53c38df..f6bc7b3 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -992,7 +992,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 514680250} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1416,7 +1416,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1255186101} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1641,9 +1641,9 @@ RectTransform: - {fileID: 87785589} - {fileID: 496720121} - {fileID: 1686695107} - - {fileID: 307201468} - {fileID: 1255186102} - {fileID: 514680251} + - {fileID: 307201468} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} diff --git a/Assets/Scripts/UI/PauseMenu.cs b/Assets/Scripts/UI/PauseMenu.cs index 2330a5e..35279ae 100644 --- a/Assets/Scripts/UI/PauseMenu.cs +++ b/Assets/Scripts/UI/PauseMenu.cs @@ -21,9 +21,36 @@ public class PauseMenu : MonoBehaviour void Update() { //for (int i = 0; i < Gamepad.all.Count; i++) - // if(Gamepad.all[i].selectButton) + // if(Gamepad.all[i].selectButton) + foreach (var controller in Gamepad.all) + { + if (controller.startButton.IsPressed()) + { + if (isPaused) + { + ResumeGame(); + } + else + { + PauseGame(); + } + } + if (controller.crossButton.IsPressed()) + { + ResumeGame(); + } + if (controller.circleButton.IsPressed()) + { + QuitGame(); + } + if (controller.squareButton.IsPressed()) + { + MainMenu(); + } + } + // Check if the Escape key is pressed if (Input.GetKeyDown(KeyCode.Escape)) {