diff --git a/Assets/Canvas.prefab b/Assets/Canvas.prefab new file mode 100644 index 0000000..86ef649 --- /dev/null +++ b/Assets/Canvas.prefab @@ -0,0 +1,1425 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1396214789240199918 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1396214789240199917} + m_Layer: 5 + m_Name: PauseMenu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1396214789240199917 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789240199918} + 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: 1396214790149305227} + m_Father: {fileID: 1396214789410159221} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1396214789308655155 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1396214789308655154} + - component: {fileID: 1396214789308655159} + - component: {fileID: 1396214789308655152} + - component: {fileID: 1396214789308655153} + m_Layer: 5 + m_Name: Go to Home + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1396214789308655154 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789308655155} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5374, y: 1.65, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1396214790149305227} + 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: 16, y: 38} + m_SizeDelta: {x: 217.6481, y: 40.1834} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1396214789308655159 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789308655155} + m_CullTransparentMesh: 1 +--- !u!114 &1396214789308655152 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789308655155} + 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: -2008303819, guid: 82f95a689dac6fa45a602cf7522fdc01, 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: 1 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1396214789308655153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789308655155} + 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: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: -909816665, guid: 82f95a689dac6fa45a602cf7522fdc01, type: 3} + m_PressedSprite: {fileID: 991074552, guid: 82f95a689dac6fa45a602cf7522fdc01, type: 3} + 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: 1396214789308655152} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: PauseMenu, Assembly-CSharp + m_MethodName: GoToHome + 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!1 &1396214789410159217 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1396214789410159221} + - component: {fileID: 1396214789410159222} + - component: {fileID: 1396214789410159223} + - component: {fileID: 1396214789410159216} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1396214789410159221 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789410159217} + 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: 1396214789240199917} + - {fileID: 1396214790945298128} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &1396214789410159222 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789410159217} + 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: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &1396214789410159223 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789410159217} + 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 &1396214789410159216 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789410159217} + 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!1 &1396214789460750862 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1396214789460750861} + - component: {fileID: 1396214789460751089} + - component: {fileID: 1396214789460751090} + - component: {fileID: 1396214789460751091} + - component: {fileID: 1396214789460750860} + m_Layer: 5 + m_Name: RespawnButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1396214789460750861 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789460750862} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5374, y: 1.6500001, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1396214790945298128} + 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: 5, y: 2} + m_SizeDelta: {x: 217.6481, y: 40.1834} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1396214789460751089 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789460750862} + m_CullTransparentMesh: 1 +--- !u!114 &1396214789460751090 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789460750862} + 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: -1781206890, guid: 82f95a689dac6fa45a602cf7522fdc01, 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: 1 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1396214789460751091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789460750862} + 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: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: -1749346042, guid: 82f95a689dac6fa45a602cf7522fdc01, type: 3} + m_PressedSprite: {fileID: 844590160, guid: 82f95a689dac6fa45a602cf7522fdc01, type: 3} + 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: 1396214789460751090} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1396214790945298133} + m_TargetAssemblyTypeName: GameOverScreen, Assembly-CSharp + m_MethodName: RespawnButton + 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 &1396214789460750860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789460750862} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8466911bd3e82f14fbbfa9cc306e5a2a, type: 3} + m_Name: + m_EditorClassIdentifier: + sceneName: +--- !u!1 &1396214789489881905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1396214789489881904} + - component: {fileID: 1396214789489881909} + - component: {fileID: 1396214789489881910} + - component: {fileID: 1396214789489881911} + m_Layer: 5 + m_Name: Settings + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1396214789489881904 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789489881905} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5374, y: 1.65, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1396214790149305227} + 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: 16, y: -60.615097} + m_SizeDelta: {x: 217.6481, y: 40.1834} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1396214789489881909 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789489881905} + m_CullTransparentMesh: 1 +--- !u!114 &1396214789489881910 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789489881905} + 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: 581330340, guid: 7d9ad5e849e934c4c9fe1f18d9284644, 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: 1 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1396214789489881911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789489881905} + 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: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: -806958928, guid: 7d9ad5e849e934c4c9fe1f18d9284644, type: 3} + m_PressedSprite: {fileID: 126313575, guid: 7d9ad5e849e934c4c9fe1f18d9284644, type: 3} + 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: 1396214789489881910} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &1396214789491164849 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1396214789491164848} + - component: {fileID: 1396214789491164854} + - component: {fileID: 1396214789491164855} + m_Layer: 5 + m_Name: levelReached + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1396214789491164848 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789491164849} + 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: 1396214790945298128} + 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: -42, y: 107} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1396214789491164854 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789491164849} + m_CullTransparentMesh: 1 +--- !u!114 &1396214789491164855 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789491164849} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Level Reached: 0' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 4b85bc8c581b4704f9ecf80449a3b742, type: 2} + m_sharedMaterial: {fileID: -7860752935613747955, guid: 4b85bc8c581b4704f9ecf80449a3b742, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: -102.36861, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1396214789630589870 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1396214789630589869} + - component: {fileID: 1396214789630589843} + - component: {fileID: 1396214789630589868} + m_Layer: 5 + m_Name: GameOver + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1396214789630589869 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789630589870} + 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: 1396214790945298128} + 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: -110, y: 181} + m_SizeDelta: {x: 170.569, y: 48.7204} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1396214789630589843 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789630589870} + m_CullTransparentMesh: 1 +--- !u!114 &1396214789630589868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214789630589870} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: GAME OVER + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 4b85bc8c581b4704f9ecf80449a3b742, type: 2} + m_sharedMaterial: {fileID: -7860752935613747955, guid: 4b85bc8c581b4704f9ecf80449a3b742, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 56 + m_fontSizeBase: 56 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: -231.60942, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1396214790127385489 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1396214790127385488} + - component: {fileID: 1396214790127385493} + - component: {fileID: 1396214790127385494} + - component: {fileID: 1396214790127385495} + m_Layer: 5 + m_Name: Resume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1396214790127385488 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214790127385489} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5374, y: 1.65, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1396214790149305227} + 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: 16, y: 133.93536} + m_SizeDelta: {x: 217.6481, y: 40.1834} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1396214790127385493 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214790127385489} + m_CullTransparentMesh: 1 +--- !u!114 &1396214790127385494 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214790127385489} + 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: -1637034928, guid: 82f95a689dac6fa45a602cf7522fdc01, 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: 1 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1396214790127385495 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214790127385489} + 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: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: -1348486068, guid: 82f95a689dac6fa45a602cf7522fdc01, type: 3} + m_PressedSprite: {fileID: -1052213344, guid: 82f95a689dac6fa45a602cf7522fdc01, type: 3} + 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: 1396214790127385494} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: PauseMenu, Assembly-CSharp + m_MethodName: ResumeGame + 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!1 &1396214790149305220 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1396214790149305227} + - component: {fileID: 1396214790149305225} + - component: {fileID: 1396214790149305226} + m_Layer: 5 + m_Name: MenuBackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1396214790149305227 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214790149305220} + 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: 1396214790127385488} + - {fileID: 1396214789308655154} + - {fileID: 1396214789489881904} + - {fileID: 1396214790977225501} + m_Father: {fileID: 1396214789240199917} + 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: 718, y: 360.39996} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1396214790149305225 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214790149305220} + m_CullTransparentMesh: 1 +--- !u!114 &1396214790149305226 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214790149305220} + 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: 0.392} + 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: 10907, 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!1 &1396214790945298129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1396214790945298128} + - component: {fileID: 1396214790945298134} + - component: {fileID: 1396214790945298135} + - component: {fileID: 1396214790945298133} + m_Layer: 5 + m_Name: BackGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1396214790945298128 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214790945298129} + 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: 1396214789630589869} + - {fileID: 1396214789491164848} + - {fileID: 1396214791036718015} + - {fileID: 1396214789460750861} + m_Father: {fileID: 1396214789410159221} + m_RootOrder: 1 + 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!222 &1396214790945298134 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214790945298129} + m_CullTransparentMesh: 1 +--- !u!114 &1396214790945298135 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214790945298129} + 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: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1396214790945298133 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214790945298129} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93df0e909d6236742a91e632f0edb389, type: 3} + m_Name: + m_EditorClassIdentifier: + levelReached: {fileID: 0} +--- !u!1 &1396214790977225502 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1396214790977225501} + - component: {fileID: 1396214790977225474} + - component: {fileID: 1396214790977225475} + - component: {fileID: 1396214790977225500} + - component: {fileID: 1396214790977225473} + m_Layer: 5 + m_Name: Quit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1396214790977225501 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214790977225502} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5374, y: 1.65, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1396214790149305227} + 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: 16, y: -155.47856} + m_SizeDelta: {x: 217.6481, y: 40.1834} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1396214790977225474 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214790977225502} + m_CullTransparentMesh: 1 +--- !u!114 &1396214790977225475 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214790977225502} + 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: -1781206890, guid: 82f95a689dac6fa45a602cf7522fdc01, 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: 1 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1396214790977225500 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214790977225502} + 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: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: -1749346042, guid: 82f95a689dac6fa45a602cf7522fdc01, type: 3} + m_PressedSprite: {fileID: 844590160, guid: 82f95a689dac6fa45a602cf7522fdc01, type: 3} + 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: 1396214790977225475} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1396214790977225473} + m_TargetAssemblyTypeName: SceneChangeButton, Assembly-CSharp + m_MethodName: ChangeScene + 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 &1396214790977225473 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214790977225502} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8466911bd3e82f14fbbfa9cc306e5a2a, type: 3} + m_Name: + m_EditorClassIdentifier: + sceneName: Main_Menu +--- !u!1 &1396214791036718008 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1396214791036718015} + - component: {fileID: 1396214791036717987} + - component: {fileID: 1396214791036718012} + - component: {fileID: 1396214791036718013} + - component: {fileID: 1396214791036718014} + m_Layer: 5 + m_Name: SaveQuitButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1396214791036718015 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214791036718008} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5374, y: 1.6500001, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1396214790945298128} + 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: 5, y: -111} + m_SizeDelta: {x: 217.6481, y: 40.1834} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1396214791036717987 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214791036718008} + m_CullTransparentMesh: 1 +--- !u!114 &1396214791036718012 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214791036718008} + 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: -1781206890, guid: 82f95a689dac6fa45a602cf7522fdc01, 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: 1 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1396214791036718013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214791036718008} + 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: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: -1749346042, guid: 82f95a689dac6fa45a602cf7522fdc01, type: 3} + m_PressedSprite: {fileID: 844590160, guid: 82f95a689dac6fa45a602cf7522fdc01, type: 3} + 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: 1396214791036718012} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1396214790945298133} + m_TargetAssemblyTypeName: GameOverScreen, Assembly-CSharp + m_MethodName: SaveQuitButton + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 +--- !u!114 &1396214791036718014 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396214791036718008} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8466911bd3e82f14fbbfa9cc306e5a2a, type: 3} + m_Name: + m_EditorClassIdentifier: + sceneName: Main_Menu diff --git a/Assets/Scenes/Main_Game1.unity.meta b/Assets/Canvas.prefab.meta similarity index 63% rename from Assets/Scenes/Main_Game1.unity.meta rename to Assets/Canvas.prefab.meta index 9f1f3df..0c22892 100644 --- a/Assets/Scenes/Main_Game1.unity.meta +++ b/Assets/Canvas.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 7a0db1a0fdab8d34d8c2abb01027dd07 -DefaultImporter: +guid: 549b615a975c47546b02439c22f08821 +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Inputs.cs b/Assets/Inputs.cs index e3bd7ec..bb72257 100644 --- a/Assets/Inputs.cs +++ b/Assets/Inputs.cs @@ -116,6 +116,15 @@ public partial class @Inputs : IInputActionCollection2, IDisposable ""processors"": """", ""interactions"": """", ""initialStateCheck"": false + }, + { + ""name"": ""Pause"", + ""type"": ""Button"", + ""id"": ""f130e6cf-9ecc-46b1-b37d-bf452dae29f0"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false } ], ""bindings"": [ @@ -272,6 +281,17 @@ public partial class @Inputs : IInputActionCollection2, IDisposable ""action"": ""Eat"", ""isComposite"": false, ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""81322c8b-dcdc-41da-a2af-8a9eb451461c"", + ""path"": ""/escape"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""Pause"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] } @@ -290,6 +310,7 @@ public partial class @Inputs : IInputActionCollection2, IDisposable m_Movement_Interact = m_Movement.FindAction("Interact", throwIfNotFound: true); m_Movement_Mouse_Pos = m_Movement.FindAction("Mouse_Pos", throwIfNotFound: true); m_Movement_Eat = m_Movement.FindAction("Eat", throwIfNotFound: true); + m_Movement_Pause = m_Movement.FindAction("Pause", throwIfNotFound: true); } public void Dispose() @@ -359,6 +380,7 @@ public partial class @Inputs : IInputActionCollection2, IDisposable private readonly InputAction m_Movement_Interact; private readonly InputAction m_Movement_Mouse_Pos; private readonly InputAction m_Movement_Eat; + private readonly InputAction m_Movement_Pause; public struct MovementActions { private @Inputs m_Wrapper; @@ -373,6 +395,7 @@ public partial class @Inputs : IInputActionCollection2, IDisposable public InputAction @Interact => m_Wrapper.m_Movement_Interact; public InputAction @Mouse_Pos => m_Wrapper.m_Movement_Mouse_Pos; public InputAction @Eat => m_Wrapper.m_Movement_Eat; + public InputAction @Pause => m_Wrapper.m_Movement_Pause; public InputActionMap Get() { return m_Wrapper.m_Movement; } public void Enable() { Get().Enable(); } public void Disable() { Get().Disable(); } @@ -412,6 +435,9 @@ public partial class @Inputs : IInputActionCollection2, IDisposable @Eat.started -= m_Wrapper.m_MovementActionsCallbackInterface.OnEat; @Eat.performed -= m_Wrapper.m_MovementActionsCallbackInterface.OnEat; @Eat.canceled -= m_Wrapper.m_MovementActionsCallbackInterface.OnEat; + @Pause.started -= m_Wrapper.m_MovementActionsCallbackInterface.OnPause; + @Pause.performed -= m_Wrapper.m_MovementActionsCallbackInterface.OnPause; + @Pause.canceled -= m_Wrapper.m_MovementActionsCallbackInterface.OnPause; } m_Wrapper.m_MovementActionsCallbackInterface = instance; if (instance != null) @@ -446,6 +472,9 @@ public partial class @Inputs : IInputActionCollection2, IDisposable @Eat.started += instance.OnEat; @Eat.performed += instance.OnEat; @Eat.canceled += instance.OnEat; + @Pause.started += instance.OnPause; + @Pause.performed += instance.OnPause; + @Pause.canceled += instance.OnPause; } } } @@ -462,5 +491,6 @@ public partial class @Inputs : IInputActionCollection2, IDisposable void OnInteract(InputAction.CallbackContext context); void OnMouse_Pos(InputAction.CallbackContext context); void OnEat(InputAction.CallbackContext context); + void OnPause(InputAction.CallbackContext context); } } diff --git a/Assets/Inputs.inputactions b/Assets/Inputs.inputactions index 5934f44..b553127 100644 --- a/Assets/Inputs.inputactions +++ b/Assets/Inputs.inputactions @@ -94,6 +94,15 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Pause", + "type": "Button", + "id": "f130e6cf-9ecc-46b1-b37d-bf452dae29f0", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -250,6 +259,17 @@ "action": "Eat", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "81322c8b-dcdc-41da-a2af-8a9eb451461c", + "path": "/escape", + "interactions": "", + "processors": "", + "groups": "", + "action": "Pause", + "isComposite": false, + "isPartOfComposite": false } ] } diff --git a/Assets/Materials.meta b/Assets/Misc/Materials.meta similarity index 100% rename from Assets/Materials.meta rename to Assets/Misc/Materials.meta diff --git a/Assets/Materials/Grapic.meta b/Assets/Misc/Materials/Grapic.meta similarity index 100% rename from Assets/Materials/Grapic.meta rename to Assets/Misc/Materials/Grapic.meta diff --git a/Assets/Materials/Grapic/BackgroundTiles.meta b/Assets/Misc/Materials/Grapic/BackgroundTiles.meta similarity index 100% rename from Assets/Materials/Grapic/BackgroundTiles.meta rename to Assets/Misc/Materials/Grapic/BackgroundTiles.meta diff --git a/Assets/Materials/Grapic/BackgroundTiles/Background.prefab b/Assets/Misc/Materials/Grapic/BackgroundTiles/Background.prefab similarity index 100% rename from Assets/Materials/Grapic/BackgroundTiles/Background.prefab rename to Assets/Misc/Materials/Grapic/BackgroundTiles/Background.prefab diff --git a/Assets/Materials/Grapic/BackgroundTiles/Background.prefab.meta b/Assets/Misc/Materials/Grapic/BackgroundTiles/Background.prefab.meta similarity index 100% rename from Assets/Materials/Grapic/BackgroundTiles/Background.prefab.meta rename to Assets/Misc/Materials/Grapic/BackgroundTiles/Background.prefab.meta diff --git a/Assets/Materials/Grapic/Big Rat.aseprite b/Assets/Misc/Materials/Grapic/Big Rat.aseprite similarity index 100% rename from Assets/Materials/Grapic/Big Rat.aseprite rename to Assets/Misc/Materials/Grapic/Big Rat.aseprite diff --git a/Assets/Materials/Grapic/Big Rat.aseprite.meta b/Assets/Misc/Materials/Grapic/Big Rat.aseprite.meta similarity index 100% rename from Assets/Materials/Grapic/Big Rat.aseprite.meta rename to Assets/Misc/Materials/Grapic/Big Rat.aseprite.meta diff --git a/Assets/Materials/Grapic/Blue Cheese.png b/Assets/Misc/Materials/Grapic/Blue Cheese.png similarity index 100% rename from Assets/Materials/Grapic/Blue Cheese.png rename to Assets/Misc/Materials/Grapic/Blue Cheese.png diff --git a/Assets/Materials/Grapic/Blue Cheese.png.meta b/Assets/Misc/Materials/Grapic/Blue Cheese.png.meta similarity index 90% rename from Assets/Materials/Grapic/Blue Cheese.png.meta rename to Assets/Misc/Materials/Grapic/Blue Cheese.png.meta index 16e0f64..57aec4b 100644 --- a/Assets/Materials/Grapic/Blue Cheese.png.meta +++ b/Assets/Misc/Materials/Grapic/Blue Cheese.png.meta @@ -113,6 +113,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Materials/Grapic/Buttons 1.png b/Assets/Misc/Materials/Grapic/Buttons 1.png similarity index 100% rename from Assets/Materials/Grapic/Buttons 1.png rename to Assets/Misc/Materials/Grapic/Buttons 1.png diff --git a/Assets/Materials/Grapic/Buttons 1.png.meta b/Assets/Misc/Materials/Grapic/Buttons 1.png.meta similarity index 97% rename from Assets/Materials/Grapic/Buttons 1.png.meta rename to Assets/Misc/Materials/Grapic/Buttons 1.png.meta index b372f39..d51fb74 100644 --- a/Assets/Materials/Grapic/Buttons 1.png.meta +++ b/Assets/Misc/Materials/Grapic/Buttons 1.png.meta @@ -101,6 +101,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Materials/Grapic/Buttons 2.png b/Assets/Misc/Materials/Grapic/Buttons 2.png similarity index 100% rename from Assets/Materials/Grapic/Buttons 2.png rename to Assets/Misc/Materials/Grapic/Buttons 2.png diff --git a/Assets/Materials/Grapic/Buttons 2.png.meta b/Assets/Misc/Materials/Grapic/Buttons 2.png.meta similarity index 98% rename from Assets/Materials/Grapic/Buttons 2.png.meta rename to Assets/Misc/Materials/Grapic/Buttons 2.png.meta index dab89ff..d176db5 100644 --- a/Assets/Materials/Grapic/Buttons 2.png.meta +++ b/Assets/Misc/Materials/Grapic/Buttons 2.png.meta @@ -101,6 +101,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Materials/Grapic/Buttons.png b/Assets/Misc/Materials/Grapic/Buttons.png similarity index 100% rename from Assets/Materials/Grapic/Buttons.png rename to Assets/Misc/Materials/Grapic/Buttons.png diff --git a/Assets/Materials/Grapic/Buttons.png.meta b/Assets/Misc/Materials/Grapic/Buttons.png.meta similarity index 100% rename from Assets/Materials/Grapic/Buttons.png.meta rename to Assets/Misc/Materials/Grapic/Buttons.png.meta diff --git a/Assets/Materials/Grapic/Cheese.png b/Assets/Misc/Materials/Grapic/Cheese.png similarity index 100% rename from Assets/Materials/Grapic/Cheese.png rename to Assets/Misc/Materials/Grapic/Cheese.png diff --git a/Assets/Materials/Grapic/Cheese.png.meta b/Assets/Misc/Materials/Grapic/Cheese.png.meta similarity index 90% rename from Assets/Materials/Grapic/Cheese.png.meta rename to Assets/Misc/Materials/Grapic/Cheese.png.meta index b83befe..a0d8f53 100644 --- a/Assets/Materials/Grapic/Cheese.png.meta +++ b/Assets/Misc/Materials/Grapic/Cheese.png.meta @@ -113,6 +113,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Materials/Grapic/Elevator.png b/Assets/Misc/Materials/Grapic/Elevator.png similarity index 100% rename from Assets/Materials/Grapic/Elevator.png rename to Assets/Misc/Materials/Grapic/Elevator.png diff --git a/Assets/Materials/Grapic/Elevator.png.meta b/Assets/Misc/Materials/Grapic/Elevator.png.meta similarity index 100% rename from Assets/Materials/Grapic/Elevator.png.meta rename to Assets/Misc/Materials/Grapic/Elevator.png.meta diff --git a/Assets/Materials/Grapic/Enemies.meta b/Assets/Misc/Materials/Grapic/Enemies.meta similarity index 100% rename from Assets/Materials/Grapic/Enemies.meta rename to Assets/Misc/Materials/Grapic/Enemies.meta diff --git a/Assets/Materials/Grapic/Enemies/Frog.png b/Assets/Misc/Materials/Grapic/Enemies/Frog.png similarity index 100% rename from Assets/Materials/Grapic/Enemies/Frog.png rename to Assets/Misc/Materials/Grapic/Enemies/Frog.png diff --git a/Assets/Materials/Grapic/Enemies/Frog.png.meta b/Assets/Misc/Materials/Grapic/Enemies/Frog.png.meta similarity index 100% rename from Assets/Materials/Grapic/Enemies/Frog.png.meta rename to Assets/Misc/Materials/Grapic/Enemies/Frog.png.meta diff --git a/Assets/Materials/Grapic/Enemies/frog tung.png b/Assets/Misc/Materials/Grapic/Enemies/frog tung.png similarity index 100% rename from Assets/Materials/Grapic/Enemies/frog tung.png rename to Assets/Misc/Materials/Grapic/Enemies/frog tung.png diff --git a/Assets/Materials/Grapic/Enemies/frog tung.png.meta b/Assets/Misc/Materials/Grapic/Enemies/frog tung.png.meta similarity index 100% rename from Assets/Materials/Grapic/Enemies/frog tung.png.meta rename to Assets/Misc/Materials/Grapic/Enemies/frog tung.png.meta diff --git a/Assets/Materials/Grapic/Fart.png b/Assets/Misc/Materials/Grapic/Fart.png similarity index 100% rename from Assets/Materials/Grapic/Fart.png rename to Assets/Misc/Materials/Grapic/Fart.png diff --git a/Assets/Materials/Grapic/Fart.png.meta b/Assets/Misc/Materials/Grapic/Fart.png.meta similarity index 89% rename from Assets/Materials/Grapic/Fart.png.meta rename to Assets/Misc/Materials/Grapic/Fart.png.meta index e5f9be4..5c9ce4e 100644 --- a/Assets/Materials/Grapic/Fart.png.meta +++ b/Assets/Misc/Materials/Grapic/Fart.png.meta @@ -101,6 +101,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Materials/Grapic/Fill.mat b/Assets/Misc/Materials/Grapic/Fill.mat similarity index 100% rename from Assets/Materials/Grapic/Fill.mat rename to Assets/Misc/Materials/Grapic/Fill.mat diff --git a/Assets/Materials/Grapic/Fill.mat.meta b/Assets/Misc/Materials/Grapic/Fill.mat.meta similarity index 100% rename from Assets/Materials/Grapic/Fill.mat.meta rename to Assets/Misc/Materials/Grapic/Fill.mat.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/Foreground.prefab b/Assets/Misc/Materials/Grapic/ForegroundTiles/Foreground.prefab similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/Foreground.prefab rename to Assets/Misc/Materials/Grapic/ForegroundTiles/Foreground.prefab diff --git a/Assets/Materials/Grapic/ForegroundTiles/Foreground.prefab.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/Foreground.prefab.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/Foreground.prefab.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/Foreground.prefab.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TileRules.asset b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TileRules.asset similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TileRules.asset rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TileRules.asset diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TileRules.asset.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TileRules.asset.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TileRules.asset.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TileRules.asset.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_0.asset b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_0.asset similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_0.asset rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_0.asset diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_0.asset.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_0.asset.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_0.asset.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_0.asset.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_1.asset b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_1.asset similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_1.asset rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_1.asset diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_1.asset.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_1.asset.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_1.asset.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_1.asset.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_10.asset b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_10.asset similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_10.asset rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_10.asset diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_10.asset.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_10.asset.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_10.asset.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_10.asset.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_11.asset b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_11.asset similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_11.asset rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_11.asset diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_11.asset.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_11.asset.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_11.asset.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_11.asset.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_12.asset b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_12.asset similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_12.asset rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_12.asset diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_12.asset.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_12.asset.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_12.asset.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_12.asset.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_13.asset b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_13.asset similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_13.asset rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_13.asset diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_13.asset.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_13.asset.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_13.asset.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_13.asset.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_14.asset b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_14.asset similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_14.asset rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_14.asset diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_14.asset.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_14.asset.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_14.asset.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_14.asset.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_15.asset b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_15.asset similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_15.asset rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_15.asset diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_15.asset.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_15.asset.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_15.asset.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_15.asset.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_2.asset b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_2.asset similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_2.asset rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_2.asset diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_2.asset.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_2.asset.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_2.asset.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_2.asset.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_3.asset b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_3.asset similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_3.asset rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_3.asset diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_3.asset.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_3.asset.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_3.asset.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_3.asset.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_4.asset b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_4.asset similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_4.asset rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_4.asset diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_4.asset.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_4.asset.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_4.asset.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_4.asset.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_5.asset b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_5.asset similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_5.asset rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_5.asset diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_5.asset.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_5.asset.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_5.asset.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_5.asset.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_6.asset b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_6.asset similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_6.asset rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_6.asset diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_6.asset.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_6.asset.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_6.asset.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_6.asset.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_7.asset b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_7.asset similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_7.asset rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_7.asset diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_7.asset.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_7.asset.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_7.asset.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_7.asset.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_8.asset b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_8.asset similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_8.asset rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_8.asset diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_8.asset.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_8.asset.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_8.asset.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_8.asset.meta diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_9.asset b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_9.asset similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_9.asset rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_9.asset diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_9.asset.meta b/Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_9.asset.meta similarity index 100% rename from Assets/Materials/Grapic/ForegroundTiles/tiles/TilesFG_9.asset.meta rename to Assets/Misc/Materials/Grapic/ForegroundTiles/tiles/TilesFG_9.asset.meta diff --git a/Assets/Materials/Grapic/NewRat.json b/Assets/Misc/Materials/Grapic/NewRat.json similarity index 100% rename from Assets/Materials/Grapic/NewRat.json rename to Assets/Misc/Materials/Grapic/NewRat.json diff --git a/Assets/Materials/Grapic/NewRat.json.meta b/Assets/Misc/Materials/Grapic/NewRat.json.meta similarity index 100% rename from Assets/Materials/Grapic/NewRat.json.meta rename to Assets/Misc/Materials/Grapic/NewRat.json.meta diff --git a/Assets/Materials/Grapic/NewRat.png b/Assets/Misc/Materials/Grapic/NewRat.png similarity index 100% rename from Assets/Materials/Grapic/NewRat.png rename to Assets/Misc/Materials/Grapic/NewRat.png diff --git a/Assets/Materials/Grapic/NewRat.png.meta b/Assets/Misc/Materials/Grapic/NewRat.png.meta similarity index 100% rename from Assets/Materials/Grapic/NewRat.png.meta rename to Assets/Misc/Materials/Grapic/NewRat.png.meta diff --git a/Assets/Materials/Grapic/Packer.spriteatlas b/Assets/Misc/Materials/Grapic/Packer.spriteatlas similarity index 100% rename from Assets/Materials/Grapic/Packer.spriteatlas rename to Assets/Misc/Materials/Grapic/Packer.spriteatlas diff --git a/Assets/Materials/Grapic/Packer.spriteatlas.meta b/Assets/Misc/Materials/Grapic/Packer.spriteatlas.meta similarity index 100% rename from Assets/Materials/Grapic/Packer.spriteatlas.meta rename to Assets/Misc/Materials/Grapic/Packer.spriteatlas.meta diff --git a/Assets/Materials/Grapic/Pistol.png b/Assets/Misc/Materials/Grapic/Pistol.png similarity index 100% rename from Assets/Materials/Grapic/Pistol.png rename to Assets/Misc/Materials/Grapic/Pistol.png diff --git a/Assets/Materials/Grapic/Pistol.png.meta b/Assets/Misc/Materials/Grapic/Pistol.png.meta similarity index 100% rename from Assets/Materials/Grapic/Pistol.png.meta rename to Assets/Misc/Materials/Grapic/Pistol.png.meta diff --git a/Assets/Materials/Grapic/Pizza.aseprite b/Assets/Misc/Materials/Grapic/Pizza.aseprite similarity index 100% rename from Assets/Materials/Grapic/Pizza.aseprite rename to Assets/Misc/Materials/Grapic/Pizza.aseprite diff --git a/Assets/Materials/Grapic/Pizza.aseprite.meta b/Assets/Misc/Materials/Grapic/Pizza.aseprite.meta similarity index 100% rename from Assets/Materials/Grapic/Pizza.aseprite.meta rename to Assets/Misc/Materials/Grapic/Pizza.aseprite.meta diff --git a/Assets/Materials/Grapic/Pizza.png b/Assets/Misc/Materials/Grapic/Pizza.png similarity index 100% rename from Assets/Materials/Grapic/Pizza.png rename to Assets/Misc/Materials/Grapic/Pizza.png diff --git a/Assets/Materials/Grapic/Pizza.png.meta b/Assets/Misc/Materials/Grapic/Pizza.png.meta similarity index 100% rename from Assets/Materials/Grapic/Pizza.png.meta rename to Assets/Misc/Materials/Grapic/Pizza.png.meta diff --git a/Assets/Materials/Grapic/Rat Trap.png b/Assets/Misc/Materials/Grapic/Rat Trap.png similarity index 100% rename from Assets/Materials/Grapic/Rat Trap.png rename to Assets/Misc/Materials/Grapic/Rat Trap.png diff --git a/Assets/Materials/Grapic/Rat Trap.png.meta b/Assets/Misc/Materials/Grapic/Rat Trap.png.meta similarity index 95% rename from Assets/Materials/Grapic/Rat Trap.png.meta rename to Assets/Misc/Materials/Grapic/Rat Trap.png.meta index 4c6af3b..10540db 100644 --- a/Assets/Materials/Grapic/Rat Trap.png.meta +++ b/Assets/Misc/Materials/Grapic/Rat Trap.png.meta @@ -101,6 +101,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Materials/Grapic/RatArm.png b/Assets/Misc/Materials/Grapic/RatArm.png similarity index 100% rename from Assets/Materials/Grapic/RatArm.png rename to Assets/Misc/Materials/Grapic/RatArm.png diff --git a/Assets/Materials/Grapic/RatArm.png.meta b/Assets/Misc/Materials/Grapic/RatArm.png.meta similarity index 100% rename from Assets/Materials/Grapic/RatArm.png.meta rename to Assets/Misc/Materials/Grapic/RatArm.png.meta diff --git a/Assets/Materials/Grapic/Store.png b/Assets/Misc/Materials/Grapic/Store.png similarity index 100% rename from Assets/Materials/Grapic/Store.png rename to Assets/Misc/Materials/Grapic/Store.png diff --git a/Assets/Materials/Grapic/Store.png.meta b/Assets/Misc/Materials/Grapic/Store.png.meta similarity index 100% rename from Assets/Materials/Grapic/Store.png.meta rename to Assets/Misc/Materials/Grapic/Store.png.meta diff --git a/Assets/Materials/Grapic/TilesFG.png b/Assets/Misc/Materials/Grapic/TilesFG.png similarity index 100% rename from Assets/Materials/Grapic/TilesFG.png rename to Assets/Misc/Materials/Grapic/TilesFG.png diff --git a/Assets/Materials/Grapic/TilesFG.png.meta b/Assets/Misc/Materials/Grapic/TilesFG.png.meta similarity index 100% rename from Assets/Materials/Grapic/TilesFG.png.meta rename to Assets/Misc/Materials/Grapic/TilesFG.png.meta diff --git a/Assets/Materials/Grapic/bullet.png b/Assets/Misc/Materials/Grapic/bullet.png similarity index 100% rename from Assets/Materials/Grapic/bullet.png rename to Assets/Misc/Materials/Grapic/bullet.png diff --git a/Assets/Materials/Grapic/bullet.png.meta b/Assets/Misc/Materials/Grapic/bullet.png.meta similarity index 100% rename from Assets/Materials/Grapic/bullet.png.meta rename to Assets/Misc/Materials/Grapic/bullet.png.meta diff --git a/Assets/Materials/Grapic/hpSlider.png b/Assets/Misc/Materials/Grapic/hpSlider.png similarity index 100% rename from Assets/Materials/Grapic/hpSlider.png rename to Assets/Misc/Materials/Grapic/hpSlider.png diff --git a/Assets/Materials/Grapic/hpSlider.png.meta b/Assets/Misc/Materials/Grapic/hpSlider.png.meta similarity index 100% rename from Assets/Materials/Grapic/hpSlider.png.meta rename to Assets/Misc/Materials/Grapic/hpSlider.png.meta diff --git a/Assets/Materials/New Folder.meta b/Assets/Misc/Materials/New Folder.meta similarity index 100% rename from Assets/Materials/New Folder.meta rename to Assets/Misc/Materials/New Folder.meta diff --git a/Assets/Materials/physic.meta b/Assets/Misc/Materials/physic.meta similarity index 100% rename from Assets/Materials/physic.meta rename to Assets/Misc/Materials/physic.meta diff --git a/Assets/Materials/physic/no Fric.physicsMaterial2D b/Assets/Misc/Materials/physic/no Fric.physicsMaterial2D similarity index 100% rename from Assets/Materials/physic/no Fric.physicsMaterial2D rename to Assets/Misc/Materials/physic/no Fric.physicsMaterial2D diff --git a/Assets/Materials/physic/no Fric.physicsMaterial2D.meta b/Assets/Misc/Materials/physic/no Fric.physicsMaterial2D.meta similarity index 100% rename from Assets/Materials/physic/no Fric.physicsMaterial2D.meta rename to Assets/Misc/Materials/physic/no Fric.physicsMaterial2D.meta diff --git a/Assets/PauseMenu.cs b/Assets/PauseMenu.cs index 9e04c0f..e1a88ad 100644 --- a/Assets/PauseMenu.cs +++ b/Assets/PauseMenu.cs @@ -10,15 +10,25 @@ public class PauseMenu : MonoBehaviour public GameObject homeObj; public PlayerMovement mov; + private Inputs Input; + private InputAction pause; void Update() { - if (Input.GetKeyDown(KeyCode.Escape)) - { - paused = !paused; - } - ToggleActive(); + pause.performed += _ => ToggleActive(); + } + private void Awake() + { + Input = new Inputs(); + } + private void OnEnable() + { + pause = Input.Movement.Pause; + pause.Enable(); + } + private void OnDisable() + { + pause.Disable(); } - public void ResumeGame() { paused = false; @@ -40,5 +50,6 @@ public class PauseMenu : MonoBehaviour pauseMenu.SetActive(false); Time.timeScale = 1; } + paused = !paused; } } \ No newline at end of file diff --git a/Assets/Prefabs/HPBar.prefab b/Assets/Prefabs/HPBar.prefab index 3a9b595..5ba50c5 100644 --- a/Assets/Prefabs/HPBar.prefab +++ b/Assets/Prefabs/HPBar.prefab @@ -236,7 +236,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 4 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &2387553255586204954 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/HomeBase.unity b/Assets/Scenes/HomeBase.unity index c037b1e..824586b 100644 --- a/Assets/Scenes/HomeBase.unity +++ b/Assets/Scenes/HomeBase.unity @@ -2994,7 +2994,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2c1c5f2ba34023841a9c81badb0c9939, type: 3} m_Name: m_EditorClassIdentifier: - option: 1 + option: -1 --- !u!95 &2136821956 Animator: serializedVersion: 4 diff --git a/Assets/Scenes/Main_Game.unity b/Assets/Scenes/Main_Game.unity index b1e8fdc..3187f5a 100644 --- a/Assets/Scenes/Main_Game.unity +++ b/Assets/Scenes/Main_Game.unity @@ -310,6 +310,141 @@ Rigidbody2D: m_SleepingMode: 0 m_CollisionDetection: 1 m_Constraints: 4 +--- !u!1 &151716505 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 151716506} + - component: {fileID: 151716508} + - component: {fileID: 151716507} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &151716506 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151716505} + 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: 1398686762} + 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: 200, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &151716507 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151716505} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Respawn + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &151716508 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151716505} + m_CullTransparentMesh: 1 --- !u!4 &246738551 stripped Transform: m_CorrespondingSourceObject: {fileID: 8349803369667653187, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3} @@ -350,6 +485,9 @@ MonoBehaviour: empty: {fileID: 11400000, guid: 6da4a08fb9e881948a7b628049337699, type: 2} player: {fileID: 908584569} Camera: {fileID: 96465037} + size: {x: 0, y: 0} + wait: 0 + frog: {fileID: 8398073822777672481, guid: 1c836e7409cac464dba44061d11519ff, type: 3} --- !u!156049354 &344172539 Grid: m_ObjectHideFlags: 0 @@ -481,6 +619,106 @@ GameObject: m_CorrespondingSourceObject: {fileID: 8349803369667653199, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3} m_PrefabInstance: {fileID: 908584568} m_PrefabAsset: {fileID: 0} +--- !u!114 &908584570 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2675006606080146260, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3} + m_PrefabInstance: {fileID: 908584568} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 908584569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e128d9abd8ec5d429909167b9586bc7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &908584573 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8349803369667653188, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3} + m_PrefabInstance: {fileID: 908584568} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 908584569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a238c84151853e1438fb4bf8922712a7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &985049576 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1396214789240199918, guid: 549b615a975c47546b02439c22f08821, type: 3} + m_PrefabInstance: {fileID: 2067542133} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1047273203 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1047273206} + - component: {fileID: 1047273205} + - component: {fileID: 1047273204} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1047273204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1047273203} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1047273205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1047273203} + 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 &1047273206 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1047273203} + 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: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!224 &1398686762 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1396214789460750861, guid: 549b615a975c47546b02439c22f08821, type: 3} + m_PrefabInstance: {fileID: 2067542133} + m_PrefabAsset: {fileID: 0} --- !u!1 &1566909789 GameObject: m_ObjectHideFlags: 0 @@ -696,3 +934,179 @@ Transform: m_Father: {fileID: 344172540} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2042536369 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1396214789491164855, guid: 549b615a975c47546b02439c22f08821, type: 3} + m_PrefabInstance: {fileID: 2067542133} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &2067542133 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1396214789240199918, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159217, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_Name + value: Canvas + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789410159221, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1396214789460751090, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 124789168, guid: 7d9ad5e849e934c4c9fe1f18d9284644, type: 3} + - target: {fileID: 1396214789460751091, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_SpriteState.m_PressedSprite + value: + objectReference: {fileID: 952167119, guid: 82f95a689dac6fa45a602cf7522fdc01, type: 3} + - target: {fileID: 1396214789460751091, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_SpriteState.m_HighlightedSprite + value: + objectReference: {fileID: 622712040, guid: 7d9ad5e849e934c4c9fe1f18d9284644, type: 3} + - target: {fileID: 1396214790945298129, guid: 549b615a975c47546b02439c22f08821, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 1396214790945298133, guid: 549b615a975c47546b02439c22f08821, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 549b615a975c47546b02439c22f08821, type: 3} +--- !u!1 &2132971556 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1396214789410159217, guid: 549b615a975c47546b02439c22f08821, type: 3} + m_PrefabInstance: {fileID: 2067542133} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2132971561 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132971556} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03d7102471452394680cdff3e871ca58, type: 3} + m_Name: + m_EditorClassIdentifier: + pauseMenu: {fileID: 985049576} + homeObj: {fileID: 344172537} + mov: {fileID: 908584573} +--- !u!114 &2132971562 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132971556} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e99a81d30bff3443ab96f8fdea987d7, type: 3} + m_Name: + m_EditorClassIdentifier: + HeartPrefab: {fileID: 3814295357292333890, guid: 48bd85a18b466444d828523869e4a40b, type: 3} + PL_Health: {fileID: 908584570} +--- !u!114 &2132971563 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132971556} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93df0e909d6236742a91e632f0edb389, type: 3} + m_Name: + m_EditorClassIdentifier: + levelReached: {fileID: 2042536369} diff --git a/Assets/Scenes/Main_Game1.unity b/Assets/Scenes/Main_Game1.unity deleted file mode 100644 index 87adaf9..0000000 --- a/Assets/Scenes/Main_Game1.unity +++ /dev/null @@ -1,449 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 3 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 0 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &924561539 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 924561544} - - component: {fileID: 924561543} - - component: {fileID: 924561540} - - component: {fileID: 924561542} - - component: {fileID: 924561541} - m_Layer: 6 - m_Name: Foreground - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1839735485 &924561540 -Tilemap: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 924561539} - m_Enabled: 1 - m_Tiles: {} - m_AnimatedTiles: {} - m_TileAssetArray: - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - m_TileSpriteArray: - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - m_TileMatrixArray: - - m_RefCount: 0 - m_Data: - e00: 0 - e01: 0 - e02: 8.081546e-39 - e03: 8.081546e-39 - e10: 0 - e11: 0 - e12: 4.93e-43 - e13: 4.93e-43 - e20: -1.4697831e+37 - e21: 1e-45 - e22: -2.2991754e-19 - e23: -8.920695e+9 - e30: 4.5904e-41 - e31: 0 - e32: 4.93e-43 - e33: 4.96e-43 - m_TileColorArray: - - m_RefCount: 0 - m_Data: {r: 3.5313e-41, g: 3.5313e-41, b: 3.5313e-41, a: 3.5313e-41} - m_TileObjectToInstantiateArray: [] - m_AnimationFrameRate: 1 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: -7, y: -9, z: 0} - m_Size: {x: 15, y: 15, z: 1} - m_TileAnchor: {x: 0.5, y: 0.5, z: 0} - m_TileOrientation: 0 - m_TileOrientationMatrix: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 ---- !u!50 &924561541 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 924561539} - m_BodyType: 1 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_Interpolate: 1 - m_SleepingMode: 0 - m_CollisionDetection: 1 - m_Constraints: 7 ---- !u!19719996 &924561542 -TilemapCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 924561539} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_MaximumTileChangeCount: 1000 - m_ExtrusionFactor: 0.00001 ---- !u!483693784 &924561543 -TilemapRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 924561539} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_ChunkSize: {x: 32, y: 32, z: 32} - m_ChunkCullingBounds: {x: 0, y: 0, z: 0} - m_MaxChunkCount: 16 - m_MaxFrameAge: 16 - m_SortOrder: 0 - m_Mode: 0 - m_DetectChunkCullingBounds: 0 - m_MaskInteraction: 0 ---- !u!4 &924561544 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 924561539} - 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: 949487200} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &949487197 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 949487200} - - component: {fileID: 949487199} - - component: {fileID: 949487201} - m_Layer: 0 - m_Name: Generated map - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!156049354 &949487199 -Grid: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 949487197} - m_Enabled: 1 - m_CellSize: {x: 8, y: 8, z: 1} - m_CellGap: {x: 0, y: 0, z: 0} - m_CellLayout: 0 - m_CellSwizzle: 0 ---- !u!4 &949487200 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 949487197} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.8188415, y: 1.7402658, z: -1.1158032} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1426128976} - - {fileID: 924561544} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &949487201 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 949487197} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ca3b740468fd1ff4aa519d6585cc38a0, type: 3} - m_Name: - m_EditorClassIdentifier: - Rule: {fileID: 11400000, guid: fef1fa7ffa6e147498b1a88042071554, type: 2} - map: {fileID: 924561540} - empty: {fileID: 11400000, guid: 6da4a08fb9e881948a7b628049337699, type: 2} - player: {fileID: 0} - Camera: {fileID: 0} ---- !u!1 &1426128975 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1426128976} - - component: {fileID: 1426128977} - m_Layer: 0 - m_Name: palette - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1426128976 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1426128975} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -2, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 949487200} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1426128977 -BoxCollider: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1426128975} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 10, y: 1, z: 0} - m_Center: {x: 4.5, y: 0, z: 0} diff --git a/Assets/Scripts/Bullet.cs b/Assets/Scripts/Bullet.cs index 78267fa..0af87af 100644 --- a/Assets/Scripts/Bullet.cs +++ b/Assets/Scripts/Bullet.cs @@ -8,10 +8,20 @@ public class Bullet : MonoBehaviour [System.NonSerialized]public int setDmg; private int Damage; [System.NonSerialized]public string OwnTag; + private float wait; private void Start() { Damage = setDmg; rb.AddForce((Vector2)(Quaternion.Euler(0,0,rb.rotation) * Vector2.right) * 100, ForceMode2D.Impulse); + wait = 10; + } + private void FixedUpdate() + { + wait -= Time.deltaTime; + if(wait <= 0) + { + GameObject.Destroy(gameObject); + } } private void OnTriggerEnter2D(Collider2D other) { diff --git a/Assets/Scripts/GameOverScreen.cs b/Assets/Scripts/GameOverScreen.cs index fb34056..68f877e 100644 --- a/Assets/Scripts/GameOverScreen.cs +++ b/Assets/Scripts/GameOverScreen.cs @@ -2,14 +2,15 @@ using UnityEngine.UI; using UnityEngine.SceneManagement; using System.Collections; using UnityEngine; +using TMPro; public class GameOverScreen : MonoBehaviour { - public Text levelReached; + public TMP_Text levelReached; public void Setup(int score) { - gameObject.SetActive(true); + transform.Find("BackGround").gameObject.SetActive(true); levelReached.text = score.ToString() + " LEVEL"; } diff --git a/Assets/Scripts/Health.cs b/Assets/Scripts/Health.cs index bb56453..671ba7c 100644 --- a/Assets/Scripts/Health.cs +++ b/Assets/Scripts/Health.cs @@ -7,7 +7,7 @@ public class Health : MonoBehaviour public int PreHP; public int MaxHP {get; private set;} public int Hp {get; private set;} - private void Start() + private void Start() { MaxHP = PreHP; Hp = MaxHP; @@ -34,7 +34,11 @@ public class Health : MonoBehaviour { GameObject.Destroy(gameObject); } - Debug.Log("Dead"); + if(gameObject.CompareTag("Player")) + { + GameObject.Find("Canvas").GetComponent().Setup(0); + GameObject.Find("Canvas").GetComponent().die(); + } } if(Hp > MaxHP) { diff --git a/Assets/Scripts/HeartScript.cs b/Assets/Scripts/HeartScript.cs index 82f4701..8701f82 100644 --- a/Assets/Scripts/HeartScript.cs +++ b/Assets/Scripts/HeartScript.cs @@ -30,6 +30,14 @@ public class HeartScript : MonoBehaviour Hearts[Hearts.Count-1].GetComponent().anchoredPosition3D = new Vector3(5 + ((Hearts.Count-1) * 53), -5, 0); //.HeartStrength += 13; } + public void die() + { + foreach(var item in Hearts) + { + GameObject.Destroy(item); + } + Hearts.Clear(); + } } diff --git a/Assets/Scripts/Interactable.cs b/Assets/Scripts/Interactable.cs index 9987be6..284b9ab 100644 --- a/Assets/Scripts/Interactable.cs +++ b/Assets/Scripts/Interactable.cs @@ -18,7 +18,7 @@ public class Interactable : MonoBehaviour } public void M0() { - SceneManager.LoadScene(1); + SceneManager.LoadScene(2); } public void M1() { diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index 5a3b37e..7acb743 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -6,7 +6,7 @@ using UnityEngine.InputSystem; public class PlayerMovement : MonoBehaviour { - private Rigidbody2D rb; + public Rigidbody2D rb; private Transform Gr; private Animator Ani; private Inputs Input; diff --git a/Assets/Scripts/play.cs b/Assets/Scripts/play.cs index eb6e11d..7d7b36b 100644 --- a/Assets/Scripts/play.cs +++ b/Assets/Scripts/play.cs @@ -9,7 +9,7 @@ public class play : MonoBehaviour // Start is called before the first frame update public void PlayButton() { - SceneManager.LoadScene("Main_Game"); + SceneManager.LoadScene(1); } } diff --git a/Assets/Scripts/rectangleroomgen.cs b/Assets/Scripts/rectangleroomgen.cs index 2a3501e..5ab39c6 100644 --- a/Assets/Scripts/rectangleroomgen.cs +++ b/Assets/Scripts/rectangleroomgen.cs @@ -11,10 +11,13 @@ public class rectangleroomgen : MonoBehaviour public TileBase empty; public GameObject player; public GameObject Camera; + public Vector2Int size; + public float wait; + public GameObject frog; void Start() { System.Random ran = new System.Random(); - Vector2Int size = new Vector2Int(ran.Next(25, 50), ran.Next(10, 25)); + size = new Vector2Int(ran.Next(25, 50), ran.Next(10, 25)); for (int x = 0; x < size.x+22; x++) { for (int y = 0; y < size.y+22; y++) @@ -29,6 +32,16 @@ public class rectangleroomgen : MonoBehaviour map.SetTile(new Vector3Int(x, y, 0), empty); } } - player.transform.position = new Vector3((size.x)*8, (size.y)*8, 0); + player.transform.position = new Vector3((size.x)*8, (size.y)*8+11, 0); + Camera.transform.position = new Vector3((size.x)*8, (size.y)*8, -10); + } + void Update() + { + wait -= Time.deltaTime; + if(wait <= 0) + { + GameObject.Instantiate(frog, new Vector3(Random.Range(0, 12*8+size.x*8), 15*8, 0), new Quaternion()); + wait = Random.Range(1, 10); + } } } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 0e36f31..e062171 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,6 +5,9 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: + - enabled: 1 + path: Assets/Scenes/Main_Menu.unity + guid: 3ef2311b70b58bb44af47fddce5544c2 - enabled: 1 path: Assets/Scenes/HomeBase.unity guid: 53d6b7f3be8e00a48919e2079eb20e20 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 392fe96..f0ea650 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,10 +12,16 @@ EditorUserSettings: value: 545004020704080b0b0a0d2048270c44124f1b782d2a24607c794f64e6e4646f flags: 0 RecentlyUsedSceneGuid-2: - value: 02095251535050595d5e0f2311735c44124f1c2e7b7077667f7e4560b7b3306b + value: 5602505007020f080f0b542740735e444e4e4973297a7667742c1f61b2e56668 flags: 0 RecentlyUsedSceneGuid-3: - value: 5602505007020f080f0b542740735e444e4e4973297a7667742c1f61b2e56668 + value: 0508030352075a085a565a7b41200f44431619287e2925342e2f1b6ae3b86439 + flags: 0 + RecentlyUsedSceneGuid-4: + value: 50545254560458595a5e0e7748215d4442161e7e7b2e22342e2c4866b6b4376a + flags: 0 + RecentlyUsedSceneGuid-5: + value: 02095251535050595d5e0f2311735c44124f1c2e7b7077667f7e4560b7b3306b flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index a313c47..810649b 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -8,7 +8,7 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: @@ -21,7 +21,7 @@ MonoBehaviour: m_ShowMode: 4 m_Title: Inspector m_RootView: {fileID: 2} - m_MinSize: {x: 875, y: 421} + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 @@ -120,7 +120,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 44 + controlID: 198 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -140,8 +140,8 @@ MonoBehaviour: y: 0 width: 304 height: 947 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} @@ -171,7 +171,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 64 + controlID: 199 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -182,7 +182,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -193,13 +193,13 @@ MonoBehaviour: height: 661 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} - {fileID: 17} - {fileID: 14} - m_Selected: 2 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 2 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -314,9 +314,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 22650000 - m_LastClickedID: 0 - m_ExpandedIDs: e0f3ffffeaf3ffff04f4ffff0ef4ffff76f7ffff8afaffffd46b0000 + m_SelectedIDs: 88e6ffff + m_LastClickedID: -6520 + m_ExpandedIDs: 90e6ffff94e6ffff9ee6ffffd8e6ffff1ce7ffff66ecffff52edffffa8efffffecf3ffffd6f4ffffbaf7ffffc86c0000dc6c0000a4890000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -332,7 +332,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 6} + m_ClientGUIView: {fileID: 9} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -620,9 +620,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 790.7866, y: 68.00994, z: 13.217382} + m_Target: {x: -2.787229, y: 1.5874425, z: -5.8631196} speed: 2 - m_Value: {x: 790.7866, y: 68.00994, z: 13.217382} + m_Value: {x: -2.787229, y: 1.5874425, z: -5.8631196} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -673,9 +673,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 751.53906 + m_Target: 59.026447 speed: 2 - m_Value: 751.53906 + m_Value: 59.026447 m_Ortho: m_Target: 1 speed: 2 @@ -763,7 +763,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -835,22 +835,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Materials/Grapic + - Assets m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Materials/Grapic + - Assets m_LastFoldersGridSize: -1 m_LastProjectPath: D:\repos\WIP\RatAttack2D m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 02700000 - m_LastClickedID: 28674 - m_ExpandedIDs: 00000000b667000012680000027000001270000000ca9a3b + scrollPos: {x: 0, y: 31} + m_SelectedIDs: 08620000 + m_LastClickedID: 25096 + m_ExpandedIDs: 000000000862000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -878,7 +878,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000b6670000 + m_ExpandedIDs: 000000000862000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -964,7 +964,7 @@ MonoBehaviour: m_SaveData: [] m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -3068 + m_LastSelectedObjectID: 36130 --- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52