From 8567006d8a6d9549de863d3a2b4f82271546ec13 Mon Sep 17 00:00:00 2001 From: Ivy Date: Mon, 26 Apr 2021 22:04:44 -0500 Subject: [PATCH] Added fire hydrant to level --- .../Fonts/(Menu Text) RosesareFF0000.asset | 10 +- .../Assets/Scenes/DemoLevels/Spawn.unity | 143 +------------ .../Scenes/DogLevel/DogLevelSpawn.unity | 59 +++++- MuseumGame/Assets/Scenes/Museum/Museum.unity | 200 ++++++++++-------- .../UserSettings/EditorUserSettings.asset | 30 +++ 5 files changed, 200 insertions(+), 242 deletions(-) diff --git a/MuseumGame/Assets/Fonts/(Menu Text) RosesareFF0000.asset b/MuseumGame/Assets/Fonts/(Menu Text) RosesareFF0000.asset index 07be89a..14077ce 100644 --- a/MuseumGame/Assets/Fonts/(Menu Text) RosesareFF0000.asset +++ b/MuseumGame/Assets/Fonts/(Menu Text) RosesareFF0000.asset @@ -59,9 +59,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3} m_Name: (Menu Text) RosesareFF0000 m_EditorClassIdentifier: - hashCode: 0 + hashCode: 1037463297 material: {fileID: 447336955975408638} - materialHashCode: 0 + materialHashCode: -1718027007 m_Version: 1.1.0 m_SourceFontFileGUID: 134ca32f19c446848834b21804690b17 m_SourceFontFile_EditorRef: {fileID: 12800000, guid: 134ca32f19c446848834b21804690b17, type: 3} @@ -2408,9 +2408,9 @@ Material: - _OutlineWidth: 0 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 1 - - _ScaleRatioB: 1 - - _ScaleRatioC: 1 + - _ScaleRatioA: 0.8333333 + - _ScaleRatioB: 0.6770833 + - _ScaleRatioC: 0.6770833 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity index b03bfa4..3e5248c 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity @@ -123,147 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &13055933 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 13055938} - - component: {fileID: 13055937} - - component: {fileID: 13055936} - - component: {fileID: 13055935} - - component: {fileID: 13055934} - m_Layer: 0 - m_Name: Capsule - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &13055934 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 13055933} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 37e947767f230cb45b7cca13e4b4dbb3, type: 3} - m_Name: - m_EditorClassIdentifier: - canUnShrink: 0 - canShrink: 1 - isShrunk: 0 - minRbSize: {x: 0, y: 0, z: 0} - minColSize: {x: 0, y: 0} - defaultRbSize: {x: 0, y: 0, z: 0} - defaultColSize: {x: 0, y: 0} ---- !u!70 &13055935 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 13055933} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_Size: {x: 1, y: 2} - m_Direction: 0 ---- !u!50 &13055936 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 13055933} - m_BodyType: 2 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!212 &13055937 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 13055933} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: -9095717837082945937, guid: 34587324d412940a79d530020c957dc0, 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, y: 2} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &13055938 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 13055933} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &56401782 GameObject: m_ObjectHideFlags: 0 @@ -2819,7 +2678,7 @@ MonoBehaviour: artImage: {fileID: 430284682} obtainedPowerups: powerupStatus: - sceneToLoad: Museum + sceneToLoad: music: - {fileID: 8300000, guid: f29919963390ff24fa1ae468277b309e, type: 3} --- !u!4 &637676178 diff --git a/MuseumGame/Assets/Scenes/DogLevel/DogLevelSpawn.unity b/MuseumGame/Assets/Scenes/DogLevel/DogLevelSpawn.unity index f9ee9ab..81451fe 100644 --- a/MuseumGame/Assets/Scenes/DogLevel/DogLevelSpawn.unity +++ b/MuseumGame/Assets/Scenes/DogLevel/DogLevelSpawn.unity @@ -1807,8 +1807,65 @@ Transform: - {fileID: 612235267} - {fileID: 145706357} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &964808790 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4742363870248418081, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_Name + value: FireHydrant_0 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalPosition.x + value: 5.623591 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalPosition.y + value: -1.5 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} --- !u!1 &1935037035 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/Museum/Museum.unity b/MuseumGame/Assets/Scenes/Museum/Museum.unity index 3b1af84..457e5a4 100644 --- a/MuseumGame/Assets/Scenes/Museum/Museum.unity +++ b/MuseumGame/Assets/Scenes/Museum/Museum.unity @@ -410,6 +410,18 @@ CompositeCollider2D: Y: -41250000 - X: 450000000 Y: -40000000 + - X: 430000100 + Y: -40000000 + - X: 430000100 + Y: -39999959 + - X: 430000041 + Y: -39999900 + - X: -20000041 + Y: -39999900 + - X: -20000100 + Y: -39999959 + - X: -20000100 + Y: -40000000 - X: -50000000 Y: -40000000 - X: -50000000 @@ -7487,8 +7499,8 @@ Tilemap: - first: {x: -2, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7497,8 +7509,8 @@ Tilemap: - first: {x: -1, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7507,8 +7519,8 @@ Tilemap: - first: {x: 0, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7517,8 +7529,8 @@ Tilemap: - first: {x: 1, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7527,8 +7539,8 @@ Tilemap: - first: {x: 2, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7537,8 +7549,8 @@ Tilemap: - first: {x: 3, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7547,8 +7559,8 @@ Tilemap: - first: {x: 4, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7557,8 +7569,8 @@ Tilemap: - first: {x: 5, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7567,8 +7579,8 @@ Tilemap: - first: {x: 6, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7577,8 +7589,8 @@ Tilemap: - first: {x: 7, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7587,8 +7599,8 @@ Tilemap: - first: {x: 8, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7597,8 +7609,8 @@ Tilemap: - first: {x: 9, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7607,8 +7619,8 @@ Tilemap: - first: {x: 10, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7617,8 +7629,8 @@ Tilemap: - first: {x: 11, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7627,8 +7639,8 @@ Tilemap: - first: {x: 12, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7637,8 +7649,8 @@ Tilemap: - first: {x: 13, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7647,8 +7659,8 @@ Tilemap: - first: {x: 14, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7657,8 +7669,8 @@ Tilemap: - first: {x: 15, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7667,8 +7679,8 @@ Tilemap: - first: {x: 16, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7677,8 +7689,8 @@ Tilemap: - first: {x: 17, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7687,8 +7699,8 @@ Tilemap: - first: {x: 18, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7697,8 +7709,8 @@ Tilemap: - first: {x: 19, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7707,8 +7719,8 @@ Tilemap: - first: {x: 20, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7717,8 +7729,8 @@ Tilemap: - first: {x: 21, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7727,8 +7739,8 @@ Tilemap: - first: {x: 22, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7737,8 +7749,8 @@ Tilemap: - first: {x: 23, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7747,8 +7759,8 @@ Tilemap: - first: {x: 24, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7757,8 +7769,8 @@ Tilemap: - first: {x: 25, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7767,8 +7779,8 @@ Tilemap: - first: {x: 26, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7777,8 +7789,8 @@ Tilemap: - first: {x: 27, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7787,8 +7799,8 @@ Tilemap: - first: {x: 28, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7797,8 +7809,8 @@ Tilemap: - first: {x: 29, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7807,8 +7819,8 @@ Tilemap: - first: {x: 30, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7817,8 +7829,8 @@ Tilemap: - first: {x: 31, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7827,8 +7839,8 @@ Tilemap: - first: {x: 32, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7837,8 +7849,8 @@ Tilemap: - first: {x: 33, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7847,8 +7859,8 @@ Tilemap: - first: {x: 34, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7857,8 +7869,8 @@ Tilemap: - first: {x: 35, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7867,8 +7879,8 @@ Tilemap: - first: {x: 36, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7877,8 +7889,8 @@ Tilemap: - first: {x: 37, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7887,8 +7899,8 @@ Tilemap: - first: {x: 38, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7897,8 +7909,8 @@ Tilemap: - first: {x: 39, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7907,8 +7919,8 @@ Tilemap: - first: {x: 40, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7917,8 +7929,8 @@ Tilemap: - first: {x: 41, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -7927,8 +7939,8 @@ Tilemap: - first: {x: 42, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 6 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -9460,11 +9472,11 @@ Tilemap: m_Data: {fileID: 11400000, guid: a68aac20b6a008b40975f2a7717d90ed, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: c3ddf5d3b8b2b654899ec21e63b7eb87, type: 2} - - m_RefCount: 90 + - m_RefCount: 45 m_Data: {fileID: 11400000, guid: e5a2d197a102c1e41b9c3288e9f5f184, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 2801570636139e249bf5660fd5a80487, type: 2} - - m_RefCount: 1 + - m_RefCount: 46 m_Data: {fileID: 11400000, guid: fe2228d66e81fda42b50c4f98751fc4b, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: b4f58c0a85d45214091149b3ee1df182, type: 2} @@ -9481,13 +9493,13 @@ Tilemap: m_Data: {fileID: -8553008988213887698, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - m_RefCount: 1 m_Data: {fileID: 1132109339339783938, guid: 152b7c935bbb7bf48ac0fb2e9e9e197c, type: 3} - - m_RefCount: 90 + - m_RefCount: 45 m_Data: {fileID: 3281559478666541484, guid: 152b7c935bbb7bf48ac0fb2e9e9e197c, type: 3} - m_RefCount: 1 m_Data: {fileID: 2482497841132423091, guid: 152b7c935bbb7bf48ac0fb2e9e9e197c, type: 3} - m_RefCount: 1 m_Data: {fileID: 3136922279419624583, guid: 152b7c935bbb7bf48ac0fb2e9e9e197c, type: 3} - - m_RefCount: 1 + - m_RefCount: 46 m_Data: {fileID: 1260108311116230238, guid: 152b7c935bbb7bf48ac0fb2e9e9e197c, type: 3} - m_RefCount: 1 m_Data: {fileID: 1405075571284467745, guid: 152b7c935bbb7bf48ac0fb2e9e9e197c, type: 3} diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index d2ce6fb..71eb1cf 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -5,6 +5,36 @@ EditorUserSettings: m_ObjectHideFlags: 0 serializedVersion: 4 m_ConfigSettings: + RecentlyUsedScenePath-0: + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d + flags: 0 + RecentlyUsedScenePath-1: + value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0 + flags: 0 + RecentlyUsedScenePath-2: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 + flags: 0 + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + flags: 0 + RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b + flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + flags: 0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 + flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3136f4e5380bf2e621e7a92f31352d1b + flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb + flags: 0 + RecentlyUsedScenePath-9: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0