This commit is contained in:
RochesterX
2025-03-10 16:23:24 -04:00
parent a92b0dd1ab
commit 153104636d
5 changed files with 34 additions and 26 deletions

BIN
.DS_Store vendored

Binary file not shown.

View File

@@ -72,6 +72,7 @@ public class HubManager : MonoBehaviour
GameManager.players.Clear(); GameManager.players.Clear();
GameManager.playerColors.Clear(); GameManager.playerColors.Clear();
GameManager.Instance.gameOver = false;
SceneManager.LoadScene("Title Screen"); SceneManager.LoadScene("Title Screen");
} }

View File

@@ -6182,7 +6182,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4664891637007210485, guid: e659ce6dc4d58ff4f9726fa05e1bab20, type: 3} - target: {fileID: 4664891637007210485, guid: e659ce6dc4d58ff4f9726fa05e1bab20, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: -15 value: -1.8
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4664891637007210485, guid: e659ce6dc4d58ff4f9726fa05e1bab20, type: 3} - target: {fileID: 4664891637007210485, guid: e659ce6dc4d58ff4f9726fa05e1bab20, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z

View File

@@ -31,6 +31,10 @@ public class PlayerCameraMovement : MonoBehaviour
{ {
target = playerThatWon.transform.position; target = playerThatWon.transform.position;
transform.position = Vector3.Lerp(transform.position, new Vector3(target.x, target.y, target.z - 10), speed * 12 * Time.deltaTime); transform.position = Vector3.Lerp(transform.position, new Vector3(target.x, target.y, target.z - 10), speed * 12 * Time.deltaTime);
if (transform.position.y < lowerBound)
{
transform.position = new Vector3(transform.position.x, lowerBound, transform.position.z);
}
} }
return; return;
@@ -54,7 +58,10 @@ public class PlayerCameraMovement : MonoBehaviour
target = start * weight + playerAverage * (1 - weight); target = start * weight + playerAverage * (1 - weight);
transform.position = Vector3.Lerp(transform.position, new Vector3(target.x, target.y, transform.position.z), speed * Time.deltaTime); transform.position = Vector3.Lerp(transform.position, new Vector3(target.x, target.y, transform.position.z), speed * Time.deltaTime);
transform.position = new Vector3(Mathf.Clamp(transform.position.x, lowerBound, Mathf.Infinity), transform.position.y, transform.position.z); if (transform.position.y < lowerBound)
{
transform.position = new Vector3(transform.position.x, lowerBound, transform.position.z);
}
} }
public void WinScene(GameObject player) public void WinScene(GameObject player)

View File

@@ -33,28 +33,28 @@ MonoBehaviour:
m_Settings: m_Settings:
m_SettingsList: m_SettingsList:
m_List: m_List:
- rid: 4743468213239545927 - rid: 4743468213370093872
- rid: 4743468213239545928 - rid: 4743468213370093873
- rid: 3813502778313015298 - rid: 3813502778313015298
- rid: 3813502778313015299 - rid: 3813502778313015299
- rid: 3813502778313015300 - rid: 3813502778313015300
- rid: 4743468213239545929 - rid: 4743468213370093874
- rid: 3813502778313015302 - rid: 3813502778313015302
- rid: 3813502778313015303 - rid: 3813502778313015303
- rid: 3813502778313015304 - rid: 3813502778313015304
- rid: 3813502778313015305 - rid: 3813502778313015305
- rid: 4743468213239545930 - rid: 4743468213370093875
- rid: 4743468213239545931 - rid: 4743468213370093876
- rid: 4743468213239545932 - rid: 4743468213370093877
- rid: 3813502778313015309 - rid: 3813502778313015309
- rid: 4743468213239545933 - rid: 4743468213370093878
- rid: 4743468213239545934 - rid: 4743468213370093879
- rid: 4743468213239545935 - rid: 4743468213370093880
- rid: 3813502778313015313 - rid: 3813502778313015313
- rid: 4743468213239545936 - rid: 4743468213370093881
- rid: 4743468213239545937 - rid: 4743468213370093882
- rid: 3813502778313015316 - rid: 3813502778313015316
- rid: 4743468213239545938 - rid: 4743468213370093883
m_RuntimeSettings: m_RuntimeSettings:
m_List: m_List:
- rid: 3813502778313015298 - rid: 3813502778313015298
@@ -161,7 +161,7 @@ MonoBehaviour:
m_ExportShaderVariants: 1 m_ExportShaderVariants: 1
m_ShaderVariantLogLevel: 0 m_ShaderVariantLogLevel: 0
m_StripRuntimeDebugShaders: 1 m_StripRuntimeDebugShaders: 1
- rid: 4743468213239545927 - rid: 4743468213370093872
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
@@ -170,7 +170,7 @@ MonoBehaviour:
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- rid: 4743468213239545928 - rid: 4743468213370093873
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
@@ -182,18 +182,18 @@ MonoBehaviour:
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
- rid: 4743468213239545929 - rid: 4743468213370093874
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
- rid: 4743468213239545930 - rid: 4743468213370093875
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_Version: 0 m_Version: 0
m_StripUnusedPostProcessingVariants: 0 m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1 m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1 m_StripScreenCoordOverrideVariants: 1
- rid: 4743468213239545931 - rid: 4743468213370093876
type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_Version: 0 m_Version: 0
@@ -201,7 +201,7 @@ MonoBehaviour:
m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3}
m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3} m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3}
- rid: 4743468213239545932 - rid: 4743468213370093877
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data: data:
m_Version: 0 m_Version: 0
@@ -214,21 +214,21 @@ MonoBehaviour:
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
- rid: 4743468213239545933 - rid: 4743468213370093878
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_Version: 1 m_Version: 1
probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3}
probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3}
probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3}
- rid: 4743468213239545934 - rid: 4743468213370093879
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_version: 0 m_version: 0
m_IncludeReferencedInScenes: 0 m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0 m_IncludeAssetsByLabel: 0
m_LabelToInclude: m_LabelToInclude:
- rid: 4743468213239545935 - rid: 4743468213370093880
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_Version: 1 m_Version: 1
@@ -241,7 +241,7 @@ MonoBehaviour:
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
- rid: 4743468213239545936 - rid: 4743468213370093881
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_Version: 1 m_Version: 1
@@ -251,12 +251,12 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 4743468213239545937 - rid: 4743468213370093882
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_Version: 1 m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0 m_ProbeVolumeDisableStreamingAssets: 0
- rid: 4743468213239545938 - rid: 4743468213370093883
type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}