diff --git a/Assets/Scenes/GameScene 2.unity b/Assets/Scenes/GameScene 2.unity index 96512bc..f33769f 100644 --- a/Assets/Scenes/GameScene 2.unity +++ b/Assets/Scenes/GameScene 2.unity @@ -1450,6 +1450,78 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1290746544 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1290746545} + - component: {fileID: 1290746547} + - component: {fileID: 1290746546} + 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 &1290746545 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1290746544} + 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: 1548347420} + 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 &1290746546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1290746544} + 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 &1290746547 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1290746544} + m_CullTransparentMesh: 1 --- !u!1 &1300843542 GameObject: m_ObjectHideFlags: 0 @@ -3040,6 +3112,354 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1482635901 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1482635902} + - component: {fileID: 1482635904} + - component: {fileID: 1482635903} + m_Layer: 5 + m_Name: control + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1482635902 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1482635901} + 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: 1548347420} + 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 &1482635903 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1482635901} + 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 &1482635904 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1482635901} + m_CullTransparentMesh: 1 +--- !u!1001 &1548347418 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + 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: + objectReference: {fileID: 0} + - target: {fileID: 2404937059918327841, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2458716502903188221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: rope + value: + objectReference: {fileID: 0} + - target: {fileID: 2458716502903188221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: player1 + value: + objectReference: {fileID: 0} + - target: {fileID: 2458716502903188221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: player2 + value: + objectReference: {fileID: 0} + - target: {fileID: 2458716502903188221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: bloodManager + value: + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + 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 (1) + 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: + - {fileID: 290886138581533559, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1892266833} + - targetCorrespondingSourceObject: {fileID: 9075173710402410956, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1609896464} + - targetCorrespondingSourceObject: {fileID: 9075173710402410956, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1290746545} + - targetCorrespondingSourceObject: {fileID: 9075173710402410956, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + insertIndex: -1 + addedObject: {fileID: 2038361122} + - targetCorrespondingSourceObject: {fileID: 9075173710402410956, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1482635902} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7301411897347746173, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1548347422} + m_SourcePrefab: {fileID: 100100000, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} +--- !u!1 &1548347419 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7301411897347746173, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + m_PrefabInstance: {fileID: 1548347418} + m_PrefabAsset: {fileID: 0} +--- !u!224 &1548347420 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9075173710402410956, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + m_PrefabInstance: {fileID: 1548347418} + m_PrefabAsset: {fileID: 0} +--- !u!224 &1548347421 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + m_PrefabInstance: {fileID: 1548347418} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1548347422 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1548347419} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3c20bad5f6ef76d429d398dfba893d40, type: 3} + m_Name: + m_EditorClassIdentifier: + pauseMenuUI: {fileID: 0} --- !u!1 &1566837117 stripped GameObject: m_CorrespondingSourceObject: {fileID: 809911508645467208, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} @@ -3133,6 +3553,78 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1609896463 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1609896464} + - component: {fileID: 1609896466} + - component: {fileID: 1609896465} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1609896464 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609896463} + 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: 1548347420} + 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 &1609896465 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609896463} + 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 &1609896466 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609896463} + m_CullTransparentMesh: 1 --- !u!1 &1776708107 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} @@ -3150,6 +3642,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} m_Name: m_EditorClassIdentifier: + rng: 1000 projectile: {fileID: 4224894887191976968, guid: 804480739064e874fa6551dc5b8c6d65, type: 3} Patterns: - sequence: @@ -3219,6 +3712,82 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1892266832 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1892266833} + - component: {fileID: 1892266835} + - component: {fileID: 1892266834} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1892266833 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1892266832} + 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: 2119718751} + m_Father: {fileID: 1548347421} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -75, y: 75} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1892266834 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1892266832} + 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: 21300000, guid: 670f29475a3b18ea9aea72417564111c, 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 &1892266835 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1892266832} + m_CullTransparentMesh: 1 --- !u!114 &1920006248 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7717684785049474632, guid: 0248db69242a3dd47898c6742b6c9f60, type: 3} @@ -3291,6 +3860,212 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 1776708108} m_SourcePrefab: {fileID: 100100000, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} +--- !u!1 &2038361121 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2038361122} + - component: {fileID: 2038361124} + - component: {fileID: 2038361123} + 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 &2038361122 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2038361121} + 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: 1548347420} + 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 &2038361123 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2038361121} + 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 &2038361124 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2038361121} + m_CullTransparentMesh: 1 +--- !u!1 &2119718750 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2119718751} + - component: {fileID: 2119718753} + - component: {fileID: 2119718752} + 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 &2119718751 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2119718750} + 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: 1892266833} + 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: -210, y: -10} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2119718752 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2119718750} + 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: 1x + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3849a5afa3e47364e935260b9e40a7af, type: 2} + m_sharedMaterial: {fileID: -9074696149777367781, guid: 3849a5afa3e47364e935260b9e40a7af, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4286500607 + m_fontColor: {r: 1, g: 0.8092908, b: 0.495283, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + 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 &2119718753 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2119718750} + m_CullTransparentMesh: 1 --- !u!1001 &1683288374126251321 PrefabInstance: m_ObjectHideFlags: 0 @@ -3369,7 +4144,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2404937059918327841, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2458716502903188221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} propertyPath: rope @@ -3503,6 +4278,10 @@ PrefabInstance: propertyPath: m_Name value: UI objectReference: {fileID: 0} + - target: {fileID: 7301411897347746173, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3829,6 +4608,7 @@ SceneRoots: m_Roots: - {fileID: 1683288374126251321} - {fileID: 4158834148864819266} + - {fileID: 1548347418} - {fileID: 1600052934} - {fileID: 480860136} - {fileID: 150061137} diff --git a/Assets/Scripts/UI/PauseMenu.cs b/Assets/Scripts/UI/PauseMenu.cs index 35279ae..0e95883 100644 --- a/Assets/Scripts/UI/PauseMenu.cs +++ b/Assets/Scripts/UI/PauseMenu.cs @@ -26,7 +26,7 @@ public class PauseMenu : MonoBehaviour foreach (var controller in Gamepad.all) { - if (controller.startButton.IsPressed()) + if (controller.startButton.wasReleasedThisFrame) { if (isPaused) {