From cc694586a4e4fce5678092b25ffa23e01731dc2d Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 1 May 2023 16:36:09 -0700 Subject: [PATCH] fixed ui also added the general game ui canvas to all scenes --- .../Prefabs/CanvasObjects/GameUICanvas.prefab | 585 +++++++++++++++ .../CanvasObjects/GameUICanvas.prefab.meta | 7 + Assets/Scenes/ClarinetScene.unity | 123 +++- Assets/Scenes/Claude's House.unity | 509 ++++++++++++- Assets/Scenes/GrappleScene.unity | 684 +++--------------- Assets/Scenes/GrenouilleVillage.unity | 125 +++- Assets/Scripts/PlayerBehavior.cs | 9 +- Assets/Scripts/TambourineBehavior.cs | 2 +- 8 files changed, 1426 insertions(+), 618 deletions(-) create mode 100644 Assets/Prefabs/CanvasObjects/GameUICanvas.prefab create mode 100644 Assets/Prefabs/CanvasObjects/GameUICanvas.prefab.meta diff --git a/Assets/Prefabs/CanvasObjects/GameUICanvas.prefab b/Assets/Prefabs/CanvasObjects/GameUICanvas.prefab new file mode 100644 index 0000000..0cedde3 --- /dev/null +++ b/Assets/Prefabs/CanvasObjects/GameUICanvas.prefab @@ -0,0 +1,585 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &423229042262659856 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6414539852373954406} + - component: {fileID: 803171801511802832} + - component: {fileID: 528376102691567414} + m_Layer: 5 + m_Name: trumpet_UI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6414539852373954406 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 423229042262659856} + 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: 6181971475657436876} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -32.500023, y: -32.499992} + m_SizeDelta: {x: 61, y: 61} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &803171801511802832 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 423229042262659856} + m_CullTransparentMesh: 1 +--- !u!114 &528376102691567414 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 423229042262659856} + 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: 4011924a357d34dedaee4c7857f7ee9b, 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!1 &802630453492888031 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5250718604240969511} + - component: {fileID: 2675816072939855911} + - component: {fileID: 3776298905407776761} + m_Layer: 5 + m_Name: tambourine_UI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5250718604240969511 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 802630453492888031} + 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: 5229343399574233433} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -34.999992, y: -35} + m_SizeDelta: {x: 61, y: 61} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2675816072939855911 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 802630453492888031} + m_CullTransparentMesh: 1 +--- !u!114 &3776298905407776761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 802630453492888031} + 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: 9512c5061c129491aa064e971a2f0faa, 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!1 &3054742311368020042 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5229343399574233433} + - component: {fileID: 947565992045248807} + - component: {fileID: 6666701493242214924} + m_Layer: 5 + m_Name: tambourine_UI_background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5229343399574233433 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3054742311368020042} + 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: 5250718604240969511} + m_Father: {fileID: 1885684100209428912} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -140, y: -60} + m_SizeDelta: {x: 70, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &947565992045248807 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3054742311368020042} + m_CullTransparentMesh: 1 +--- !u!114 &6666701493242214924 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3054742311368020042} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 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: 9512c5061c129491aa064e971a2f0faa, 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!1 &3628016299985258405 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2498118711832120149} + - component: {fileID: 7654845054018710432} + - component: {fileID: 7023733362668210405} + m_Layer: 5 + m_Name: clarinet_UI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2498118711832120149 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3628016299985258405} + 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: 1799174769135430456} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -32.5, y: -32.499992} + m_SizeDelta: {x: 61, y: 61} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7654845054018710432 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3628016299985258405} + m_CullTransparentMesh: 1 +--- !u!114 &7023733362668210405 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3628016299985258405} + 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: bf180d5d1970a488fb0eee84b8990541, 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!1 &4891107602615669430 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1885684100209428912} + - component: {fileID: 1646712177495336925} + - component: {fileID: 4010215395841521234} + - component: {fileID: 7187918022475560076} + - component: {fileID: 4599587890505526274} + m_Layer: 5 + m_Name: GameUICanvas + m_TagString: GameUICanvas + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1885684100209428912 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4891107602615669430} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6181971475657436876} + - {fileID: 5229343399574233433} + - {fileID: 1799174769135430456} + m_Father: {fileID: 0} + m_RootOrder: 6 + 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!223 &1646712177495336925 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4891107602615669430} + 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_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &4010215395841521234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4891107602615669430} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + 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!114 &7187918022475560076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4891107602615669430} + 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 &4599587890505526274 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4891107602615669430} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ddba2a418da03482da8b928ab93c0c52, type: 3} + m_Name: + m_EditorClassIdentifier: + trumpetBackground: {fileID: 7831297615833552022} + tambourineBackground: {fileID: 3054742311368020042} + clarinetBackground: {fileID: 5459305458457057368} + trumpetUI: {fileID: 0} + tambourineUI: {fileID: 0} + clarinetUI: {fileID: 0} +--- !u!1 &5459305458457057368 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1799174769135430456} + - component: {fileID: 5908420744193716006} + - component: {fileID: 1233018365245661827} + m_Layer: 5 + m_Name: clarinet_UI_background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1799174769135430456 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5459305458457057368} + 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: 2498118711832120149} + m_Father: {fileID: 1885684100209428912} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -220, y: -60} + m_SizeDelta: {x: 65, y: 65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5908420744193716006 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5459305458457057368} + m_CullTransparentMesh: 1 +--- !u!114 &1233018365245661827 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5459305458457057368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 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: bf180d5d1970a488fb0eee84b8990541, 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!1 &7831297615833552022 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6181971475657436876} + - component: {fileID: 5342950273447152608} + - component: {fileID: 5927677077822061600} + m_Layer: 5 + m_Name: trumpet_UI_background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6181971475657436876 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7831297615833552022} + 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: 6414539852373954406} + m_Father: {fileID: 1885684100209428912} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -60, y: -60} + m_SizeDelta: {x: 65, y: 65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5342950273447152608 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7831297615833552022} + m_CullTransparentMesh: 1 +--- !u!114 &5927677077822061600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7831297615833552022} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 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: 4011924a357d34dedaee4c7857f7ee9b, 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 diff --git a/Assets/Prefabs/CanvasObjects/GameUICanvas.prefab.meta b/Assets/Prefabs/CanvasObjects/GameUICanvas.prefab.meta new file mode 100644 index 0000000..7127b94 --- /dev/null +++ b/Assets/Prefabs/CanvasObjects/GameUICanvas.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: eb9e81404697848cc9b0a55dc9b8fc06 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/ClarinetScene.unity b/Assets/Scenes/ClarinetScene.unity index c0e0bb4..942bbe1 100644 --- a/Assets/Scenes/ClarinetScene.unity +++ b/Assets/Scenes/ClarinetScene.unity @@ -354,7 +354,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &193907871 MonoBehaviour: @@ -1411,7 +1411,7 @@ Transform: m_Children: - {fileID: 1600355027} m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &675465334 PrefabInstance: @@ -2455,7 +2455,7 @@ Transform: - {fileID: 1545773011} - {fileID: 1119140771} m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &880696833 GameObject: @@ -2738,7 +2738,7 @@ RectTransform: - {fileID: 1767983940} - {fileID: 1597618777} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2863,7 +2863,7 @@ Transform: - {fileID: 727214723} - {fileID: 1617728781} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1117643217 GameObject: @@ -3061,6 +3061,107 @@ Transform: m_CorrespondingSourceObject: {fileID: 8574288191223281125, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} m_PrefabInstance: {fileID: 1119140770} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1199502988 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4891107602615669430, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_Name + value: GameUICanvas + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} --- !u!1001 &1311894520 PrefabInstance: m_ObjectHideFlags: 0 @@ -3257,7 +3358,7 @@ PrefabInstance: objectReference: {fileID: 519420031} - target: {fileID: 5885597207104481986, guid: 576d3fc87874f426294e4bbacb171478, type: 3} propertyPath: m_RootOrder - value: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5885597207104481986, guid: 576d3fc87874f426294e4bbacb171478, type: 3} propertyPath: m_LocalPosition.x @@ -19633,7 +19734,7 @@ Transform: - {fileID: 1985105248} - {fileID: 1311894521} m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1791386118 PrefabInstance: @@ -19649,7 +19750,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3} propertyPath: m_RootOrder - value: 13 + value: 14 objectReference: {fileID: 0} - target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3} propertyPath: m_LocalScale.x @@ -19994,7 +20095,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2026489083 MonoBehaviour: @@ -20025,7 +20126,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1372861636612891500, guid: 27d82e68381cf504d8720398564e6f91, type: 3} propertyPath: m_RootOrder - value: 12 + value: 13 objectReference: {fileID: 0} - target: {fileID: 1372861636612891500, guid: 27d82e68381cf504d8720398564e6f91, type: 3} propertyPath: m_LocalPosition.x @@ -20160,7 +20261,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} propertyPath: m_RootOrder - value: 11 + value: 12 objectReference: {fileID: 0} - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scenes/Claude's House.unity b/Assets/Scenes/Claude's House.unity index 5b6a5b6..b94e9ea 100644 --- a/Assets/Scenes/Claude's House.unity +++ b/Assets/Scenes/Claude's House.unity @@ -289,7 +289,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &89670133 GameObject: @@ -493,7 +493,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &123380146 GameObject: @@ -999,6 +999,107 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &323002355 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2022929438250013585, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_Name + value: VictoryCanvas + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d86665a294cc74268b853c002652a71b, type: 3} --- !u!1 &337693504 GameObject: m_ObjectHideFlags: 0 @@ -1335,6 +1436,107 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &409244253 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4891107602615669430, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_Name + value: GameUICanvas + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} --- !u!1 &420422970 GameObject: m_ObjectHideFlags: 0 @@ -1889,7 +2091,7 @@ Transform: - {fileID: 1498326663} - {fileID: 1365624347} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &651755733 BoxCollider2D: @@ -2018,7 +2220,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &826777325 GameObject: @@ -2051,10 +2253,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: pinned: 0 - range: 0.93 + isHorizontal: 0 + rangeHorizontal: 0 xLeft: 2 xRight: 2 - movementVector: {x: 1, y: 0} + movementVectorHorizontal: {x: 1, y: 0} + isVertical: 0 + rangeVertical: 0 + yUp: 0 + yDown: 0 + movementVectorVertical: {x: 0, y: 1} moveSpeed: 1 --- !u!212 &826777327 SpriteRenderer: @@ -2121,7 +2329,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &854526147 GameObject: @@ -2289,7 +2497,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &892482961 GameObject: @@ -2879,6 +3087,107 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &1048947661 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4058765142297116766, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8821204668943251022, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_Name + value: PauseMenuCanvas + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} --- !u!1 &1049051402 GameObject: m_ObjectHideFlags: 0 @@ -4039,7 +4348,7 @@ Transform: - {fileID: 2016174025} - {fileID: 1022307104} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1572123364 GameObject: @@ -4639,7 +4948,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 5885597207104481986, guid: 576d3fc87874f426294e4bbacb171478, type: 3} propertyPath: m_RootOrder - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5885597207104481986, guid: 576d3fc87874f426294e4bbacb171478, type: 3} propertyPath: m_LocalPosition.x @@ -4971,8 +5280,110 @@ MonoBehaviour: xOffset: 3 yOffset: 1 smoothing: 6 + size: 0 xLocked: 0 yLocked: 0 +--- !u!1001 &1704552201 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5297949573892466759, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_Name + value: DeathUICanvas + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} --- !u!1 &1756229634 GameObject: m_ObjectHideFlags: 0 @@ -5225,6 +5636,84 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1915867982 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1915867985} + - component: {fileID: 1915867984} + - component: {fileID: 1915867983} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1915867983 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1915867982} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 +--- !u!114 &1915867984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1915867982} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1915867985 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1915867982} + 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: 0} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1929614472 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/GrappleScene.unity b/Assets/Scenes/GrappleScene.unity index 5d6b34f..10b55fd 100644 --- a/Assets/Scenes/GrappleScene.unity +++ b/Assets/Scenes/GrappleScene.unity @@ -1269,82 +1269,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!1 &262170591 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 262170592} - - component: {fileID: 262170594} - - component: {fileID: 262170593} - m_Layer: 5 - m_Name: trumpet_UI - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &262170592 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 262170591} - 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: 983968206} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -32.500023, y: -32.499992} - m_SizeDelta: {x: 61, y: 61} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &262170593 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 262170591} - 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: 4011924a357d34dedaee4c7857f7ee9b, 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 &262170594 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 262170591} - m_CullTransparentMesh: 1 --- !u!1001 &296651438 PrefabInstance: m_ObjectHideFlags: 0 @@ -3518,237 +3442,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3} m_PrefabInstance: {fileID: 906228766} m_PrefabAsset: {fileID: 0} ---- !u!1 &935789171 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 935789172} - - component: {fileID: 935789174} - - component: {fileID: 935789173} - m_Layer: 5 - m_Name: clarinet_UI_background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &935789172 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935789171} - 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: 1378672484} - m_Father: {fileID: 1176148778} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -220, y: -60} - m_SizeDelta: {x: 65, y: 65} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &935789173 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935789171} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 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: bf180d5d1970a488fb0eee84b8990541, 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 &935789174 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935789171} - m_CullTransparentMesh: 1 ---- !u!1 &977973692 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 977973693} - - component: {fileID: 977973695} - - component: {fileID: 977973694} - m_Layer: 5 - m_Name: tambourine_UI_background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &977973693 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 977973692} - 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: 1316058447} - m_Father: {fileID: 1176148778} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -140, y: -60} - m_SizeDelta: {x: 70, y: 70} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &977973694 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 977973692} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 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: 9512c5061c129491aa064e971a2f0faa, 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 &977973695 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 977973692} - m_CullTransparentMesh: 1 ---- !u!1 &983968205 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 983968206} - - component: {fileID: 983968208} - - component: {fileID: 983968207} - m_Layer: 5 - m_Name: trumpet_UI_background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &983968206 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 983968205} - 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: 262170592} - m_Father: {fileID: 1176148778} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -60, y: -60} - m_SizeDelta: {x: 65, y: 65} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &983968207 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 983968205} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 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: 4011924a357d34dedaee4c7857f7ee9b, 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 &983968208 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 983968205} - m_CullTransparentMesh: 1 --- !u!1001 &989868762 PrefabInstance: m_ObjectHideFlags: 0 @@ -4194,130 +3887,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 493245979038171992, guid: fe6515c8ba67e4334bd83dff507ec83e, type: 3} m_PrefabInstance: {fileID: 1107305515} m_PrefabAsset: {fileID: 0} ---- !u!1 &1176148774 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1176148778} - - component: {fileID: 1176148777} - - component: {fileID: 1176148776} - - component: {fileID: 1176148775} - - component: {fileID: 1176148779} - m_Layer: 5 - m_Name: GameUICanvas - m_TagString: GameUICanvas - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1176148775 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1176148774} - 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 &1176148776 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1176148774} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - 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 &1176148777 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1176148774} - 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_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &1176148778 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1176148774} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 983968206} - - {fileID: 977973693} - - {fileID: 935789172} - m_Father: {fileID: 0} - m_RootOrder: 6 - 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 &1176148779 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1176148774} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ddba2a418da03482da8b928ab93c0c52, type: 3} - m_Name: - m_EditorClassIdentifier: - trumpetBackground: {fileID: 983968205} - tambourineBackground: {fileID: 977973692} - clarinetBackground: {fileID: 935789171} - trumpetUI: {fileID: 0} - tambourineUI: {fileID: 0} - clarinetUI: {fileID: 0} --- !u!1001 &1192387873 PrefabInstance: m_ObjectHideFlags: 0 @@ -4554,82 +4123,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} ---- !u!1 &1316058446 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1316058447} - - component: {fileID: 1316058449} - - component: {fileID: 1316058448} - m_Layer: 5 - m_Name: tambourine_UI - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1316058447 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1316058446} - 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: 977973693} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -34.999992, y: -35} - m_SizeDelta: {x: 61, y: 61} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1316058448 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1316058446} - 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: 9512c5061c129491aa064e971a2f0faa, 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 &1316058449 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1316058446} - m_CullTransparentMesh: 1 --- !u!1 &1317480696 GameObject: m_ObjectHideFlags: 0 @@ -5079,82 +4572,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1378672483 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1378672484} - - component: {fileID: 1378672486} - - component: {fileID: 1378672485} - m_Layer: 5 - m_Name: clarinet_UI - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1378672484 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1378672483} - 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: 935789172} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -32.5, y: -32.499992} - m_SizeDelta: {x: 61, y: 61} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1378672485 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1378672483} - 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: bf180d5d1970a488fb0eee84b8990541, 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 &1378672486 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1378672483} - m_CullTransparentMesh: 1 --- !u!1001 &1383539493 PrefabInstance: m_ObjectHideFlags: 0 @@ -115008,6 +114425,107 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d89768fad21a147d59156c6b9503b913, type: 3} +--- !u!1001 &5271877312110531957 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4891107602615669430, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_Name + value: GameUICanvas + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} --- !u!1001 &5828821210660800548 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/GrenouilleVillage.unity b/Assets/Scenes/GrenouilleVillage.unity index f3341b1..7b22090 100644 --- a/Assets/Scenes/GrenouilleVillage.unity +++ b/Assets/Scenes/GrenouilleVillage.unity @@ -857,7 +857,7 @@ Transform: - {fileID: 697174503} - {fileID: 1398943142} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &29324681 stripped Transform: @@ -6577,7 +6577,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &316597039 stripped Transform: @@ -8701,7 +8701,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 5885597207104481986, guid: 576d3fc87874f426294e4bbacb171478, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 5885597207104481986, guid: 576d3fc87874f426294e4bbacb171478, type: 3} propertyPath: m_LocalPosition.x @@ -9245,7 +9245,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &471749748 GameObject: @@ -19509,7 +19509,7 @@ Transform: - {fileID: 1566672828} - {fileID: 1287530014} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &927374689 stripped Transform: @@ -21053,7 +21053,7 @@ Transform: m_Children: - {fileID: 1594827617} m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1029307722 PrefabInstance: @@ -24633,7 +24633,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} propertyPath: m_RootOrder - value: 15 + value: 16 objectReference: {fileID: 0} - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} propertyPath: m_LocalScale.x @@ -26534,7 +26534,7 @@ Transform: m_Children: - {fileID: 1771753954} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1289122542 stripped Transform: @@ -28925,7 +28925,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} propertyPath: m_RootOrder - value: 12 + value: 13 objectReference: {fileID: 0} - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} propertyPath: m_LocalScale.x @@ -33206,7 +33206,7 @@ Transform: - {fileID: 1075726552} - {fileID: 2038916902} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1691496580 PrefabInstance: @@ -36956,7 +36956,7 @@ Transform: - {fileID: 148818847} - {fileID: 1418452258} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1878636259 stripped Transform: @@ -39613,6 +39613,107 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3d38aed545180714daeeb1d0e15b2425, type: 3} +--- !u!1001 &2042457204 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4891107602615669430, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_Name + value: GameUICanvas + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} --- !u!4 &2046913369 stripped Transform: m_CorrespondingSourceObject: {fileID: 3781786539254097561, guid: 9230d7cbf1bbf0046a4d642090b875f3, type: 3} @@ -42011,7 +42112,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 2403035371236191089, guid: b4de2c0f6f97dfd4889c636185501814, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 2403035371236191089, guid: b4de2c0f6f97dfd4889c636185501814, type: 3} propertyPath: m_LocalScale.x diff --git a/Assets/Scripts/PlayerBehavior.cs b/Assets/Scripts/PlayerBehavior.cs index 58aabbd..b22d51b 100644 --- a/Assets/Scripts/PlayerBehavior.cs +++ b/Assets/Scripts/PlayerBehavior.cs @@ -26,6 +26,7 @@ public class PlayerBehavior : MonoBehaviour [Header("Controllers:")] [SerializeField] private PlayerMovement playerController; [SerializeField] private StateController stateController; + private GameUIController gameUI; Animator animator; [HideInInspector] public bool playerIsAlive = true; @@ -40,6 +41,7 @@ public class PlayerBehavior : MonoBehaviour { // initialize _rb = GetComponent(); stateController = GameObject.Find("StateController").GetComponent(); + gameUI = GameObject.FindGameObjectWithTag("GameUICanvas").GetComponent(); audioSource = this.gameObject.GetComponent(); audioSource.clip = footstepSound; @@ -125,10 +127,15 @@ public class PlayerBehavior : MonoBehaviour if (unlockedTambourine && hasTambourine && !grapplingRope.isGrappling) { launcher.ThrowTambourine(forward); - hasTambourine = false; + SetHasTambourine(false); } } + public void SetHasTambourine(bool state) { + hasTambourine = state; + gameUI.ToggleTambourine(state); + } + void AttemptGrapple() { if (tambourine != null) { // grapple to tambourine diff --git a/Assets/Scripts/TambourineBehavior.cs b/Assets/Scripts/TambourineBehavior.cs index a6b78e3..532817b 100644 --- a/Assets/Scripts/TambourineBehavior.cs +++ b/Assets/Scripts/TambourineBehavior.cs @@ -58,7 +58,7 @@ public class TambourineBehavior : MonoBehaviour { timeLerped += Time.deltaTime; this.gameObject.transform.position = Vector2.Lerp(this.gameObject.transform.position, player.transform.position, timeLerped/0.1f); if (this.gameObject.transform.position.x == player.transform.position.x && this.gameObject.transform.position.y == player.transform.position.y) { - player.GetComponent().hasTambourine = true; + player.GetComponent().SetHasTambourine(true); Destroy(this.gameObject); } }