From 721d06d1c513edf0e8de35b6b6190205fcecf6ea Mon Sep 17 00:00:00 2001 From: Glimmerfrost Date: Wed, 22 Apr 2026 10:57:24 -0600 Subject: [PATCH 1/3] Update to DerailedTrain I added a water bucket, a fire axe, and a firetruck. I could not figure out the ladder pit, so that is still missing. --- .../Assets/Scenes/DerailedTrain.unity | 207 ++++++++++++++++++ 1 file changed, 207 insertions(+) diff --git a/Fire Escape Unity/Assets/Scenes/DerailedTrain.unity b/Fire Escape Unity/Assets/Scenes/DerailedTrain.unity index 786b396c..acd94683 100644 --- a/Fire Escape Unity/Assets/Scenes/DerailedTrain.unity +++ b/Fire Escape Unity/Assets/Scenes/DerailedTrain.unity @@ -176,6 +176,63 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7e80c642afb4b6459a693eeb574f12f, type: 3} +--- !u!1001 &103809829 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2788741695648419399, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} + propertyPath: m_Name + value: Water Bucket + objectReference: {fileID: 0} + - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} + propertyPath: m_LocalPosition.x + value: -4.4348273 + objectReference: {fileID: 0} + - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} + propertyPath: m_LocalPosition.y + value: 4.8424993 + objectReference: {fileID: 0} + - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} --- !u!1 &132761609 GameObject: m_ObjectHideFlags: 0 @@ -284,6 +341,63 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: 13748942d34a54c448b515c4f7cd4ab7, type: 3} +--- !u!1001 &173750456 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} + propertyPath: m_LocalPosition.x + value: -7.44625 + objectReference: {fileID: 0} + - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} + propertyPath: m_LocalPosition.y + value: 4.24564 + objectReference: {fileID: 0} + - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8139331752411916877, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} + propertyPath: m_Name + value: Fire Axe + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} --- !u!1001 &182775232 PrefabInstance: m_ObjectHideFlags: 0 @@ -1013,6 +1127,96 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &860776468 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 860776470} + - component: {fileID: 860776469} + m_Layer: 0 + m_Name: firetruck_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &860776469 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 860776468} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -347627570514976070, guid: 0f9473c35c11f4c409205b0fbcbbd0f1, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.48, y: 0.56} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &860776470 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 860776468} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.28, y: 2.51, z: 0} + m_LocalScale: {x: 2.1962, y: 2.3018, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &951633173 PrefabInstance: m_ObjectHideFlags: 0 @@ -5865,3 +6069,6 @@ SceneRoots: - {fileID: 1449051119} - {fileID: 951633173} - {fileID: 1530795763} + - {fileID: 103809829} + - {fileID: 173750456} + - {fileID: 860776470} From 88f51bf409aff143c378088f7614f74bcb1539ee Mon Sep 17 00:00:00 2001 From: Glimmerfrost Date: Wed, 29 Apr 2026 10:40:29 -0600 Subject: [PATCH 2/3] Timer Changes This changes the timers back to being longer and shorter than the default 180. --- .../Assets/Scenes/2FloorCollapsedSecond.unity | 4 + .../Assets/Scenes/DerailedTrain.unity | 266 +----------------- .../Assets/Scenes/DuplexLevel.unity | 4 + .../Assets/Scenes/House Demo 1.unity | 17 +- .../Assets/Scenes/SpeakEasy_PreDemo.unity | 12 +- .../Assets/Scenes/TutorialLevel.unity | 4 + .../Assets/Shaders/SmokeShaderMaterial.mat | 4 +- 7 files changed, 32 insertions(+), 279 deletions(-) diff --git a/Fire Escape Unity/Assets/Scenes/2FloorCollapsedSecond.unity b/Fire Escape Unity/Assets/Scenes/2FloorCollapsedSecond.unity index cfbe11c8..2e09252b 100644 --- a/Fire Escape Unity/Assets/Scenes/2FloorCollapsedSecond.unity +++ b/Fire Escape Unity/Assets/Scenes/2FloorCollapsedSecond.unity @@ -3409,6 +3409,10 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 4.444458 objectReference: {fileID: 0} + - target: {fileID: 5315797614747640729, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} + propertyPath: currentTime + value: 240 + objectReference: {fileID: 0} - target: {fileID: 6941517145120327073, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} propertyPath: m_LocalPosition.x value: 10.95786 diff --git a/Fire Escape Unity/Assets/Scenes/DerailedTrain.unity b/Fire Escape Unity/Assets/Scenes/DerailedTrain.unity index 1941af33..48a3daf1 100644 --- a/Fire Escape Unity/Assets/Scenes/DerailedTrain.unity +++ b/Fire Escape Unity/Assets/Scenes/DerailedTrain.unity @@ -176,63 +176,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7e80c642afb4b6459a693eeb574f12f, type: 3} ---- !u!1001 &103809829 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2788741695648419399, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} - propertyPath: m_Name - value: Water Bucket - objectReference: {fileID: 0} - - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} - propertyPath: m_LocalPosition.x - value: -4.4348273 - objectReference: {fileID: 0} - - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} - propertyPath: m_LocalPosition.y - value: 4.8424993 - objectReference: {fileID: 0} - - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6912451071857639960, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0b3996b5e8a00e9459702e9c1834b2a7, type: 3} --- !u!1 &132761609 GameObject: m_ObjectHideFlags: 0 @@ -342,63 +285,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: 13748942d34a54c448b515c4f7cd4ab7, type: 3} ---- !u!1001 &173750456 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} - propertyPath: m_LocalPosition.x - value: -7.44625 - objectReference: {fileID: 0} - - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} - propertyPath: m_LocalPosition.y - value: 4.24564 - objectReference: {fileID: 0} - - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5107331871744298374, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8139331752411916877, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} - propertyPath: m_Name - value: Fire Axe - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2472fa810b5c282429c9ea92fc28df2e, type: 3} --- !u!1001 &182775232 PrefabInstance: m_ObjectHideFlags: 0 @@ -1471,156 +1357,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &860776468 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 860776470} - - component: {fileID: 860776469} - m_Layer: 0 - m_Name: firetruck_0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &860776469 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 860776468} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: -347627570514976070, guid: 0f9473c35c11f4c409205b0fbcbbd0f1, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.48, y: 0.56} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &860776470 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 860776468} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.28, y: 2.51, z: 0} - m_LocalScale: {x: 2.1962, y: 2.3018, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &951633173 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1780741788727322148, guid: ac614007bccea3947bf82a12e5557bf2, type: 3} - propertyPath: m_Name - value: Player 2 - objectReference: {fileID: 0} - - target: {fileID: 3234076733250909796, guid: ac614007bccea3947bf82a12e5557bf2, type: 3} - propertyPath: m_LocalPosition.x - value: -5.60282 - objectReference: {fileID: 0} - - target: {fileID: 3234076733250909796, guid: ac614007bccea3947bf82a12e5557bf2, type: 3} - propertyPath: m_LocalPosition.y - value: 6.56272 - objectReference: {fileID: 0} - - target: {fileID: 3234076733250909796, guid: ac614007bccea3947bf82a12e5557bf2, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234076733250909796, guid: ac614007bccea3947bf82a12e5557bf2, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3234076733250909796, guid: ac614007bccea3947bf82a12e5557bf2, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234076733250909796, guid: ac614007bccea3947bf82a12e5557bf2, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234076733250909796, guid: ac614007bccea3947bf82a12e5557bf2, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234076733250909796, guid: ac614007bccea3947bf82a12e5557bf2, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234076733250909796, guid: ac614007bccea3947bf82a12e5557bf2, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234076733250909796, guid: ac614007bccea3947bf82a12e5557bf2, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7544272669877070945, guid: ac614007bccea3947bf82a12e5557bf2, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - m_SourcePrefab: {fileID: 100100000, guid: ac614007bccea3947bf82a12e5557bf2, type: 3} --- !u!1 &985146703 GameObject: m_ObjectHideFlags: 0 @@ -10538,9 +10274,9 @@ SceneRoots: - {fileID: 1574291670} - {fileID: 584771284} - {fileID: 434053691} - - {fileID: 190540346} - {fileID: 1844269725} - {fileID: 418267000} - {fileID: 696848587} - {fileID: 1746986820} - {fileID: 389332626} + - {fileID: 190540346} diff --git a/Fire Escape Unity/Assets/Scenes/DuplexLevel.unity b/Fire Escape Unity/Assets/Scenes/DuplexLevel.unity index 33495073..30934851 100644 --- a/Fire Escape Unity/Assets/Scenes/DuplexLevel.unity +++ b/Fire Escape Unity/Assets/Scenes/DuplexLevel.unity @@ -42575,6 +42575,10 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 4.444458 objectReference: {fileID: 0} + - target: {fileID: 5315797614747640729, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} + propertyPath: currentTime + value: 180 + objectReference: {fileID: 0} - target: {fileID: 6941517145120327073, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} propertyPath: m_LocalPosition.x value: 2.77328 diff --git a/Fire Escape Unity/Assets/Scenes/House Demo 1.unity b/Fire Escape Unity/Assets/Scenes/House Demo 1.unity index 93a885da..4a2fabb1 100644 --- a/Fire Escape Unity/Assets/Scenes/House Demo 1.unity +++ b/Fire Escape Unity/Assets/Scenes/House Demo 1.unity @@ -199,7 +199,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1504412268417953496, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} propertyPath: m_LocalPosition.x - value: -4.8927 + value: -4.444458 objectReference: {fileID: 0} - target: {fileID: 1611209801277222244, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} propertyPath: m_IsActive @@ -211,11 +211,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721415007335752225, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} propertyPath: m_LocalPosition.x - value: 4.8927 + value: 4.444458 objectReference: {fileID: 0} - target: {fileID: 4990627565815587818, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} propertyPath: m_LocalPosition.x - value: 4.8927 + value: 4.444458 + objectReference: {fileID: 0} + - target: {fileID: 5315797614747640729, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} + propertyPath: currentTime + value: 135 objectReference: {fileID: 0} - target: {fileID: 6941517145120327073, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} propertyPath: m_LocalPosition.x @@ -283,7 +287,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8380467148698342142, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} propertyPath: m_LocalPosition.x - value: -4.8927 + value: -4.444458 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -5702,10 +5706,7 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3475917127361184879, guid: 13748942d34a54c448b515c4f7cd4ab7, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 13748942d34a54c448b515c4f7cd4ab7, type: 3} --- !u!1001 &256348868 PrefabInstance: diff --git a/Fire Escape Unity/Assets/Scenes/SpeakEasy_PreDemo.unity b/Fire Escape Unity/Assets/Scenes/SpeakEasy_PreDemo.unity index ae36b8b1..42d4ab66 100644 --- a/Fire Escape Unity/Assets/Scenes/SpeakEasy_PreDemo.unity +++ b/Fire Escape Unity/Assets/Scenes/SpeakEasy_PreDemo.unity @@ -25454,7 +25454,7 @@ PrefabInstance: objectReference: {fileID: 887340932} - target: {fileID: 1504412268417953496, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} propertyPath: m_LocalPosition.x - value: -4.8927 + value: -4.444458 objectReference: {fileID: 0} - target: {fileID: 1611209801277222244, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} propertyPath: m_IsActive @@ -25474,11 +25474,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721415007335752225, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} propertyPath: m_LocalPosition.x - value: 4.8927 + value: 4.444458 objectReference: {fileID: 0} - target: {fileID: 4990627565815587818, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} propertyPath: m_LocalPosition.x - value: 4.8927 + value: 4.444458 + objectReference: {fileID: 0} + - target: {fileID: 5315797614747640729, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} + propertyPath: currentTime + value: 210 objectReference: {fileID: 0} - target: {fileID: 6941517145120327073, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} propertyPath: m_LocalPosition.x @@ -25542,7 +25546,7 @@ PrefabInstance: objectReference: {fileID: 887340931} - target: {fileID: 8380467148698342142, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} propertyPath: m_LocalPosition.x - value: -4.8927 + value: -4.444458 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Fire Escape Unity/Assets/Scenes/TutorialLevel.unity b/Fire Escape Unity/Assets/Scenes/TutorialLevel.unity index 1f97016d..eca49c4c 100644 --- a/Fire Escape Unity/Assets/Scenes/TutorialLevel.unity +++ b/Fire Escape Unity/Assets/Scenes/TutorialLevel.unity @@ -47873,6 +47873,10 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 4.444458 objectReference: {fileID: 0} + - target: {fileID: 5315797614747640729, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} + propertyPath: currentTime + value: 240 + objectReference: {fileID: 0} - target: {fileID: 5446307668576639385, guid: 336e797cb57630446a065ba6caa41fb4, type: 3} propertyPath: m_Controller value: diff --git a/Fire Escape Unity/Assets/Shaders/SmokeShaderMaterial.mat b/Fire Escape Unity/Assets/Shaders/SmokeShaderMaterial.mat index 4ae09397..1857ac4d 100644 --- a/Fire Escape Unity/Assets/Shaders/SmokeShaderMaterial.mat +++ b/Fire Escape Unity/Assets/Shaders/SmokeShaderMaterial.mat @@ -67,8 +67,8 @@ Material: - _ZWrite: 0 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _Player1Position: {r: 3.2486522, g: 17.118303, b: 0, a: 0} - - _Player2Position: {r: 2.5886, g: -6.5529003, b: 0, a: 0} + - _Player1Position: {r: 34.27044, g: 7.830054, b: 0, a: 0} + - _Player2Position: {r: 32.711826, g: 5.406895, b: 0, a: 0} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 From 695c56d20d0266edab84e0f300f345fb7f65cefe Mon Sep 17 00:00:00 2001 From: Glimmerfrost Date: Mon, 4 May 2026 10:11:13 -0600 Subject: [PATCH 3/3] Credits Update Updates the credits to add everyone from semester 2 and for marketing team. --- .../Assets/Scenes/MainMenu.unity | 45 +++++-------------- 1 file changed, 10 insertions(+), 35 deletions(-) diff --git a/Fire Escape Unity/Assets/Scenes/MainMenu.unity b/Fire Escape Unity/Assets/Scenes/MainMenu.unity index 60980bab..7452ff9f 100644 --- a/Fire Escape Unity/Assets/Scenes/MainMenu.unity +++ b/Fire Escape Unity/Assets/Scenes/MainMenu.unity @@ -1048,7 +1048,7 @@ RectTransform: 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: -1.4131, y: -291} + m_AnchoredPosition: {x: -1.4131, y: -441} m_SizeDelta: {x: 180, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &135932063 @@ -2466,7 +2466,7 @@ RectTransform: 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: 332, y: 58} + m_AnchoredPosition: {x: 332, y: 159} m_SizeDelta: {x: 1135.2012, y: 748.715} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &495765524 @@ -4565,39 +4565,14 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Producer - Joshua Grussendorf - - - Programming Lead - Kenyou Teoh & Brian - McLatchie - - - Design Lead - Alex DeRooy - - - Art Lead - Nick Knehs - - - Sound - Lead - Henry Cummings - - - Programming Team - Tyler Austin, Alexander Workman, - Rafael Gonzalez, Gabriel Wenchell, Brandon Stih - - - Design Team - Logan Shade, - Sebastian Rosul, Sophia Kalua, Nicolas Suazo - - - Art Team - Star Grace Carpenter, - Elle Hoeper, Kaya Andrews - - - Sound Team - Kalista Hough, Treyvonn Jackson, - Ryan Minor - -' + m_text: "Producer - Joshua Grussendorf\n\nProgramming Lead - Kenyou Teoh & Brian + McLatchie\n\nDesign Lead - Alex DeRooy\n\nArt Lead - Nick Knehs\n\nSound Lead + - Henry Cummings \n\nMarketing Lead - Alexander Workman\n\nProgramming Team - + Tyler Austin, Alexander Workman, Rafael Gonzalez, Gabriel Wenchell, Brandon Stih, + Jacob Biles\n\nDesign Team - Logan Shade, Sebastian Rosul, Sophia Kalua, Nicolas + Suazo, Isaiah Douglas \n\nArt Team - Star Grace Carpenter, Elle Hoeper, Kaya + Andrews\n\nSound Team - Kalista Hough, Treyvonn Jackson, Ryan Minor \n\nMarketing + Team - Logan Shade, Ryan Minor, Kaya Andrews, Tyler Austin\n" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 41b14729f81dfbc4881e6bf8ec517200, type: 2} m_sharedMaterial: {fileID: -3071173805931373261, guid: 41b14729f81dfbc4881e6bf8ec517200, type: 2}