From d46c162a91fbc93c7b637d9d69f501f35ab5993a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christer=20War=C3=A9n?= Date: Tue, 25 Feb 2020 00:24:19 +0200 Subject: [PATCH 1/3] Fixes to Menu & Exit Game-button --- Jump Game/Assets/Scenes/Scene0_Intro.unity | 521 ------------------ .../Assets/Scenes/Scene0_Intro.unity.meta | 7 - .../{Scene1_Menu.unity => Scene0_Menu.unity} | 95 +++- ...Menu.unity.meta => Scene0_Menu.unity.meta} | 0 ...2_Prologue.unity => Scene1_Prologue.unity} | 0 ....unity.meta => Scene1_Prologue.unity.meta} | 0 .../{Scene3_Game.unity => Scene2_Game.unity} | 0 ...Game.unity.meta => Scene2_Game.unity.meta} | 0 ...cene4_Ending.unity => Scene3_Ending.unity} | 2 +- ...ng.unity.meta => Scene3_Ending.unity.meta} | 0 Jump Game/Assets/Scripts/Menu/Menu_Buttons.cs | 7 +- .../ProjectSettings/EditorBuildSettings.asset | 14 +- .../ProjectSettings/GraphicsSettings.asset | 4 + .../ProjectSettings/ProjectSettings.asset | 22 +- .../UnityConnectSettings.asset | 2 +- 15 files changed, 106 insertions(+), 568 deletions(-) delete mode 100644 Jump Game/Assets/Scenes/Scene0_Intro.unity delete mode 100644 Jump Game/Assets/Scenes/Scene0_Intro.unity.meta rename Jump Game/Assets/Scenes/{Scene1_Menu.unity => Scene0_Menu.unity} (98%) rename Jump Game/Assets/Scenes/{Scene1_Menu.unity.meta => Scene0_Menu.unity.meta} (100%) rename Jump Game/Assets/Scenes/{Scene2_Prologue.unity => Scene1_Prologue.unity} (100%) rename Jump Game/Assets/Scenes/{Scene2_Prologue.unity.meta => Scene1_Prologue.unity.meta} (100%) rename Jump Game/Assets/Scenes/{Scene3_Game.unity => Scene2_Game.unity} (100%) rename Jump Game/Assets/Scenes/{Scene3_Game.unity.meta => Scene2_Game.unity.meta} (100%) rename Jump Game/Assets/Scenes/{Scene4_Ending.unity => Scene3_Ending.unity} (99%) rename Jump Game/Assets/Scenes/{Scene4_Ending.unity.meta => Scene3_Ending.unity.meta} (100%) diff --git a/Jump Game/Assets/Scenes/Scene0_Intro.unity b/Jump Game/Assets/Scenes/Scene0_Intro.unity deleted file mode 100644 index 627f2f0..0000000 --- a/Jump Game/Assets/Scenes/Scene0_Intro.unity +++ /dev/null @@ -1,521 +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: 11 - 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_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 ---- !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 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &82312132 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 82312135} - - component: {fileID: 82312134} - - component: {fileID: 82312133} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &82312133 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 82312132} - m_Enabled: 1 ---- !u!20 &82312134 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 82312132} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &82312135 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 82312132} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1351550192 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1351550193} - - component: {fileID: 1351550195} - - component: {fileID: 1351550194} - m_Layer: 5 - m_Name: Panel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1351550193 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1351550192} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1964982300} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1351550194 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1351550192} - 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: 0.392} - m_RaycastTarget: 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!222 &1351550195 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1351550192} - m_CullTransparentMesh: 0 ---- !u!1 &1809286135 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1809286138} - - component: {fileID: 1809286137} - - component: {fileID: 1809286136} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1809286136 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1809286135} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &1809286137 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1809286135} - 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 &1809286138 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1809286135} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1924207295 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1924207296} - - component: {fileID: 1924207298} - - component: {fileID: 1924207297} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1924207296 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1924207295} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1964982300} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 500, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1924207297 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1924207295} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 80 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 200 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: ALKU ---- !u!222 &1924207298 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1924207295} - m_CullTransparentMesh: 0 ---- !u!1 &1964982296 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1964982300} - - component: {fileID: 1964982299} - - component: {fileID: 1964982298} - - component: {fileID: 1964982297} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1964982297 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1964982296} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1964982298 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1964982296} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 ---- !u!223 &1964982299 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1964982296} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &1964982300 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1964982296} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 1351550193} - - {fileID: 1924207296} - m_Father: {fileID: 0} - m_RootOrder: 1 - 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} diff --git a/Jump Game/Assets/Scenes/Scene0_Intro.unity.meta b/Jump Game/Assets/Scenes/Scene0_Intro.unity.meta deleted file mode 100644 index 5396eb2..0000000 --- a/Jump Game/Assets/Scenes/Scene0_Intro.unity.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c8743125976b178409644aef4ab34eef -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Jump Game/Assets/Scenes/Scene1_Menu.unity b/Jump Game/Assets/Scenes/Scene0_Menu.unity similarity index 98% rename from Jump Game/Assets/Scenes/Scene1_Menu.unity rename to Jump Game/Assets/Scenes/Scene0_Menu.unity index abb6db6..e62163d 100644 --- a/Jump Game/Assets/Scenes/Scene1_Menu.unity +++ b/Jump Game/Assets/Scenes/Scene0_Menu.unity @@ -1335,9 +1335,9 @@ RectTransform: m_Father: {fileID: 2065833043} 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: 370.52002, y: -227.94} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -111.47998, y: 40.059998} m_SizeDelta: {x: 240, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &593435232 @@ -2525,10 +2525,10 @@ RectTransform: m_Father: {fileID: 2065833043} 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: 370.6, y: -460.5} - m_SizeDelta: {x: 179.95, y: 29.61} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -111.399994, y: 75.5} + m_SizeDelta: {x: 179.95001, y: 29.609985} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1169074427 MonoBehaviour: @@ -2660,17 +2660,17 @@ PrefabInstance: - target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5, type: 3} propertyPath: m_AnchoredPosition.y - value: -60 + value: -85 objectReference: {fileID: 0} - target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 300 objectReference: {fileID: 0} - target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 70 objectReference: {fileID: 0} - target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5, type: 3} @@ -2702,6 +2702,36 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 4604532315722087914, guid: 849f48437cf3cb841a32cc7467d8a2e5, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4604532315722087914, guid: 849f48437cf3cb841a32cc7467d8a2e5, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4604532315722087914, guid: 849f48437cf3cb841a32cc7467d8a2e5, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4604532315722087914, guid: 849f48437cf3cb841a32cc7467d8a2e5, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 982351928} + - target: {fileID: 4604532315722087914, guid: 849f48437cf3cb841a32cc7467d8a2e5, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ExitGame + objectReference: {fileID: 0} + - target: {fileID: 4604532315722087914, guid: 849f48437cf3cb841a32cc7467d8a2e5, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 4998347822207226556, guid: 849f48437cf3cb841a32cc7467d8a2e5, type: 3} propertyPath: m_Name @@ -2712,6 +2742,16 @@ PrefabInstance: propertyPath: m_Text value: Exit objectReference: {fileID: 0} + - target: {fileID: 8476956362632692680, guid: 849f48437cf3cb841a32cc7467d8a2e5, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 8476956362632692680, guid: 849f48437cf3cb841a32cc7467d8a2e5, + type: 3} + propertyPath: m_FontData.m_MinSize + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 849f48437cf3cb841a32cc7467d8a2e5, type: 3} --- !u!1001 &1213131485 @@ -3198,12 +3238,12 @@ PrefabInstance: - target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 300 objectReference: {fileID: 0} - target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 75 objectReference: {fileID: 0} - target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5, type: 3} @@ -3275,6 +3315,11 @@ PrefabInstance: propertyPath: m_Text value: Options objectReference: {fileID: 0} + - target: {fileID: 8476956362632692680, guid: 849f48437cf3cb841a32cc7467d8a2e5, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 25 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 849f48437cf3cb841a32cc7467d8a2e5, type: 3} --- !u!224 &1575218280 stripped @@ -3683,8 +3728,8 @@ RectTransform: 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: -90} - m_SizeDelta: {x: 400, y: 70} + m_AnchoredPosition: {x: 0, y: -150} + m_SizeDelta: {x: 1920, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1932298593 MonoBehaviour: @@ -3706,7 +3751,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 60 + m_FontSize: 100 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 0 @@ -4059,10 +4104,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -4452,17 +4497,17 @@ PrefabInstance: - target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5, type: 3} propertyPath: m_AnchoredPosition.y - value: 60 + value: 85 objectReference: {fileID: 0} - target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 300 objectReference: {fileID: 0} - target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 75 objectReference: {fileID: 0} - target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5, type: 3} @@ -4534,5 +4579,15 @@ PrefabInstance: propertyPath: m_Text value: Play objectReference: {fileID: 0} + - target: {fileID: 8476956362632692680, guid: 849f48437cf3cb841a32cc7467d8a2e5, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 8476956362632692680, guid: 849f48437cf3cb841a32cc7467d8a2e5, + type: 3} + propertyPath: m_FontData.m_MinSize + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 849f48437cf3cb841a32cc7467d8a2e5, type: 3} diff --git a/Jump Game/Assets/Scenes/Scene1_Menu.unity.meta b/Jump Game/Assets/Scenes/Scene0_Menu.unity.meta similarity index 100% rename from Jump Game/Assets/Scenes/Scene1_Menu.unity.meta rename to Jump Game/Assets/Scenes/Scene0_Menu.unity.meta diff --git a/Jump Game/Assets/Scenes/Scene2_Prologue.unity b/Jump Game/Assets/Scenes/Scene1_Prologue.unity similarity index 100% rename from Jump Game/Assets/Scenes/Scene2_Prologue.unity rename to Jump Game/Assets/Scenes/Scene1_Prologue.unity diff --git a/Jump Game/Assets/Scenes/Scene2_Prologue.unity.meta b/Jump Game/Assets/Scenes/Scene1_Prologue.unity.meta similarity index 100% rename from Jump Game/Assets/Scenes/Scene2_Prologue.unity.meta rename to Jump Game/Assets/Scenes/Scene1_Prologue.unity.meta diff --git a/Jump Game/Assets/Scenes/Scene3_Game.unity b/Jump Game/Assets/Scenes/Scene2_Game.unity similarity index 100% rename from Jump Game/Assets/Scenes/Scene3_Game.unity rename to Jump Game/Assets/Scenes/Scene2_Game.unity diff --git a/Jump Game/Assets/Scenes/Scene3_Game.unity.meta b/Jump Game/Assets/Scenes/Scene2_Game.unity.meta similarity index 100% rename from Jump Game/Assets/Scenes/Scene3_Game.unity.meta rename to Jump Game/Assets/Scenes/Scene2_Game.unity.meta diff --git a/Jump Game/Assets/Scenes/Scene4_Ending.unity b/Jump Game/Assets/Scenes/Scene3_Ending.unity similarity index 99% rename from Jump Game/Assets/Scenes/Scene4_Ending.unity rename to Jump Game/Assets/Scenes/Scene3_Ending.unity index ee31280..271913c 100644 --- a/Jump Game/Assets/Scenes/Scene4_Ending.unity +++ b/Jump Game/Assets/Scenes/Scene3_Ending.unity @@ -510,7 +510,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: ENDGING + m_Text: ENDING --- !u!222 &1543102436 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Jump Game/Assets/Scenes/Scene4_Ending.unity.meta b/Jump Game/Assets/Scenes/Scene3_Ending.unity.meta similarity index 100% rename from Jump Game/Assets/Scenes/Scene4_Ending.unity.meta rename to Jump Game/Assets/Scenes/Scene3_Ending.unity.meta diff --git a/Jump Game/Assets/Scripts/Menu/Menu_Buttons.cs b/Jump Game/Assets/Scripts/Menu/Menu_Buttons.cs index d121736..cf19dd1 100644 --- a/Jump Game/Assets/Scripts/Menu/Menu_Buttons.cs +++ b/Jump Game/Assets/Scripts/Menu/Menu_Buttons.cs @@ -65,6 +65,9 @@ public class Menu_Buttons : MonoBehaviour { SceneManager.LoadScene(2); } - - + + public void ExitGame() + { + Application.Quit(); + } } diff --git a/Jump Game/ProjectSettings/EditorBuildSettings.asset b/Jump Game/ProjectSettings/EditorBuildSettings.asset index b8d6914..d71ba78 100644 --- a/Jump Game/ProjectSettings/EditorBuildSettings.asset +++ b/Jump Game/ProjectSettings/EditorBuildSettings.asset @@ -6,21 +6,21 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 0 - path: Assets/Scenes/SampleScene.unity - guid: 2cda990e2423bbf4892e6590ba056729 - - enabled: 1 + path: + guid: 00000000000000000000000000000000 + - enabled: 0 path: Assets/Scenes/Scene0_Intro.unity guid: c8743125976b178409644aef4ab34eef - enabled: 1 - path: Assets/Scenes/Scene1_Menu.unity + path: Assets/Scenes/Scene0_Menu.unity guid: c55305ddfd66da140a9e0015ebacd456 - enabled: 1 - path: Assets/Scenes/Scene2_Prologue.unity + path: Assets/Scenes/Scene1_Prologue.unity guid: bdfb90291fc09e44f8d020ff542f341e - enabled: 1 - path: Assets/Scenes/Scene3_Game.unity + path: Assets/Scenes/Scene2_Game.unity guid: d496256ae85dbe6419c97d76e09e2745 - enabled: 1 - path: Assets/Scenes/Scene4_Ending.unity + path: Assets/Scenes/Scene3_Ending.unity guid: 548ebe17f8a38114ba6485ada250e288 m_configObjects: {} diff --git a/Jump Game/ProjectSettings/GraphicsSettings.asset b/Jump Game/ProjectSettings/GraphicsSettings.asset index 6c2632a..9b97fe7 100644 --- a/Jump Game/ProjectSettings/GraphicsSettings.asset +++ b/Jump Game/ProjectSettings/GraphicsSettings.asset @@ -31,6 +31,9 @@ GraphicsSettings: m_AlwaysIncludedShaders: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} @@ -55,3 +58,4 @@ GraphicsSettings: m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 0 m_LightsUseColorTemperature: 0 + m_LogWhenShaderIsCompiled: 0 diff --git a/Jump Game/ProjectSettings/ProjectSettings.asset b/Jump Game/ProjectSettings/ProjectSettings.asset index c38bc7a..644b4b7 100644 --- a/Jump Game/ProjectSettings/ProjectSettings.asset +++ b/Jump Game/ProjectSettings/ProjectSettings.asset @@ -12,17 +12,17 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany + companyName: NiceCat Studios productName: Jump Game defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} - m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} + m_SplashScreenBackgroundColor: {r: 0.047058824, g: 0.12156863, b: 0.1764706, a: 1} m_ShowUnitySplashScreen: 1 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 - m_SplashScreenAnimation: 1 + m_SplashScreenAnimation: 2 m_SplashScreenLogoStyle: 1 - m_SplashScreenDrawMode: 0 + m_SplashScreenDrawMode: 1 m_SplashScreenBackgroundAnimationZoom: 1 m_SplashScreenLogoAnimationZoom: 1 m_SplashScreenBackgroundLandscapeAspect: 1 @@ -39,7 +39,11 @@ PlayerSettings: y: 0 width: 1 height: 1 - m_SplashScreenLogos: [] + m_SplashScreenLogos: + - logo: {fileID: 3286163911610860551, guid: 4e0ff8ecc87fa60409c27bd5c7b2c7ed, type: 3} + duration: 4 + - logo: {fileID: 10404, guid: 0000000000000000e000000000000000, type: 0} + duration: 2 m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1024 @@ -81,7 +85,7 @@ PlayerSettings: bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 - resizableWindow: 0 + resizableWindow: 1 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 0 @@ -115,11 +119,11 @@ PlayerSettings: switchNVNOtherPoolsGranularity: 16777216 vulkanEnableSetSRGBWrite: 0 m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 + 4:3: 0 + 5:4: 0 16:10: 1 16:9: 1 - Others: 1 + Others: 0 bundleVersion: 0.1 preloadedAssets: [] metroInputSource: 0 diff --git a/Jump Game/ProjectSettings/UnityConnectSettings.asset b/Jump Game/ProjectSettings/UnityConnectSettings.asset index fa0b146..c3ae9a0 100644 --- a/Jump Game/ProjectSettings/UnityConnectSettings.asset +++ b/Jump Game/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events From 2a2daa1883296d799921e18c2c49c2655e73d138 Mon Sep 17 00:00:00 2001 From: Jamma Date: Wed, 26 Feb 2020 14:05:41 +0200 Subject: [PATCH 2/3] Fixed start game --- Jump Game/Assets/Scripts/Menu/ChangeScene.cs | 2 +- Jump Game/Assets/Scripts/Menu/Menu_Buttons.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jump Game/Assets/Scripts/Menu/ChangeScene.cs b/Jump Game/Assets/Scripts/Menu/ChangeScene.cs index dbeef96..c65d534 100644 --- a/Jump Game/Assets/Scripts/Menu/ChangeScene.cs +++ b/Jump Game/Assets/Scripts/Menu/ChangeScene.cs @@ -15,6 +15,6 @@ public class ChangeScene : MonoBehaviour private IEnumerator ChangeSceneToGame() { yield return new WaitForSeconds(5); - SceneManager.LoadScene(3); + SceneManager.LoadScene(2); } } diff --git a/Jump Game/Assets/Scripts/Menu/Menu_Buttons.cs b/Jump Game/Assets/Scripts/Menu/Menu_Buttons.cs index cf19dd1..fe07a4a 100644 --- a/Jump Game/Assets/Scripts/Menu/Menu_Buttons.cs +++ b/Jump Game/Assets/Scripts/Menu/Menu_Buttons.cs @@ -63,7 +63,7 @@ public class Menu_Buttons : MonoBehaviour } public void StartGame() { - SceneManager.LoadScene(2); + SceneManager.LoadScene(1); } public void ExitGame() From 78ed8d1285da62968b731f9ff1734bec955a5d0c Mon Sep 17 00:00:00 2001 From: BuildTools Date: Fri, 10 Apr 2020 08:45:04 +0300 Subject: [PATCH 3/3] npc talk to nearby players --- Jump Game/Assets/Scenes/Square.png | Bin 0 -> 78 bytes Jump Game/Assets/Scenes/Square.png.meta | 99 ++++++++++++++++++ Jump Game/Assets/Scripts/InteractionObject.cs | 15 +++ .../Assets/Scripts/InteractionObject.cs.meta | 11 ++ Jump Game/Assets/Scripts/PlayerInteract.cs | 34 ++++++ .../Assets/Scripts/PlayerInteract.cs.meta | 11 ++ Jump Game/ProjectSettings/InputManager.asset | 16 +++ Jump Game/ProjectSettings/TagManager.asset | 3 +- 8 files changed, 188 insertions(+), 1 deletion(-) create mode 100644 Jump Game/Assets/Scenes/Square.png create mode 100644 Jump Game/Assets/Scenes/Square.png.meta create mode 100644 Jump Game/Assets/Scripts/InteractionObject.cs create mode 100644 Jump Game/Assets/Scripts/InteractionObject.cs.meta create mode 100644 Jump Game/Assets/Scripts/PlayerInteract.cs create mode 100644 Jump Game/Assets/Scripts/PlayerInteract.cs.meta diff --git a/Jump Game/Assets/Scenes/Square.png b/Jump Game/Assets/Scenes/Square.png new file mode 100644 index 0000000000000000000000000000000000000000..8eb1b1ecc13b6e1d2375151866134cd7a040340c GIT binary patch literal 78 zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1|(O0oL2{=L_J*`LpWrU|M0W$cr!i aF)*;jval%k (); + } + } +} diff --git a/Jump Game/Assets/Scripts/PlayerInteract.cs.meta b/Jump Game/Assets/Scripts/PlayerInteract.cs.meta new file mode 100644 index 0000000..b135e95 --- /dev/null +++ b/Jump Game/Assets/Scripts/PlayerInteract.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1088a3f236f0e02439c2713c24252f61 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Jump Game/ProjectSettings/InputManager.asset b/Jump Game/ProjectSettings/InputManager.asset index 17c8f53..8428689 100644 --- a/Jump Game/ProjectSettings/InputManager.asset +++ b/Jump Game/ProjectSettings/InputManager.asset @@ -293,3 +293,19 @@ InputManager: type: 0 axis: 0 joyNum: 0 + - serializedVersion: 3 + m_Name: Interact + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: e + altNegativeButton: + altPositiveButton: joystick button 1 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 diff --git a/Jump Game/ProjectSettings/TagManager.asset b/Jump Game/ProjectSettings/TagManager.asset index 1c92a78..5f33275 100644 --- a/Jump Game/ProjectSettings/TagManager.asset +++ b/Jump Game/ProjectSettings/TagManager.asset @@ -3,7 +3,8 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - interObject layers: - Default - TransparentFX