From 2a4d2d28e2df0b7ca25ab3b33bd6a39cf1b23c9b Mon Sep 17 00:00:00 2001 From: ZixenVernon Date: Wed, 4 Mar 2026 10:05:13 -0700 Subject: [PATCH 1/2] Fixed Firetrucks firetrucks should all be using "firetruck outline_0" Sprite, for refence the demo_house and firehouse have these sprites. I need to rearrange the firehouse upper floor to be above the lower floor --- .../Assets/Scenes/House Demo 1.unity | 28 +++++++++++++------ .../Assets/Scenes/SpeakEasy_PreDemo.unity | 4 +-- .../ProjectSettings/TagManager.asset | 3 ++ 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Fire Escape Unity/Assets/Scenes/House Demo 1.unity b/Fire Escape Unity/Assets/Scenes/House Demo 1.unity index bbe1c34d..8e12b6e3 100644 --- a/Fire Escape Unity/Assets/Scenes/House Demo 1.unity +++ b/Fire Escape Unity/Assets/Scenes/House Demo 1.unity @@ -2069,6 +2069,16 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 8, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 7 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 2 + m_TileColorIndex: 4 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -11, y: -4, z: 0} second: serializedVersion: 2 @@ -4895,7 +4905,7 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 31 + - m_RefCount: 32 m_Data: {fileID: 11400000, guid: bf31e742dd8208a42a4aa2379d01f685, type: 2} - m_RefCount: 157 m_Data: {fileID: 11400000, guid: bc1791b852971b4429f7a4120d2e51db, type: 2} @@ -4936,7 +4946,7 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 31 + - m_RefCount: 32 m_Data: {fileID: 1149775696, guid: a077234b65440f1428ef054340846c81, type: 3} - m_RefCount: 157 m_Data: {fileID: 867944657, guid: a077234b65440f1428ef054340846c81, type: 3} @@ -4999,7 +5009,7 @@ Tilemap: e31: 0 e32: 0 e33: 1 - - m_RefCount: 381 + - m_RefCount: 382 m_Data: e00: 1 e01: 0 @@ -5026,7 +5036,7 @@ Tilemap: m_Data: {r: -3.0957234e-19, g: -3.0957234e-19, b: -3.0957234e-19, a: -3.0957234e-19} - m_RefCount: 0 m_Data: {r: -2.0683527e-19, g: -2.0683527e-19, b: -2.0683527e-19, a: -2.0683527e-19} - - m_RefCount: 382 + - m_RefCount: 383 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -10217,7 +10227,7 @@ MonoBehaviour: m_Intensity: 0.4 m_LightVolumeIntensity: 0 m_LightVolumeEnabled: 1 - m_ApplyToSortingLayers: 00000000294c8a56d1049ebc6330dd9e630109995b5bd88c + m_ApplyToSortingLayers: 00000000294c8a56d1049ebc6330dd9e630109995b5bd88cb767cbe3 m_LightCookieSprite: {fileID: 0} m_DeprecatedPointLightCookieSprite: {fileID: 0} m_LightOrder: 0 @@ -10835,7 +10845,7 @@ MonoBehaviour: m_Intensity: 1 m_LightVolumeIntensity: 1 m_LightVolumeEnabled: 0 - m_ApplyToSortingLayers: 00000000294c8a56d1049ebc6330dd9e630109995b5bd88c2f802f39678853b9 + m_ApplyToSortingLayers: 00000000294c8a56d1049ebc6330dd9e630109995b5bd88c2f802f39678853b9b767cbe3 m_LightCookieSprite: {fileID: 0} m_DeprecatedPointLightCookieSprite: {fileID: 0} m_LightOrder: 0 @@ -12769,7 +12779,7 @@ MonoBehaviour: m_Intensity: 0.2 m_LightVolumeIntensity: 0 m_LightVolumeEnabled: 1 - m_ApplyToSortingLayers: 00000000294c8a56d1049ebc6330dd9e630109995b5bd88c + m_ApplyToSortingLayers: 00000000294c8a56d1049ebc6330dd9e630109995b5bd88cb767cbe3 m_LightCookieSprite: {fileID: 0} m_DeprecatedPointLightCookieSprite: {fileID: 0} m_LightOrder: 0 @@ -13205,7 +13215,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6.12, y: -12.01, z: -0.11253528} - m_LocalScale: {x: 2.206044, y: 2.284, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1074700637} @@ -13257,7 +13267,7 @@ SpriteRenderer: m_SortingLayerID: -1727463069 m_SortingLayer: 4 m_SortingOrder: 0 - m_Sprite: {fileID: -347627570514976070, guid: 0f9473c35c11f4c409205b0fbcbbd0f1, type: 3} + m_Sprite: {fileID: 16215558432842394, guid: 40170c04ff5330e4db4a308fff1f4bf3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Fire Escape Unity/Assets/Scenes/SpeakEasy_PreDemo.unity b/Fire Escape Unity/Assets/Scenes/SpeakEasy_PreDemo.unity index 831e3d30..9ddcd318 100644 --- a/Fire Escape Unity/Assets/Scenes/SpeakEasy_PreDemo.unity +++ b/Fire Escape Unity/Assets/Scenes/SpeakEasy_PreDemo.unity @@ -30702,7 +30702,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -11.0425, y: -9.19, z: -0.11253528} - m_LocalScale: {x: 2.206044, y: 2.284, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1074700637} @@ -30754,7 +30754,7 @@ SpriteRenderer: m_SortingLayerID: -1727463069 m_SortingLayer: 4 m_SortingOrder: 0 - m_Sprite: {fileID: -347627570514976070, guid: 0f9473c35c11f4c409205b0fbcbbd0f1, type: 3} + m_Sprite: {fileID: 16215558432842394, guid: 40170c04ff5330e4db4a308fff1f4bf3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Fire Escape Unity/ProjectSettings/TagManager.asset b/Fire Escape Unity/ProjectSettings/TagManager.asset index f689a438..734f91f3 100644 --- a/Fire Escape Unity/ProjectSettings/TagManager.asset +++ b/Fire Escape Unity/ProjectSettings/TagManager.asset @@ -74,5 +74,8 @@ TagManager: - name: Dialog uniqueID: 3109259367 locked: 0 + - name: New Layer 8 + uniqueID: 3821758391 + locked: 0 m_RenderingLayers: - Default From c15d72d5ba20fad91e8b431f6f499a012ee0d99d Mon Sep 17 00:00:00 2001 From: ZixenVernon Date: Wed, 4 Mar 2026 10:10:19 -0700 Subject: [PATCH 2/2] Trucks updated (use the firetrucks with an OUTLINE) Moved the firehouse upper floor to above the lower floor, and changed the firetruck sprites --- .../Assets/Scenes/Firehouse.unity | 58 +++++++++---------- 1 file changed, 26 insertions(+), 32 deletions(-) diff --git a/Fire Escape Unity/Assets/Scenes/Firehouse.unity b/Fire Escape Unity/Assets/Scenes/Firehouse.unity index 55a0ef33..d9c5a886 100644 --- a/Fire Escape Unity/Assets/Scenes/Firehouse.unity +++ b/Fire Escape Unity/Assets/Scenes/Firehouse.unity @@ -190,10 +190,7 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 2774439475971646226, guid: ac614007bccea3947bf82a12e5557bf2, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ac614007bccea3947bf82a12e5557bf2, type: 3} --- !u!4 &997531 stripped Transform: @@ -690,7 +687,7 @@ Transform: m_GameObject: {fileID: 93405523} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.18666713, y: 6.6733336, z: 0} + m_LocalPosition: {x: -14.413333, y: 36.673336, z: 0} m_LocalScale: {x: 0.33333334, y: 0.33333334, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -994,7 +991,7 @@ Transform: m_GameObject: {fileID: 177616436} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.7066676, y: 9.453333, z: 0} + m_LocalPosition: {x: -13.8933325, y: 39.453335, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1084,7 +1081,7 @@ Transform: m_GameObject: {fileID: 187836789} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.0200005, y: 6.2333336, z: 0} + m_LocalPosition: {x: -12.58, y: 36.233337, z: 0} m_LocalScale: {x: 0.6666667, y: 0.6666667, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1602,7 +1599,7 @@ Transform: m_GameObject: {fileID: 276160402} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.013334, y: 4.2333336, z: 0} + m_LocalPosition: {x: -18.613335, y: 34.233337, z: 0} m_LocalScale: {x: 0.6666667, y: 0.6666667, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1979,7 +1976,7 @@ Transform: m_GameObject: {fileID: 318791704} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.4266663, y: 4.3466663, z: 0} + m_LocalPosition: {x: -18.026667, y: 34.34667, z: 0} m_LocalScale: {x: 0.6666667, y: 0.6666667, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2536,7 +2533,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1.34375, y: 0.765625} + oldSize: {x: 1.5, y: 1} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -7610,7 +7607,7 @@ Transform: m_GameObject: {fileID: 518520969} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 6.2333336, z: 0} + m_LocalPosition: {x: -14.6, y: 36.233337, z: 0} m_LocalScale: {x: 0.6666667, y: 0.6666667, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -7700,7 +7697,7 @@ Transform: m_GameObject: {fileID: 526491414} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.6726672, y: 6.2333336, z: 0} + m_LocalPosition: {x: -13.927333, y: 36.233337, z: 0} m_LocalScale: {x: 0.6666667, y: 0.6666667, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -8606,7 +8603,7 @@ Transform: m_GameObject: {fileID: 565895852} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.3533325, y: 4.16, z: 0} + m_LocalPosition: {x: -17.953333, y: 34.160004, z: 0} m_LocalScale: {x: 0.6666667, y: 0.6666667, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -8981,7 +8978,7 @@ Transform: m_GameObject: {fileID: 884105712} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -21.9, y: 45, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -12471,7 +12468,7 @@ Transform: m_GameObject: {fileID: 1067747820} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.02, y: -0.64, z: 0} + m_LocalPosition: {x: -12.58, y: 29.360003, z: 0} m_LocalScale: {x: 0.6666667, y: 0.6666667, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -12690,7 +12687,7 @@ Transform: m_GameObject: {fileID: 1099555972} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.9933332, y: 0, z: 0} + m_LocalPosition: {x: -12.6066675, y: 30.000002, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -13269,7 +13266,7 @@ Transform: m_GameObject: {fileID: 1199758540} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.3599994, y: 4.5509624, z: 0} + m_LocalPosition: {x: -17.96, y: 34.550964, z: 0} m_LocalScale: {x: 0.33333334, y: 0.33333334, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -14283,11 +14280,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8256806335906763973, guid: b43ba5e904f6ed743b420518d659a9a4, type: 3} propertyPath: m_LocalPosition.x - value: 1.81 + value: 55.5 objectReference: {fileID: 0} - target: {fileID: 8256806335906763973, guid: b43ba5e904f6ed743b420518d659a9a4, type: 3} propertyPath: m_LocalPosition.y - value: 3.83 + value: 45.2 objectReference: {fileID: 0} - target: {fileID: 8256806335906763973, guid: b43ba5e904f6ed743b420518d659a9a4, type: 3} propertyPath: m_LocalPosition.z @@ -14447,7 +14444,7 @@ Transform: m_GameObject: {fileID: 1280266346} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.6399994, y: 0.50666654, z: 0} + m_LocalPosition: {x: -17.24, y: 30.506666, z: 0} m_LocalScale: {x: 0.40000004, y: 0.40000004, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -23749,7 +23746,7 @@ Transform: m_GameObject: {fileID: 1529079072} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.89333344, y: 8.993334, z: 0} + m_LocalPosition: {x: -15.493334, y: 38.993336, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -23839,7 +23836,7 @@ Transform: m_GameObject: {fileID: 1529832255} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -14.6, y: 30.000002, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -28519,10 +28516,7 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 1082912567141344010, guid: 85627f4229d6013458b9dabcdafc8176, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 85627f4229d6013458b9dabcdafc8176, type: 3} --- !u!4 &1783618576 stripped Transform: @@ -29005,11 +28999,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8256806335906763973, guid: b43ba5e904f6ed743b420518d659a9a4, type: 3} propertyPath: m_LocalPosition.x - value: 3.968 + value: -17.932 objectReference: {fileID: 0} - target: {fileID: 8256806335906763973, guid: b43ba5e904f6ed743b420518d659a9a4, type: 3} propertyPath: m_LocalPosition.y - value: -13.892 + value: 31.108 objectReference: {fileID: 0} - target: {fileID: 8256806335906763973, guid: b43ba5e904f6ed743b420518d659a9a4, type: 3} propertyPath: m_LocalPosition.z @@ -32999,11 +32993,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8256806335906763973, guid: b43ba5e904f6ed743b420518d659a9a4, type: 3} propertyPath: m_LocalPosition.x - value: -14.77 + value: 41.32 objectReference: {fileID: 0} - target: {fileID: 8256806335906763973, guid: b43ba5e904f6ed743b420518d659a9a4, type: 3} propertyPath: m_LocalPosition.y - value: 1.76 + value: 43.129997 objectReference: {fileID: 0} - target: {fileID: 8256806335906763973, guid: b43ba5e904f6ed743b420518d659a9a4, type: 3} propertyPath: m_LocalPosition.z @@ -33131,7 +33125,7 @@ Transform: m_GameObject: {fileID: 2002864090} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.6466663, y: 0.21333313, z: 0} + m_LocalPosition: {x: -18.246666, y: 30.213335, z: 0} m_LocalScale: {x: 0.6666667, y: 0.53333336, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -33163,7 +33157,7 @@ Transform: m_GameObject: {fileID: 2035148842} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.01, y: -0.64, z: 0} + m_LocalPosition: {x: -14.59, y: 29.360003, z: 0} m_LocalScale: {x: 0.6666667, y: 0.6666667, z: 1} m_ConstrainProportionsScale: 0 m_Children: []