RochesterX/Crash-Course
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

Make game end work

Browse Source
This commit is contained in:
RochesterX
2025-03-07 16:03:11 -05:00
parent 314d8e7aba
commit f146b06e3c
8 changed files with 53 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Assets/Prefabs/Healthbar.prefab
View File

@@ -73,8 +73,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -2040226161
m_SortingLayer: 0
m_SortingLayerID: 1823612251
m_SortingLayer: 1
m_SortingOrder: 2
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
m_Color: {r: 0, g: 0, b: 0, a: 1}
@@ -160,8 +160,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -2040226161
m_SortingLayer: 0
m_SortingLayerID: 1823612251
m_SortingLayer: 1
m_SortingOrder: 4
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -441,8 +441,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -2040226161
m_SortingLayer: 0
m_SortingLayerID: 1823612251
m_SortingLayer: 1
m_SortingOrder: 1
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
m_Color: {r: 0, g: 0, b: 0, a: 1}
@@ -630,8 +630,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -2040226161
m_SortingLayer: 0
m_SortingLayerID: 1823612251
m_SortingLayer: 1
m_SortingOrder: 5
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
m_Color: {r: 0.023529412, g: 0.81960785, b: 0, a: 1}

19
Assets/Prefabs/Player Box Target.prefab
View File

@@ -1831,6 +1831,7 @@ GameObject:
- component: {fileID: 3092004571833081599}
- component: {fileID: 8440686640694911780}
- component: {fileID: 2097378836795367493}
- component: {fileID: 845789397527362766}
m_Layer: 5
m_Name: Player Box
m_TagString: Untagged
@@ -1856,8 +1857,8 @@ RectTransform:
- {fileID: 2340586454433308441}
m_Father: {fileID: 6892066976245176997}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 288}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
@@ -2032,3 +2033,17 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &845789397527362766
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8481467574557768995}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 617fdbd52246c4352be58c24aef4fd55, type: 3}
m_Name:
m_EditorClassIdentifier:
target: {fileID: 539213549865726557}
speed: 5

22
Assets/Prefabs/Player Select.prefab
View File

@@ -99,8 +99,8 @@ MonoBehaviour:
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_HighlightedColor: {r: 0.764151, g: 0.764151, b: 0.764151, a: 1}
m_PressedColor: {r: 0.5377358, g: 0.5377358, b: 0.5377358, 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
@@ -373,8 +373,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 960, y: 146.14014}
m_SizeDelta: {x: 1756.7, y: 994.27}
m_AnchoredPosition: {x: 577.58, y: 146.14014}
m_SizeDelta: {x: 991.87, y: 994.27}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4398521839358101483
MonoBehaviour:
@@ -1250,13 +1250,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2507919156650283462, guid: 379d0dd7636974e42bcfc11679f61cd0, type: 3}
propertyPath: m_text
value: 'Keep Away
Map Edition'
value: Mountain
objectReference: {fileID: 0}
- target: {fileID: 4515670857758816212, guid: 379d0dd7636974e42bcfc11679f61cd0, type: 3}
propertyPath: m_Name
value: Platform3
value: Platform3 (MOUNTAIN)
objectReference: {fileID: 0}
- target: {fileID: 6017258344494229771, guid: 379d0dd7636974e42bcfc11679f61cd0, type: 3}
propertyPath: m_IsOn
@@ -1668,9 +1666,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2507919156650283462, guid: 379d0dd7636974e42bcfc11679f61cd0, type: 3}
propertyPath: m_text
value: 'Platformer
(with Headroom)'
value: Clouds
objectReference: {fileID: 0}
- target: {fileID: 4515670857758816212, guid: 379d0dd7636974e42bcfc11679f61cd0, type: 3}
propertyPath: m_Name
@@ -2145,7 +2141,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2507919156650283462, guid: 379d0dd7636974e42bcfc11679f61cd0, type: 3}
propertyPath: m_text
value: Obstance
value: Ascent
objectReference: {fileID: 0}
- target: {fileID: 4515670857758816212, guid: 379d0dd7636974e42bcfc11679f61cd0, type: 3}
propertyPath: m_Name
@@ -2259,7 +2255,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8152264223886948235, guid: fb4bf85da5c66429d8a3d24fe0e44ef1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 929
value: 902
objectReference: {fileID: 0}
- target: {fileID: 8152264223886948235, guid: fb4bf85da5c66429d8a3d24fe0e44ef1, type: 3}
propertyPath: m_AnchoredPosition.y

8
Assets/Scenes/Player Select.unity
View File

@@ -219,6 +219,14 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5368898896554409839, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
propertyPath: m_SizeDelta.x
value: 1598.4
objectReference: {fileID: 0}
- target: {fileID: 5368898896554409839, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
propertyPath: m_AnchoredPosition.x
value: 844.17
objectReference: {fileID: 0}
- target: {fileID: 5507202815382103773, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
propertyPath: m_AnchoredPosition.x
value: 300.80005

1
Assets/Scripts/GameManager.cs
View File

@@ -114,6 +114,7 @@ public class GameManager : MonoBehaviour
{
EndGameEvent?.Invoke();
print(AlivePlayers()[0].name + " is the winner");
FindFirstObjectByType<PlayerCameraMovement>().WinScene(AlivePlayers()[0]);
}
}

2
Assets/Scripts/PlayerCameraMovement.cs
View File

@@ -29,7 +29,7 @@ public class PlayerCameraMovement : MonoBehaviour
if (playerThatWon != null)
{
target = playerThatWon.transform.position;
transform.position = Vector3.Lerp(transform.position, new Vector3(target.x, target.y, target.z - 10), speed * Time.deltaTime);
transform.position = Vector3.Lerp(transform.position, new Vector3(target.x, target.y, target.z - 10), speed * 2 * Time.deltaTime);
}
return;

7
Assets/SmoothToTarget.cs Normal file
View File

@@ -0,0 +1,7 @@
using System.Collections;
using UnityEngine;
public class SmoothToTarget : MonoBehaviour
{
}

2
Assets/SmoothToTarget.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 617fdbd52246c4352be58c24aef4fd55