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

Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project

Browse Source
This commit is contained in:
RochesterX
2025-04-17 18:52:36 -04:00
parent 87eb6237e5 12d740288a
commit c01baf4b08
15 changed files with 1323 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
Assets/Scenes/ObstanceWIP.unity
View File

@@ -4455,8 +4455,48 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
insertIndex: -1
addedObject: {fileID: 1133819047}
- targetCorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
insertIndex: -1
addedObject: {fileID: 1133819049}
m_SourcePrefab: {fileID: 100100000, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
--- !u!1 &1133819046 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
m_PrefabInstance: {fileID: 1133819045}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1133819047
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1133819046}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 34a52816a1c62984ea622bbf50849c68, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1133819048 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
m_PrefabInstance: {fileID: 1133819045}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1133819049
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1133819048}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 69fc903d39ac3d24aab4ce7a68dba447, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1164411982
GameObject:
m_ObjectHideFlags: 0
@@ -8985,6 +9025,7 @@ GameObject:
m_Component:
- component: {fileID: 1815355877}
- component: {fileID: 1815355876}
- component: {fileID: 1815355878}
m_Layer: 0
m_Name: GOAL
m_TagString: Untagged
@@ -9062,6 +9103,18 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1815355878
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1815355875}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 69fc903d39ac3d24aab4ce7a68dba447, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1972151283
GameObject:
m_ObjectHideFlags: 0

50
Assets/Scenes/Platform3 (MOUNTAIN).unity
View File

