diff --git a/Assets/New Controls.inputactions b/Assets/New Controls.inputactions new file mode 100644 index 0000000..b85fd32 --- /dev/null +++ b/Assets/New Controls.inputactions @@ -0,0 +1,34 @@ +{ + "name": "New Controls", + "maps": [ + { + "name": "New action map", + "id": "bf61a038-b960-48ee-9114-b9574f4cef81", + "actions": [ + { + "name": "OpenMenu", + "type": "Button", + "id": "a8f4370e-8370-4f86-aab8-ab35fb5ca08a", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "", + "id": "cf9ed600-533e-454f-83db-024620c96b2f", + "path": "/escape", + "interactions": "", + "processors": "", + "groups": "", + "action": "OpenMenu", + "isComposite": false, + "isPartOfComposite": false + } + ] + } + ], + "controlSchemes": [] +} \ No newline at end of file diff --git a/Assets/New Controls.inputactions.meta b/Assets/New Controls.inputactions.meta new file mode 100644 index 0000000..be12f5f --- /dev/null +++ b/Assets/New Controls.inputactions.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: 9cff588dd0af0e4478403a125b182a74 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} + generateWrapperCode: 0 + wrapperCodePath: + wrapperClassName: + wrapperCodeNamespace: diff --git a/Assets/Prefabs/Octi.prefab b/Assets/Prefabs/Octi.prefab index 10a1df4..a45cb58 100644 --- a/Assets/Prefabs/Octi.prefab +++ b/Assets/Prefabs/Octi.prefab @@ -1,5 +1,242 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &221332657431378024 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3858806091884245688} + - component: {fileID: 755294660751213025} + - component: {fileID: 6836387967413750195} + - component: {fileID: 7501746198561101504} + m_Layer: 5 + m_Name: Menu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3858806091884245688 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 221332657431378024} + 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: 4841437081073998575} + - {fileID: 2417480847591571074} + - {fileID: 7831567516574179855} + m_Father: {fileID: 2536151851006579706} + m_RootOrder: 5 + 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 &755294660751213025 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 221332657431378024} + 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 &6836387967413750195 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 221332657431378024} + 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 &7501746198561101504 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 221332657431378024} + 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 &2530703253248035732 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2417480847591571074} + - component: {fileID: 1235064319571568431} + - component: {fileID: 4605883650499804887} + - component: {fileID: 9177795961602850774} + m_Layer: 5 + m_Name: About us + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2417480847591571074 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2530703253248035732} + 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: 318762176683266902} + m_Father: {fileID: 3858806091884245688} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -75} + m_SizeDelta: {x: 200.3397, y: 66.978} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &1235064319571568431 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2530703253248035732} + m_CullTransparentMesh: 1 +--- !u!114 &4605883650499804887 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2530703253248035732} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &9177795961602850774 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2530703253248035732} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 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: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4605883650499804887} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3618156409006635097} + m_TargetAssemblyTypeName: MenuBtns, Assembly-CSharp + m_MethodName: OpenWebsite + 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 &2536151849578768862 GameObject: m_ObjectHideFlags: 0 @@ -162,6 +399,7 @@ GameObject: - component: {fileID: 2536151851006579704} - component: {fileID: 2536151851006579687} - component: {fileID: 2678524182628773919} + - component: {fileID: 3618156409006635097} m_Layer: 0 m_Name: Octi m_TagString: Untagged @@ -186,6 +424,7 @@ Transform: - {fileID: 3166052532663434672} - {fileID: 6204321295710717638} - {fileID: 1036653068050613255} + - {fileID: 3858806091884245688} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -338,6 +577,22 @@ MonoBehaviour: m_CallState: 2 m_ActionId: 54f4acb8-f8be-41ca-bf05-30f9bfe125be m_ActionName: Player/New action + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3618156409006635097} + m_TargetAssemblyTypeName: MenuBtns, Assembly-CSharp + m_MethodName: OpenMenu + m_Mode: 0 + 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 + m_ActionId: 05190438-f181-45ed-ac3e-1fdab723ef0b + m_ActionName: Player/OpenMenu[/Keyboard/escape] m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: m_DefaultActionMap: Player @@ -361,10 +616,10 @@ MonoBehaviour: Octi: {fileID: 2536151849578768862} joystick: {fileID: 0} input: {fileID: 2536151851006579704} - buoyancy: 0 - time: 0 - poziom: 0 - cos: 0 + gfxPos: {x: 0, y: 0, z: 0} + amplitude: 1 + heightOffset: 1 + isInWater: 0 --- !u!114 &2678524182628773919 MonoBehaviour: m_ObjectHideFlags: 0 @@ -397,10 +652,26 @@ MonoBehaviour: - {fileID: 5652014752892001194} - {fileID: 8702927800494969952} - {fileID: 4864130303169909682} - - {fileID: 5693951074468499527} - - {fileID: 1610789504160731573} + - {fileID: 0} + - {fileID: 0} SeedNumber: 0 + effects: [] Bundle: {fileID: 3821979042091807854} + nextClick: 0 +--- !u!114 &3618156409006635097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2536151851006579686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faf690026dd23d0449f02227e33c3302, type: 3} + m_Name: + m_EditorClassIdentifier: + menu: {fileID: 221332657431378024} + website: https://flyingoctopus.pl --- !u!1 &2648452216120165263 GameObject: m_ObjectHideFlags: 0 @@ -484,6 +755,486 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &2683884977835383627 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 788132422411720566} + - component: {fileID: 7794169809962762792} + - component: {fileID: 1409460990748665453} + 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 &788132422411720566 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2683884977835383627} + 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: 7831567516574179855} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7794169809962762792 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2683884977835383627} + m_CullTransparentMesh: 1 +--- !u!114 &1409460990748665453 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2683884977835383627} + 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: Exit game + 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: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 2 + m_VerticalAlignment: 512 + 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!1 &6050208706902920479 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4841437081073998575} + - component: {fileID: 3280806247213840188} + - component: {fileID: 8973474365048587448} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4841437081073998575 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6050208706902920479} + 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: 3858806091884245688} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3280806247213840188 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6050208706902920479} + m_CullTransparentMesh: 1 +--- !u!114 &8973474365048587448 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6050208706902920479} + 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.9433962, g: 0.85884655, b: 0.91510767, a: 0.16862746} + 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!1 &8413729371283258688 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 318762176683266902} + - component: {fileID: 3256314068357962111} + - component: {fileID: 2187226215482844633} + 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 &318762176683266902 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8413729371283258688} + 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: 2417480847591571074} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3256314068357962111 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8413729371283258688} + m_CullTransparentMesh: 1 +--- !u!114 &2187226215482844633 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8413729371283258688} + 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: About us + 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: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 2 + m_VerticalAlignment: 512 + 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!1 &8792914776881880607 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7831567516574179855} + - component: {fileID: 8936923528719224352} + - component: {fileID: 7787847821620092355} + - component: {fileID: 3610545807648728805} + m_Layer: 5 + m_Name: Exit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7831567516574179855 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8792914776881880607} + 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: 788132422411720566} + m_Father: {fileID: 3858806091884245688} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -155} + m_SizeDelta: {x: 200.3397, y: 66.978} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &8936923528719224352 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8792914776881880607} + m_CullTransparentMesh: 1 +--- !u!114 &7787847821620092355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8792914776881880607} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3610545807648728805 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8792914776881880607} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 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: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7787847821620092355} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3618156409006635097} + m_TargetAssemblyTypeName: MenuBtns, Assembly-CSharp + m_MethodName: Exit + 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!1001 &3841708549794958711 PrefabInstance: m_ObjectHideFlags: 0 @@ -1462,18 +2213,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5205433477833699948} m_PrefabAsset: {fileID: 0} ---- !u!114 &1610789504160731573 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6802624213587436505, guid: ae784573beaea5041b5e85a92e9f1f28, - type: 3} - m_PrefabInstance: {fileID: 5205433477833699948} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &3166052532663434672 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7191542899397693404, guid: ae784573beaea5041b5e85a92e9f1f28, @@ -1504,18 +2243,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &5693951074468499527 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 520606105967141419, guid: ae784573beaea5041b5e85a92e9f1f28, - type: 3} - m_PrefabInstance: {fileID: 5205433477833699948} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &7196730374057337371 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3162237283420573815, guid: ae784573beaea5041b5e85a92e9f1f28, diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 3d48887..c473ebb 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -7349,7 +7349,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} - m_LocalRotation: {x: 0.22975291, y: 0.000000018722702, z: -0.00000000441983, w: 0.973249} + m_LocalRotation: {x: 0.22975291, y: -0.000000018722702, z: 0.00000000441983, w: 0.973249} m_LocalPosition: {x: 0, y: 6.2, z: -24} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -7583,7 +7583,7 @@ Light: serializedVersion: 10 m_Type: 1 m_Shape: 0 - m_Color: {r: 0.92633814, g: 0.7109212, b: 0.39373946, a: 1} + m_Color: {r: 0.68235296, g: 0.68235296, b: 0.68235296, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -7641,7 +7641,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 410087039} - m_LocalRotation: {x: 0.086435504, y: 0.12781145, z: 0.98796165, w: -0.01118206} + m_LocalRotation: {x: 0.07894813, y: 0.4220343, z: 0.9023807, w: -0.03692324} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -50500,7 +50500,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1756623393} - m_LocalRotation: {x: 0.22975291, y: 0.000000018722702, z: -0.00000000441983, w: 0.973249} + m_LocalRotation: {x: 0.22975291, y: -0.000000018722702, z: 0.00000000441983, w: 0.973249} m_LocalPosition: {x: 0, y: 6.2, z: -24} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -57630,6 +57630,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 755294660751213025, guid: 75b20c87c4b02cd47b2af8e5210d29d3, + type: 3} + propertyPath: m_AdditionalShaderChannelsFlag + value: 25 + objectReference: {fileID: 0} - target: {fileID: 1016432166350708329, guid: 75b20c87c4b02cd47b2af8e5210d29d3, type: 3} propertyPath: m_AnchorMax.y @@ -58330,6 +58335,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 3858806091884245688, guid: 75b20c87c4b02cd47b2af8e5210d29d3, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} - target: {fileID: 3873892390247194716, guid: 75b20c87c4b02cd47b2af8e5210d29d3, type: 3} propertyPath: m_AnchorMax.y @@ -58420,6 +58430,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4841437081073998575, guid: 75b20c87c4b02cd47b2af8e5210d29d3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4841437081073998575, guid: 75b20c87c4b02cd47b2af8e5210d29d3, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4927409626879451480, guid: 75b20c87c4b02cd47b2af8e5210d29d3, type: 3} propertyPath: m_AnchorMax.y diff --git a/Assets/Scripts/MenuBtns.cs b/Assets/Scripts/MenuBtns.cs new file mode 100644 index 0000000..54c3029 --- /dev/null +++ b/Assets/Scripts/MenuBtns.cs @@ -0,0 +1,27 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.InputSystem; + +public class MenuBtns : MonoBehaviour { + [SerializeField] private GameObject menu; + private bool menuActive = false; + [SerializeField] private string website; + + public void OpenMenu(InputAction.CallbackContext context) { + if (context.performed) { + if (menuActive) menuActive = false; + else menuActive = true; + + menu.SetActive(menuActive); + } + } + + public void Exit() { + Application.Quit(); + } + + public void OpenWebsite() { + Application.OpenURL(website); + } +} diff --git a/Assets/Scripts/MenuBtns.cs.meta b/Assets/Scripts/MenuBtns.cs.meta new file mode 100644 index 0000000..f2e4fa6 --- /dev/null +++ b/Assets/Scripts/MenuBtns.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: faf690026dd23d0449f02227e33c3302 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Settings/AlliumInput.inputactions b/Assets/Settings/AlliumInput.inputactions index b445a44..4cbbae1 100644 --- a/Assets/Settings/AlliumInput.inputactions +++ b/Assets/Settings/AlliumInput.inputactions @@ -40,6 +40,15 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "OpenMenu", + "type": "Button", + "id": "05190438-f181-45ed-ac3e-1fdab723ef0b", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -361,6 +370,17 @@ "action": "ChangeSlot", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "fd1ce4c9-de6d-480d-b96f-0625ee9c0dd6", + "path": "/escape", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "OpenMenu", + "isComposite": false, + "isPartOfComposite": false } ] }, diff --git a/Assets/SkySeries Freebie/DayInTheClouds.mat b/Assets/SkySeries Freebie/DayInTheClouds.mat index 96d8bb9..269790d 100644 --- a/Assets/SkySeries Freebie/DayInTheClouds.mat +++ b/Assets/SkySeries Freebie/DayInTheClouds.mat @@ -84,5 +84,5 @@ Material: m_Colors: - _Color: {r: 0.3137255, g: 0.3019608, b: 0.3137255, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _Tint: {r: 0.41941357, g: 0.3288782, b: 0.5572409, a: 1} + - _Tint: {r: 0.05712098, g: 0.22458196, b: 0.35296234, a: 1} m_BuildTextureStacks: [] diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 621b6c1..f2d7e32 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -17,7 +17,7 @@ MonoBehaviour: x: 0 y: 43 width: 1920 - height: 1007 + height: 997 m_ShowMode: 4 m_Title: Hierarchy m_RootView: {fileID: 2} @@ -45,7 +45,7 @@ MonoBehaviour: x: 0 y: 0 width: 1920 - height: 1007 + height: 997 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -90,7 +90,7 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 987 + y: 977 width: 1920 height: 20 m_MinSize: {x: 0, y: 0} @@ -115,11 +115,11 @@ MonoBehaviour: x: 0 y: 30 width: 1920 - height: 957 + height: 947 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 38577 + controlID: 16 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1457 - height: 957 + width: 1541 + height: 947 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 38578 + controlID: 17 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1457 - height: 612 + width: 1541 + height: 561 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 38579 + controlID: 18 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,8 +187,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 347 - height: 612 + width: 294 + height: 561 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} @@ -206,24 +206,23 @@ 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: serializedVersion: 2 - x: 347 + x: 294 y: 0 - width: 1110 - height: 612 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 14} + width: 1247 + height: 561 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} - {fileID: 14} - - {fileID: 17} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -242,13 +241,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 612 - width: 1457 - height: 345 + y: 561 + width: 1541 + height: 386 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 38522 + controlID: 122 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -266,13 +265,13 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 839 - height: 345 + width: 997 + height: 386 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 18} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 --- !u!114 &12 @@ -290,15 +289,15 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 839 + x: 997 y: 0 - width: 618 - height: 345 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 19} + width: 544 + height: 386 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 19} + - {fileID: 18} m_Selected: 0 m_LastSelected: 0 --- !u!114 &13 @@ -316,19 +315,20 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1457 + x: 1541 y: 0 - width: 463 - height: 957 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 20} + width: 379 + height: 947 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 19} m_Panes: + - {fileID: 19} - {fileID: 20} - {fileID: 21} - {fileID: 22} m_Selected: 0 - m_LastSelected: 1 + m_LastSelected: 2 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -350,10 +350,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 347 + x: 294 y: 73 - width: 1108 - height: 591 + width: 1245 + height: 540 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -364,7 +364,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1108, y: 570} + m_TargetSize: {x: 1245, y: 519} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -379,10 +379,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -554 - m_HBaseRangeMax: 554 - m_VBaseRangeMin: -285 - m_VBaseRangeMax: 285 + m_HBaseRangeMin: -622.5 + m_HBaseRangeMax: 622.5 + m_VBaseRangeMin: -259.5 + m_VBaseRangeMax: 259.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -400,23 +400,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1108 - height: 570 + width: 1245 + height: 519 m_Scale: {x: 1, y: 1} - m_Translation: {x: 554, y: 285} + m_Translation: {x: 622.5, y: 259.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -554 - y: -285 - width: 1108 - height: 570 + x: -622.5 + y: -259.5 + width: 1245 + height: 519 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1108, y: 591} + m_LastWindowPixelSize: {x: 1245, y: 540} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -445,8 +445,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 346 - height: 591 + width: 293 + height: 540 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -456,7 +456,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 761df6ffbadeffffdcdeffffe0deffff46faffff4afaffff08fbffff + m_ExpandedIDs: 0296ffff0cfbffff3c910000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -501,10 +501,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 347 + x: 294 y: 73 - width: 1108 - height: 591 + width: 1245 + height: 540 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -712,9 +712,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 0 - snapOffset: {x: -231, y: -197} + snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 3 + snapCorner: 0 id: Scene View/Particles index: 10 layout: 4 @@ -723,14 +723,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 50.20118, y: 4.022616, z: -36.093487} + m_Target: {x: 537.97107, y: 292.7337, z: 2.9264266} speed: 2 - m_Value: {x: 50.20118, y: 4.022616, z: -36.093487} + m_Value: {x: 724.8902, y: 320.0115, z: -2.1146183} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -777,20 +777,20 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.19110806, y: -0.14872172, z: 0.029127715, w: 0.96978974} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: 0.19110988, y: -0.14872314, z: 0.02912799, w: 0.9697989} + m_Value: {x: 0.000000026849438, y: 0.000000059542817, z: -0.000000015102016, w: 1.0000001} m_Size: - m_Target: 1.6993111 + m_Target: 336.1272 speed: 2 - m_Value: 1.6993111 + m_Value: 375.83246 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: - m_Speed: 1 - m_SpeedNormalized: 0.5 + m_Speed: 0.58071 + m_SpeedNormalized: 0.29 m_SpeedMin: 0.001 m_SpeedMax: 2 m_EasingEnabled: 1 @@ -801,70 +801,14 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.07439698, y: 0.052774683, z: -0.004038816, w: 0.995824} + m_LastSceneViewRotation: {x: 0.2142827, y: 0.4752053, z: -0.12052766, w: 0.8448429} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: - m_SceneVisActive: 1 + m_SceneVisActive: 0 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 --- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 13854, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 310, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Project Settings - m_Image: {fileID: -5712115415447495865, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 347 - y: 73 - width: 1108 - height: 591 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_PosLeft: {x: 0, y: 0} - m_PosRight: {x: 0, y: 235} - m_Scope: 1 - m_SplitterFlex: 0.2 - m_SearchText: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: d7dddea2 - m_LastClickedID: -1562452521 - m_ExpandedIDs: a01a5fa653336be200000000c53aba5a - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: ---- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -886,9 +830,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 685 - width: 838 - height: 324 + y: 634 + width: 996 + height: 365 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -906,22 +850,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/SkySeries Freebie + - Assets m_Globs: [] m_OriginalText: m_ViewMode: 1 - m_StartGridSize: 71 + m_StartGridSize: 64 m_LastFolders: - - Assets/SkySeries Freebie - m_LastFoldersGridSize: 71 - m_LastProjectPath: C:\Programowanie\UnityC\Allium + - Assets + m_LastFoldersGridSize: -1 + m_LastProjectPath: C:\Users\Oliwia\workspace\private\unity\Allium\Allium m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 48} - m_SelectedIDs: d6840000 - m_LastClickedID: 34006 - m_ExpandedIDs: 0000000060830000628300006483000066830000688300006a8300006c8300006e83000070830000728300007c830000eaf40300 + scrollPos: {x: 0, y: 0} + m_SelectedIDs: b8850000 + m_LastClickedID: 34232 + m_ExpandedIDs: 00000000b885000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -949,7 +893,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000060830000628300006483000066830000688300006a8300006c8300006e83000072830000eaf40300 + m_ExpandedIDs: 00000000b8850000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -977,7 +921,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000987601001c9f050000000000 + m_ExpandedInstanceIDs: c6230000987601001c9f0500ec620000c2c700009cc70000b6820000000000007ec50000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1002,10 +946,10 @@ MonoBehaviour: m_ResourceFile: m_NewAssetIndexInList: -1 m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 71 + m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &19 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1026,15 +970,15 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 839 - y: 685 - width: 616 - height: 324 + x: 997 + y: 634 + width: 542 + height: 365 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &20 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1055,10 +999,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1457 + x: 1541 y: 73 - width: 462 - height: 936 + width: 378 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1066,7 +1010,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: -160 + m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 @@ -1076,7 +1020,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &21 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1097,10 +1041,39 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1457 + x: 1541 + y: 73 + width: 378 + height: 926 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] +--- !u!114 &21 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12141, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 300, y: 360} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Navigation + m_Image: {fileID: 1087843850482249999, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1541 y: 73 - width: 462 - height: 936 + width: 378 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1126,10 +1099,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1457 + x: 1541 y: 73 - width: 462 - height: 936 + width: 378 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default