From 8ba0ccbf73c34fb3f1cd87f8734b21745fb11e23 Mon Sep 17 00:00:00 2001 From: Zofia Szybalska Date: Sun, 10 Apr 2022 10:17:29 +0200 Subject: [PATCH 1/5] no message --- Fishy/.vsconfig | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 Fishy/.vsconfig diff --git a/Fishy/.vsconfig b/Fishy/.vsconfig new file mode 100644 index 0000000..d70cd98 --- /dev/null +++ b/Fishy/.vsconfig @@ -0,0 +1,6 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Workload.ManagedGame" + ] +} From 4d6eca198eeac981f5c4fc0da915d3a5cc208fd4 Mon Sep 17 00:00:00 2001 From: Zofia Szybalska Date: Sun, 10 Apr 2022 12:06:50 +0200 Subject: [PATCH 2/5] Added play again button, and menu button --- Fishy/Assets/Scenes/MainScene.unity | 595 ++++++++++++++++++ .../_Scripts/PlayAgainButtonBehavior.cs | 8 + .../_Scripts/PlayAgainButtonBehavior.cs.meta | 11 + 3 files changed, 614 insertions(+) create mode 100644 Fishy/Assets/_Scripts/PlayAgainButtonBehavior.cs create mode 100644 Fishy/Assets/_Scripts/PlayAgainButtonBehavior.cs.meta diff --git a/Fishy/Assets/Scenes/MainScene.unity b/Fishy/Assets/Scenes/MainScene.unity index 4e1e101..6b0c9d8 100644 --- a/Fishy/Assets/Scenes/MainScene.unity +++ b/Fishy/Assets/Scenes/MainScene.unity @@ -123,6 +123,108 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &74065128 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 74065129} + - component: {fileID: 74065132} + - component: {fileID: 74065131} + - component: {fileID: 74065130} + m_Layer: 5 + m_Name: GameOver + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &74065129 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 74065128} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 878769810} + - {fileID: 322482527} + - {fileID: 1232023202} + m_Father: {fileID: 1761457197} + 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &74065130 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 74065128} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &74065131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 74065128} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &74065132 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 74065128} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1001 &76443844 PrefabInstance: m_ObjectHideFlags: 0 @@ -355,6 +457,127 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!1 &322482526 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 322482527} + - component: {fileID: 322482530} + - component: {fileID: 322482529} + - component: {fileID: 322482528} + m_Layer: 5 + m_Name: MenuButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &322482527 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 322482526} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 982466515} + m_Father: {fileID: 74065129} + m_RootOrder: 1 + 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: -50} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &322482528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 322482526} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.19992878, g: 0.4040417, b: 0.9056604, a: 1} + m_HighlightedColor: {r: 0.29725876, g: 0.52246124, b: 0.9433962, a: 1} + m_PressedColor: {r: 0.050980397, g: 0.22352943, b: 0.5686275, a: 1} + m_SelectedColor: {r: 0.40784317, g: 0.6901961, b: 1, a: 1} + m_DisabledColor: {r: 0.3179779, g: 0.42684996, b: 0.7264151, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 322482529} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &322482529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 322482526} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &322482530 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 322482526} + m_CullTransparentMesh: 1 --- !u!1 &356945883 GameObject: m_ObjectHideFlags: 0 @@ -930,6 +1153,140 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 595de6eecab7d8a4f98acb796dd740ea, type: 3} +--- !u!1 &878769809 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 878769810} + - component: {fileID: 878769813} + - component: {fileID: 878769812} + - component: {fileID: 878769811} + - component: {fileID: 878769814} + m_Layer: 5 + m_Name: PlayAgainButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &878769810 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 878769809} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1301750725} + m_Father: {fileID: 74065129} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &878769811 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 878769809} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.8078432, g: 0.23529413, b: 0.64705884, a: 1} + m_HighlightedColor: {r: 0.8396226, g: 0.4467426, b: 0.7875974, a: 1} + m_PressedColor: {r: 0.56078434, g: 0.1254902, b: 0.40000004, a: 1} + m_SelectedColor: {r: 0.83921576, g: 0.44705886, b: 0.78823537, a: 1} + m_DisabledColor: {r: 0.33962262, g: 0.074973285, b: 0.22294924, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 878769812} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &878769812 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 878769809} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &878769813 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 878769809} + m_CullTransparentMesh: 1 +--- !u!114 &878769814 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 878769809} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9007ac1ab7452b444bf4038572d92890, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &884759571 GameObject: m_ObjectHideFlags: 0 @@ -1017,6 +1374,85 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b393160b0888b5a498cdfeafd960118b, type: 3} +--- !u!1 &982466514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 982466515} + - component: {fileID: 982466517} + - component: {fileID: 982466516} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &982466515 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 982466514} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 322482527} + 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 &982466516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 982466514} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Menu +--- !u!222 &982466517 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 982466514} + m_CullTransparentMesh: 1 --- !u!1 &1086274065 GameObject: m_ObjectHideFlags: 0 @@ -1108,6 +1544,85 @@ Transform: m_Father: {fileID: 1676998030} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1232023201 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1232023202} + - component: {fileID: 1232023204} + - component: {fileID: 1232023203} + m_Layer: 5 + m_Name: You died + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1232023202 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232023201} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 74065129} + 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: 100} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1232023203 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232023201} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.011764707, g: 0.011764707, b: 0.011764707, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 27 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: You died +--- !u!222 &1232023204 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232023201} + m_CullTransparentMesh: 1 --- !u!1 &1256714041 GameObject: m_ObjectHideFlags: 0 @@ -1144,6 +1659,85 @@ Transform: m_CorrespondingSourceObject: {fileID: 1692906382062380208, guid: c564cc1c56bc3eb4aafe6266b00b194b, type: 3} m_PrefabInstance: {fileID: 496429642} m_PrefabAsset: {fileID: 0} +--- !u!1 &1301750724 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1301750725} + - component: {fileID: 1301750727} + - component: {fileID: 1301750726} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1301750725 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1301750724} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 878769810} + 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 &1301750726 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1301750724} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Play again +--- !u!222 &1301750727 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1301750724} + m_CullTransparentMesh: 1 --- !u!4 &1337170966 stripped Transform: m_CorrespondingSourceObject: {fileID: 8353537331258921364, guid: 303baa3f823549c49bcd5c24f3e88836, type: 3} @@ -1401,6 +1995,7 @@ Transform: - {fileID: 478165180} - {fileID: 490088751} - {fileID: 266807234} + - {fileID: 74065129} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Fishy/Assets/_Scripts/PlayAgainButtonBehavior.cs b/Fishy/Assets/_Scripts/PlayAgainButtonBehavior.cs new file mode 100644 index 0000000..b550ff8 --- /dev/null +++ b/Fishy/Assets/_Scripts/PlayAgainButtonBehavior.cs @@ -0,0 +1,8 @@ +using UnityEngine; +using UnityEngine.SceneManagement; + +public class PlayAgainButtonBehavior : MonoBehaviour +{ public void OnClick() { + SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex); + } +} diff --git a/Fishy/Assets/_Scripts/PlayAgainButtonBehavior.cs.meta b/Fishy/Assets/_Scripts/PlayAgainButtonBehavior.cs.meta new file mode 100644 index 0000000..1597cbb --- /dev/null +++ b/Fishy/Assets/_Scripts/PlayAgainButtonBehavior.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b94047f952fb3904eaf31b997460bf87 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 48694606375c90bf1bbaa54f2a8e14a06699efc2 Mon Sep 17 00:00:00 2001 From: Zofia Szybalska Date: Sun, 10 Apr 2022 13:08:51 +0200 Subject: [PATCH 3/5] GameOver menu now appers on player death --- Fishy/Assets/Scenes/MainScene.unity | 107 ++++++++++++++++------ Fishy/Assets/_Scripts/GameManager.cs | 8 ++ Fishy/Assets/_Scripts/GameManager.cs.meta | 11 +++ Fishy/Assets/_Scripts/PlayerFish.cs | 5 + Fishy/ProjectSettings/TagManager.asset | 1 + 5 files changed, 103 insertions(+), 29 deletions(-) create mode 100644 Fishy/Assets/_Scripts/GameManager.cs create mode 100644 Fishy/Assets/_Scripts/GameManager.cs.meta diff --git a/Fishy/Assets/Scenes/MainScene.unity b/Fishy/Assets/Scenes/MainScene.unity index 6b0c9d8..26cab00 100644 --- a/Fishy/Assets/Scenes/MainScene.unity +++ b/Fishy/Assets/Scenes/MainScene.unity @@ -137,11 +137,11 @@ GameObject: - component: {fileID: 74065130} m_Layer: 5 m_Name: GameOver - m_TagString: Untagged + m_TagString: GameOver m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &74065129 RectTransform: m_ObjectHideFlags: 0 @@ -156,8 +156,9 @@ RectTransform: - {fileID: 878769810} - {fileID: 322482527} - {fileID: 1232023202} + - {fileID: 1795838656} m_Father: {fileID: 1761457197} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -389,7 +390,7 @@ RectTransform: m_Children: - {fileID: 409254956} m_Father: {fileID: 1761457197} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -863,7 +864,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1761457197} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &490088752 MonoBehaviour: @@ -1052,7 +1053,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6074895262920687375, guid: 363da262e93b8664aa95a4520a7bdb98, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6074895262920687375, guid: 363da262e93b8664aa95a4520a7bdb98, type: 3} propertyPath: m_LocalPosition.x @@ -1109,7 +1110,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 27892197981432237, guid: 595de6eecab7d8a4f98acb796dd740ea, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 27892197981432237, guid: 595de6eecab7d8a4f98acb796dd740ea, type: 3} propertyPath: m_LocalPosition.x @@ -1165,7 +1166,6 @@ GameObject: - component: {fileID: 878769813} - component: {fileID: 878769812} - component: {fileID: 878769811} - - component: {fileID: 878769814} m_Layer: 5 m_Name: PlayAgainButton m_TagString: Untagged @@ -1236,7 +1236,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 878769812} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1795838657} + m_TargetAssemblyTypeName: PlayAgainButtonBehavior, Assembly-CSharp + m_MethodName: OnClick + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &878769812 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1275,18 +1287,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 878769809} m_CullTransparentMesh: 1 ---- !u!114 &878769814 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 878769809} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9007ac1ab7452b444bf4038572d92890, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &884759571 GameObject: m_ObjectHideFlags: 0 @@ -1315,7 +1315,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &959413586 PrefabInstance: @@ -1330,7 +1330,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7487762832406010030, guid: b393160b0888b5a498cdfeafd960118b, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7487762832406010030, guid: b393160b0888b5a498cdfeafd960118b, type: 3} propertyPath: m_LocalPosition.x @@ -1476,12 +1476,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1086274065} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 + m_Father: {fileID: 1761457197} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1161330028 GameObject: @@ -1652,7 +1652,7 @@ Transform: m_Children: - {fileID: 519420032} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1286746719 stripped Transform: @@ -1963,7 +1963,7 @@ Transform: - {fileID: 1602861964} - {fileID: 1462972224} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1761457196 GameObject: @@ -1993,17 +1993,66 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 478165180} + - {fileID: 1086274066} - {fileID: 490088751} - {fileID: 266807234} - {fileID: 74065129} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1778212860 stripped Transform: m_CorrespondingSourceObject: {fileID: 27892197981432237, guid: 595de6eecab7d8a4f98acb796dd740ea, type: 3} m_PrefabInstance: {fileID: 867803605} m_PrefabAsset: {fileID: 0} +--- !u!1 &1795838655 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1795838656} + - component: {fileID: 1795838657} + m_Layer: 5 + m_Name: PlayAgainButtonManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1795838656 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795838655} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 74065129} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1795838657 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795838655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b94047f952fb3904eaf31b997460bf87, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1869479404 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Fishy/Assets/_Scripts/GameManager.cs b/Fishy/Assets/_Scripts/GameManager.cs new file mode 100644 index 0000000..ef88624 --- /dev/null +++ b/Fishy/Assets/_Scripts/GameManager.cs @@ -0,0 +1,8 @@ +using UnityEngine; + +public class GameManager : MonoBehaviour { + void Start() { + } + void Update() { + } +} diff --git a/Fishy/Assets/_Scripts/GameManager.cs.meta b/Fishy/Assets/_Scripts/GameManager.cs.meta new file mode 100644 index 0000000..4c7c734 --- /dev/null +++ b/Fishy/Assets/_Scripts/GameManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9bbd0d77eff5be844b7b9507b40854d4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Fishy/Assets/_Scripts/PlayerFish.cs b/Fishy/Assets/_Scripts/PlayerFish.cs index 1c843f8..23c893e 100644 --- a/Fishy/Assets/_Scripts/PlayerFish.cs +++ b/Fishy/Assets/_Scripts/PlayerFish.cs @@ -4,14 +4,19 @@ namespace _Scripts { public class PlayerFish : FishBase { private Score _score; + private GameObject _gameOver; private void Start() { + _gameOver = GameObject.Find("GameOver"); + if (_gameOver == null) Debug.LogError("GameOver game object not found in the scene"); + _gameOver.SetActive(false); _score = GameObject.FindWithTag("Score")?.GetComponent(); if (_score == null) Debug.LogError("Score game object not found in the scene"); } public override void Die() { Debug.Log("Lose game"); + _gameOver.SetActive(true); base.Die(); } diff --git a/Fishy/ProjectSettings/TagManager.asset b/Fishy/ProjectSettings/TagManager.asset index 8eed0a6..85d0db7 100644 --- a/Fishy/ProjectSettings/TagManager.asset +++ b/Fishy/ProjectSettings/TagManager.asset @@ -8,6 +8,7 @@ TagManager: - Dynamic - Score - Portal + - GameOver layers: - Default - TransparentFX From 6a03d0570a21ef32d05cb0e23b5e2fc4d87f7a9e Mon Sep 17 00:00:00 2001 From: Zofia Szybalska Date: Sun, 10 Apr 2022 13:19:31 +0200 Subject: [PATCH 4/5] Small change --- Fishy/Assets/Scenes/MainScene.unity | 45 ++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/Fishy/Assets/Scenes/MainScene.unity b/Fishy/Assets/Scenes/MainScene.unity index 26cab00..9f1f0f1 100644 --- a/Fishy/Assets/Scenes/MainScene.unity +++ b/Fishy/Assets/Scenes/MainScene.unity @@ -141,7 +141,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &74065129 RectTransform: m_ObjectHideFlags: 0 @@ -2118,3 +2118,46 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 303baa3f823549c49bcd5c24f3e88836, type: 3} +--- !u!1 &2024764382 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2024764384} + - component: {fileID: 2024764383} + m_Layer: 0 + m_Name: GameManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2024764383 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2024764382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9bbd0d77eff5be844b7b9507b40854d4, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &2024764384 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2024764382} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} From e246213c24217168a340bb67972df0158154ac5f Mon Sep 17 00:00:00 2001 From: Zofia Szybalska Date: Sun, 10 Apr 2022 13:30:12 +0200 Subject: [PATCH 5/5] Changed color of menu button --- Fishy/Assets/Scenes/MainScene.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Fishy/Assets/Scenes/MainScene.unity b/Fishy/Assets/Scenes/MainScene.unity index 9f1f0f1..2f8e7cc 100644 --- a/Fishy/Assets/Scenes/MainScene.unity +++ b/Fishy/Assets/Scenes/MainScene.unity @@ -521,7 +521,7 @@ MonoBehaviour: m_NormalColor: {r: 0.19992878, g: 0.4040417, b: 0.9056604, a: 1} m_HighlightedColor: {r: 0.29725876, g: 0.52246124, b: 0.9433962, a: 1} m_PressedColor: {r: 0.050980397, g: 0.22352943, b: 0.5686275, a: 1} - m_SelectedColor: {r: 0.40784317, g: 0.6901961, b: 1, a: 1} + m_SelectedColor: {r: 0.29803923, g: 0.52156866, b: 0.9450981, a: 1} m_DisabledColor: {r: 0.3179779, g: 0.42684996, b: 0.7264151, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1