@@ -882,6 +882,14 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3280152006050152854, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
propertyPath: m_LocalPosition.x
value: 3338.17
objectReference: {fileID: 0}
- target: {fileID: 3280152006050152854, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
propertyPath: m_LocalPosition.y
value: -1187.98
objectReference: {fileID: 0}
- target: {fileID: 3636379526195672734, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
propertyPath: m_text
value: 3:00
@@ -1078,7 +1086,13 @@ PrefabInstance:
m_RemovedGameObjects:
- {fileID: 4148327129846918965, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
insertIndex: -1
addedObject: {fileID: 447660841}
- targetCorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
insertIndex: -1
addedObject: {fileID: 514716509}
m_SourcePrefab: {fileID: 100100000, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
--- !u!223 &447660837 stripped
Canvas:
@@ -1101,6 +1115,23 @@ Canvas:
m_CorrespondingSourceObject: {fileID: 7061268803878077000, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
m_PrefabInstance: {fileID: 447660836}
m_PrefabAsset: {fileID: 0}
--- !u!1 &447660840 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
m_PrefabInstance: {fileID: 447660836}
m_PrefabAsset: {fileID: 0}
--- !u!114 &447660841
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 447660840}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 34a52816a1c62984ea622bbf50849c68, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &449193300
GameObject:
m_ObjectHideFlags: 0
@@ -1188,6 +1219,23 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &514716508 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
m_PrefabInstance: {fileID: 447660836}
m_PrefabAsset: {fileID: 0}
--- !u!114 &514716509
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 514716508}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 69fc903d39ac3d24aab4ce7a68dba447, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &547927776
PrefabInstance:
m_ObjectHideFlags: 0

57
Assets/Scenes/Platformer With Headroom.unity
View File

@@ -4543,7 +4543,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
propertyPath: time
value: 30
value: 180
objectReference: {fileID: 0}
- target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
propertyPath: healthBarManager
value:
objectReference: {fileID: 0}
- target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
propertyPath: hatSpawnPositions.Array.size
@@ -4613,6 +4617,14 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3280152006050152854, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
propertyPath: m_LocalPosition.x
value: 29.85
objectReference: {fileID: 0}
- target: {fileID: 3280152006050152854, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
propertyPath: m_LocalPosition.y
value: 10.81
objectReference: {fileID: 0}
- target: {fileID: 3636379526195672734, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
propertyPath: m_margin.w
value: 1357.2593
@@ -4752,9 +4764,50 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 4148327129846918965, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
- {fileID: 8079215911535814924, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
insertIndex: -1
addedObject: {fileID: 6442071445436727404}
- targetCorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
insertIndex: -1
addedObject: {fileID: 6442071445436727406}
m_SourcePrefab: {fileID: 100100000, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
--- !u!1 &6442071445436727403 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
m_PrefabInstance: {fileID: 6442071445436727402}
m_PrefabAsset: {fileID: 0}
--- !u!114 &6442071445436727404
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6442071445436727403}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 34a52816a1c62984ea622bbf50849c68, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &6442071445436727405 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
m_PrefabInstance: {fileID: 6442071445436727402}
m_PrefabAsset: {fileID: 0}
--- !u!114 &6442071445436727406
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6442071445436727405}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 69fc903d39ac3d24aab4ce7a68dba447, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &8682934954266721942
PrefabInstance:
m_ObjectHideFlags: 0

42
Assets/Scenes/Q2_(CITY) Keep_Away2.unity
View File

@@ -1260,7 +1260,13 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
insertIndex: -1
addedObject: {fileID: 1095679076}
- targetCorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
insertIndex: -1
addedObject: {fileID: 1095679078}
m_SourcePrefab: {fileID: 100100000, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
--- !u!114 &1095679074 stripped
MonoBehaviour:
@@ -1273,6 +1279,40 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1095679075 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
m_PrefabInstance: {fileID: 1095679073}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1095679076
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1095679075}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 34a52816a1c62984ea622bbf50849c68, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1095679077 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
m_PrefabInstance: {fileID: 1095679073}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1095679078
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1095679077}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 69fc903d39ac3d24aab4ce7a68dba447, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1125342871
PrefabInstance:
m_ObjectHideFlags: 0

55
Assets/Scenes/QQ_ObstanceWIP.unity
View File

@@ -3513,8 +3513,48 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
insertIndex: -1
addedObject: {fileID: 1133819047}
- targetCorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
insertIndex: -1
addedObject: {fileID: 1133819049}
m_SourcePrefab: {fileID: 100100000, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
--- !u!1 &1133819046 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
m_PrefabInstance: {fileID: 1133819045}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1133819047
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1133819046}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 34a52816a1c62984ea622bbf50849c68, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1133819048 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
m_PrefabInstance: {fileID: 1133819045}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1133819049
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1133819048}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 69fc903d39ac3d24aab4ce7a68dba447, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1178732237
GameObject:
m_ObjectHideFlags: 0
@@ -7535,6 +7575,7 @@ GameObject:
m_Component:
- component: {fileID: 1815355877}
- component: {fileID: 1815355876}
- component: {fileID: 1815355878}
m_Layer: 0
m_Name: GOAL
m_TagString: Untagged
@@ -7612,6 +7653,18 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1815355878
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1815355875}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 69fc903d39ac3d24aab4ce7a68dba447, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1866956648
GameObject:
m_ObjectHideFlags: 0

10
Assets/Scenes/Title Screen.unity
View File

@@ -2744,11 +2744,11 @@ MonoBehaviour:
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)\n\nWill try to complete: \nObstacle course flag\nHealth
bar persists after death\n"
angle not velocity-based\nDead player constant velocity\n\nDylan will do:\n#Fix
Time Left! text\n#Obstacle course end only works on correct gamemode\n#Obstacle
course end for mountain\n#Correct time limits for keep away maps\n\n*needs help*
Respawn after game over (ALL GAMEMODES)\n\nWill try to complete: \nObstacle course
flag\n#Health bar persists after death\n"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}

50
Assets/Scenes/[OUTDATED](CITY) Keep_Away2.unity
View File

@@ -806,6 +806,14 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3280152006050152854, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
propertyPath: m_LocalPosition.x
value: 4.47
objectReference: {fileID: 0}
- target: {fileID: 3280152006050152854, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
propertyPath: m_LocalPosition.y
value: -13.08
objectReference: {fileID: 0}
- target: {fileID: 4832072825095962115, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
propertyPath: timer
value:
@@ -913,7 +921,13 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
insertIndex: -1
addedObject: {fileID: 1095679076}
- targetCorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
insertIndex: -1
addedObject: {fileID: 1095679078}
m_SourcePrefab: {fileID: 100100000, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
--- !u!114 &1095679074 stripped
MonoBehaviour:
@@ -926,6 +940,40 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1095679075 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
m_PrefabInstance: {fileID: 1095679073}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1095679076
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1095679075}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 34a52816a1c62984ea622bbf50849c68, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1095679077 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
m_PrefabInstance: {fileID: 1095679073}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1095679078
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1095679077}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 69fc903d39ac3d24aab4ce7a68dba447, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1125342871
PrefabInstance:
m_ObjectHideFlags: 0