diff --git a/.DS_Store b/.DS_Store index 9971f13..daee848 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Assets/Scenes/Title Screen.unity b/Assets/Scenes/Title Screen.unity index e9ca994..b4f2047 100644 --- a/Assets/Scenes/Title Screen.unity +++ b/Assets/Scenes/Title Screen.unity @@ -1133,7 +1133,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 1633102601} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.48836005} + m_AnchorMin: {x: 0, y: 0.44999993} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} @@ -4070,9 +4070,16 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Needs work: - - Reset confirmation' + m_text: "Needs work:\nUser gude in game\\nMore comments on the code?\nReset confirmation\n#Player + Join screen update (clarify map select)\\nSound effects in game\n#Player card + players\nKeep away map\n#Join screen titles\\n#Implement music\n#Mountain music\n#Make + city playable\n#One way platform mountain\\nLeaderboard scaling city obstacle + course\n#Get rid of placeholder start stop obstacle course\\nPlatform friction\nFacing + angle not velocity-based\\nDead player constant velocity\n\nDylan will do:\nFix + Time Left! text\nObstacle course end only works on correct gamemode\\nObstacle + course end for mountain\nCorrect time limits for keep away maps\\nRespawn after + game over (keep away)\nWill try to complete: \nObstacle course flag\nHealth bar + persists after death" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -5236,7 +5243,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -984, y: -569} + m_AnchoredPosition: {x: -984.00006, y: -569} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1167340110 @@ -5397,7 +5404,7 @@ MonoBehaviour: m_HandleRect: {fileID: 213491789} m_Direction: 2 m_Value: 1 - m_Size: 0.51163995 + m_Size: 0.5500001 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: diff --git a/Assets/Scripts/Game/GameManager.cs b/Assets/Scripts/Game/GameManager.cs index 866e28f..64e3447 100644 --- a/Assets/Scripts/Game/GameManager.cs +++ b/Assets/Scripts/Game/GameManager.cs @@ -201,6 +201,7 @@ namespace Game /// public void StartGame() { + Instance = this; GameManager.playerHoldTimes.Clear(); if (GameManager.players.Count == 0) return; diff --git a/Assets/Scripts/Game/GameManager.cs.meta b/Assets/Scripts/Game/GameManager.cs.meta index 363c2f9..7f2ce08 100644 --- a/Assets/Scripts/Game/GameManager.cs.meta +++ b/Assets/Scripts/Game/GameManager.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: d6e4006937b044c9ab3de25a7ab68162 \ No newline at end of file +guid: d6e4006937b044c9ab3de25a7ab68162 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: -13 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Game/HealthBarManager.cs.meta b/Assets/Scripts/Game/HealthBarManager.cs.meta index 9513a4f..7aaf251 100644 --- a/Assets/Scripts/Game/HealthBarManager.cs.meta +++ b/Assets/Scripts/Game/HealthBarManager.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: a80b536f823e50142b142b4e0b64ea97 \ No newline at end of file +guid: a80b536f823e50142b142b4e0b64ea97 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: -12 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings 1.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings 1.asset index 96fa87d..2518009 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings 1.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings 1.asset @@ -33,28 +33,28 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 3182681989864489183 - - rid: 3182681989864489184 + - rid: 3182681989864489424 + - rid: 3182681989864489425 - rid: 3813502778313015298 - rid: 3813502778313015299 - rid: 3813502778313015300 - - rid: 3182681989864489185 + - rid: 3182681989864489426 - rid: 3813502778313015302 - rid: 3813502778313015303 - rid: 3813502778313015304 - rid: 3813502778313015305 - - rid: 3182681989864489186 - - rid: 3182681989864489187 - - rid: 3182681989864489188 + - rid: 3182681989864489427 + - rid: 3182681989864489428 + - rid: 3182681989864489429 - rid: 3813502778313015309 - - rid: 3182681989864489189 - - rid: 3182681989864489190 - - rid: 3182681989864489191 + - rid: 3182681989864489430 + - rid: 3182681989864489431 + - rid: 3182681989864489432 - rid: 3813502778313015313 - - rid: 3182681989864489192 - - rid: 3182681989864489193 + - rid: 3182681989864489433 + - rid: 3182681989864489434 - rid: 3813502778313015316 - - rid: 3182681989864489194 + - rid: 3182681989864489435 m_RuntimeSettings: m_List: - rid: 3813502778313015298 @@ -90,7 +90,7 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 3182681989864489183 + - rid: 3182681989864489424 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -99,7 +99,7 @@ MonoBehaviour: m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - - rid: 3182681989864489184 + - rid: 3182681989864489425 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} @@ -111,18 +111,18 @@ MonoBehaviour: m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - - rid: 3182681989864489185 + - rid: 3182681989864489426 type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} - - rid: 3182681989864489186 + - rid: 3182681989864489427 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 m_StripUnusedPostProcessingVariants: 0 m_StripUnusedVariants: 1 m_StripScreenCoordOverrideVariants: 1 - - rid: 3182681989864489187 + - rid: 3182681989864489428 type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -130,7 +130,7 @@ MonoBehaviour: m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3} - - rid: 3182681989864489188 + - rid: 3182681989864489429 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -143,21 +143,21 @@ MonoBehaviour: m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} - - rid: 3182681989864489189 + - rid: 3182681989864489430 type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} - - rid: 3182681989864489190 + - rid: 3182681989864489431 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 3182681989864489191 + - rid: 3182681989864489432 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -170,7 +170,7 @@ MonoBehaviour: skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 3182681989864489192 + - rid: 3182681989864489433 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -180,12 +180,12 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 3182681989864489193 + - rid: 3182681989864489434 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 3182681989864489194 + - rid: 3182681989864489435 type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}