From 783c04030b0db6722d26602996a80d03ee330bdc Mon Sep 17 00:00:00 2001 From: AyakorK Date: Wed, 23 Oct 2024 15:09:20 +0200 Subject: [PATCH 1/4] fix: Enlarge the gridSizeY to match the room and modify the level of the floor to fix traps --- Assets/Prefabs/RoomSystem/Corridor/Room.prefab | 4 ++-- Assets/Scripts/Trap/TrapManager.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/Prefabs/RoomSystem/Corridor/Room.prefab b/Assets/Prefabs/RoomSystem/Corridor/Room.prefab index 9bd2990a..70595ba8 100644 --- a/Assets/Prefabs/RoomSystem/Corridor/Room.prefab +++ b/Assets/Prefabs/RoomSystem/Corridor/Room.prefab @@ -2347,8 +2347,8 @@ TilemapRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -365692393 - m_SortingLayer: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkCullingBounds: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/Trap/TrapManager.cs b/Assets/Scripts/Trap/TrapManager.cs index 297e31f6..b6e61450 100644 --- a/Assets/Scripts/Trap/TrapManager.cs +++ b/Assets/Scripts/Trap/TrapManager.cs @@ -11,7 +11,7 @@ public class TrapManager : MonoBehaviour public List trapPrefabs = new List(); private Dictionary trapPrefabDictionary = new Dictionary(); private int gridSizeX = 9; - private int gridSizeY = 9; + private int gridSizeY = 23; private string[,] grid; private Queue placementQueue = new Queue(); From a73210679b72ed2e85a64a585ec09a3dcb28f605 Mon Sep 17 00:00:00 2001 From: AyakorK Date: Wed, 23 Oct 2024 17:07:08 +0200 Subject: [PATCH 2/4] feat: Improve doors and room and traps --- Assets/Prefabs/Player.prefab | 6 +- .../RoomSystem/Corridor/CorridorX7.prefab | 488 ++++++++++-------- .../Prefabs/RoomSystem/Corridor/Room.prefab | 393 ++++++++++---- Assets/Prefabs/RoomSystem/Doors/Door.prefab | 19 +- 4 files changed, 563 insertions(+), 343 deletions(-) diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index ccd7f2c8..35227135 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -76,9 +76,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1234118259 - m_SortingLayer: 2 - m_SortingOrder: 100 + m_SortingLayerID: -1791178601 + m_SortingLayer: 3 + m_SortingOrder: 61 m_Sprite: {fileID: -1136445171, guid: 3551ac8dbe8b24a4fbe3c2bd0ba220aa, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Prefabs/RoomSystem/Corridor/CorridorX7.prefab b/Assets/Prefabs/RoomSystem/Corridor/CorridorX7.prefab index 1494dbd9..dd3987aa 100644 --- a/Assets/Prefabs/RoomSystem/Corridor/CorridorX7.prefab +++ b/Assets/Prefabs/RoomSystem/Corridor/CorridorX7.prefab @@ -1,96 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &852602981705488045 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6411188486135641683} - - component: {fileID: 8298431611923613859} - - component: {fileID: 1554581150033479006} - m_Layer: 0 - m_Name: point_of_spawn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6411188486135641683 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 852602981705488045} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.5, z: 0} - m_LocalScale: {x: 2, y: 2, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5039849178908780682} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &8298431611923613859 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 852602981705488045} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.3, y: 0.5} - m_EdgeRadius: 0 ---- !u!114 &1554581150033479006 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 852602981705488045} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7d30b39a0543ca7429b53292692e717b, type: 3} - m_Name: - m_EditorClassIdentifier: - newRoomPrefab: {fileID: 6459706332820108789, guid: 35bed5d2a54129845bcff6b3abaa746b, type: 3} --- !u!1 &1856224911784812225 GameObject: m_ObjectHideFlags: 0 @@ -194,7 +103,77 @@ Tilemap: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2046186647159025031} m_Enabled: 1 - m_Tiles: {} + m_Tiles: + - first: {x: 0, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 16 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 16 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 16 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 16 + m_TileSpriteIndex: 17 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 16 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 16 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 16 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - m_RefCount: 0 @@ -229,10 +208,10 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 60cbf27344bd3fe48bc9ae68477794b8, type: 2} + - m_RefCount: 6 + m_Data: {fileID: 11400000, guid: 75b0240c1f3808e4abf908e466dd5efc, type: 2} m_TileSpriteArray: - m_RefCount: 0 m_Data: {fileID: 0} @@ -266,12 +245,12 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 6 + m_Data: {fileID: 1081869314, guid: 80736b4b310b5c7499649999bfd03add, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 702271426, guid: 80736b4b310b5c7499649999bfd03add, type: 3} m_TileMatrixArray: - - m_RefCount: 0 + - m_RefCount: 7 m_Data: e00: 1 e01: 0 @@ -290,13 +269,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 0 + - m_RefCount: 7 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Origin: {x: 0, y: 0, z: 0} - m_Size: {x: 9, y: 7, z: 1} + m_Size: {x: 9, y: 10, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -354,8 +333,8 @@ TilemapRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -365692393 + m_SortingLayer: 1 m_SortingOrder: 2 m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkCullingBounds: {x: 0, y: 0, z: 0} @@ -648,7 +627,6 @@ Transform: - {fileID: 5507867557151406363} - {fileID: 2880998959478937405} - {fileID: 2511872843124423942} - - {fileID: 5039849178908780682} m_Father: {fileID: 3022020511561805294} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!156049354 &9166693856388741639 @@ -663,91 +641,6 @@ Grid: m_CellGap: {x: 0, y: 0, z: 0} m_CellLayout: 0 m_CellSwizzle: 0 ---- !u!1 &4072462380636221026 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5039849178908780682} - - component: {fileID: 2607547149940551944} - m_Layer: 0 - m_Name: Door - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!4 &5039849178908780682 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4072462380636221026} - serializedVersion: 2 - m_LocalRotation: {x: 0.2588191, y: -0, z: -0, w: 0.9659258} - m_LocalPosition: {x: 3.53, y: 9.29, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6411188486135641683} - m_Father: {fileID: 6485059341568045904} - m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0} ---- !u!212 &2607547149940551944 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4072462380636221026} - 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_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: -1791178601 - m_SortingLayer: 3 - m_SortingOrder: 60 - m_Sprite: {fileID: 1393557473, guid: 839b37de7ba78b044b490bdf2ac7c489, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.7819595, y: 0.515625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &6168419598805709018 GameObject: m_ObjectHideFlags: 0 @@ -1064,8 +957,8 @@ Tilemap: - first: {x: -1, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 13 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1104,8 +997,8 @@ Tilemap: - first: {x: 3, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 3 - m_TileSpriteIndex: 3 + m_TileIndex: 13 + m_TileSpriteIndex: 11 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1144,7 +1037,97 @@ Tilemap: - first: {x: 7, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 4 + m_TileIndex: 5 + m_TileSpriteIndex: 5 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: 10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 15 + m_TileSpriteIndex: 13 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: 10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: 10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: 10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: 10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: 10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: 10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: 10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 14 m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 @@ -1155,28 +1138,22 @@ Tilemap: m_TileAssetArray: - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 9 + - m_RefCount: 10 m_Data: {fileID: 11400000, guid: dea1181cc90ff44478fce934495aa765, type: 2} - m_RefCount: 7 m_Data: {fileID: 11400000, guid: b3cffff0b312cb641bd2421f7bb2cbd9, type: 2} - - m_RefCount: 7 + - m_RefCount: 13 m_Data: {fileID: 11400000, guid: b710961f5266b1746a3b574a0235a227, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 4be99d284c698be4fa4422328ffa09ab, type: 2} - - m_RefCount: 9 + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 10 m_Data: {fileID: 11400000, guid: 3a599b04e2a730045814004506a24dc7, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: a66c50a203d2f6041a6f1de74927f70c, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 73bc59e8c23c2b64583edb5a37b99c38, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 162c46a9425a36c45b86778f0ede64b2, type: 2} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 162c46a9425a36c45b86778f0ede64b2, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} - m_RefCount: 0 @@ -1185,18 +1162,24 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: e46ccf0e2a7279841815c0bf2fbb77ec, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 4be99d284c698be4fa4422328ffa09ab, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 73bc59e8c23c2b64583edb5a37b99c38, type: 2} m_TileSpriteArray: - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 9 + - m_RefCount: 10 m_Data: {fileID: -1131631741, guid: 80736b4b310b5c7499649999bfd03add, type: 3} - m_RefCount: 7 m_Data: {fileID: 54338551, guid: 80736b4b310b5c7499649999bfd03add, type: 3} - - m_RefCount: 7 + - m_RefCount: 13 m_Data: {fileID: 1691370861, guid: 80736b4b310b5c7499649999bfd03add, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 9 + - m_RefCount: 10 m_Data: {fileID: -865499652, guid: 80736b4b310b5c7499649999bfd03add, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} @@ -1208,8 +1191,8 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 704299944, guid: 80736b4b310b5c7499649999bfd03add, type: 3} - m_RefCount: 1 m_Data: {fileID: -379117173, guid: 80736b4b310b5c7499649999bfd03add, type: 3} - m_RefCount: 1 @@ -1219,7 +1202,7 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: -2047871568, guid: 80736b4b310b5c7499649999bfd03add, type: 3} m_TileMatrixArray: - - m_RefCount: 36 + - m_RefCount: 45 m_Data: e00: 1 e01: 0 @@ -1238,13 +1221,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 36 + - m_RefCount: 45 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Origin: {x: -1, y: -1, z: 0} - m_Size: {x: 11, y: 11, z: 1} + m_Size: {x: 11, y: 12, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -1302,8 +1285,8 @@ TilemapRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1791178601 + m_SortingLayer: 3 m_SortingOrder: 0 m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkCullingBounds: {x: 0, y: 0, z: 0} @@ -1383,6 +1366,7 @@ Transform: - {fileID: 1238582843666978988} - {fileID: 4510731604005238534} - {fileID: 8320606197561170021} + - {fileID: 417082257302647601} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1349095506272017240 @@ -2262,3 +2246,69 @@ Transform: m_Children: [] m_Father: {fileID: 3022020511561805294} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &6504636315628960130 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3022020511561805294} + m_Modifications: + - target: {fileID: 3423160260848129340, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} + propertyPath: newRoomPrefab + value: + objectReference: {fileID: 6459706332820108789, guid: 35bed5d2a54129845bcff6b3abaa746b, type: 3} + - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} + propertyPath: m_LocalPosition.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} + propertyPath: m_LocalPosition.y + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8481200938870355337, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} + propertyPath: m_Name + value: Door + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} +--- !u!4 &417082257302647601 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} + m_PrefabInstance: {fileID: 6504636315628960130} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/RoomSystem/Corridor/Room.prefab b/Assets/Prefabs/RoomSystem/Corridor/Room.prefab index 70595ba8..71700504 100644 --- a/Assets/Prefabs/RoomSystem/Corridor/Room.prefab +++ b/Assets/Prefabs/RoomSystem/Corridor/Room.prefab @@ -2424,7 +2424,7 @@ Transform: - {fileID: 5757914258905656863} - {fileID: 3855984087839777388} - {fileID: 7768218435479574451} - - {fileID: 3690813019415027265} + - {fileID: 4725549377100372346} m_Father: {fileID: 3176463435939833076} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!156049354 &2407730379932051931 @@ -2561,6 +2561,26 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -1, y: 23, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 17 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: 23, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 16 + m_TileSpriteIndex: 16 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - m_RefCount: 0 @@ -2595,10 +2615,10 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: c8acd7322e538554693e464d7e10e4db, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: f48d34db59fa09c44bafbc5e5ab3b4eb, type: 2} m_TileSpriteArray: - m_RefCount: 0 m_Data: {fileID: 0} @@ -2632,12 +2652,12 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: -1672142388, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -268929985, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} m_TileMatrixArray: - - m_RefCount: 8 + - m_RefCount: 10 m_Data: e00: 1 e01: 0 @@ -2656,13 +2676,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 8 + - m_RefCount: 10 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: 0, y: 0, z: 0} - m_Size: {x: 9, y: 23, z: 1} + m_Origin: {x: -1, y: 0, z: 0} + m_Size: {x: 11, y: 24, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -2722,7 +2742,7 @@ TilemapRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: -1791178601 m_SortingLayer: 3 - m_SortingOrder: 2 + m_SortingOrder: 80 m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkCullingBounds: {x: 0, y: 0, z: 0} m_MaxChunkCount: 16 @@ -2871,6 +2891,96 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 0, y: 23, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 7 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: 23, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 6 + m_TileSpriteIndex: 6 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: 23, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 5 + m_TileSpriteIndex: 5 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 23, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 4 + m_TileSpriteIndex: 4 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: 23, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 12 + m_TileSpriteIndex: 12 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: 23, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 7 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: 23, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 6 + m_TileSpriteIndex: 6 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: 23, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 5 + m_TileSpriteIndex: 5 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: 23, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 4 + m_TileSpriteIndex: 4 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - m_RefCount: 0 @@ -2881,6 +2991,14 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: edce0601bbf3b7143a103a4c0933dc33, type: 2} + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: 6b1557f0bad478e4090265037ea3b77e, type: 2} + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: b548c45d128f82a4f862aa3925f16355, type: 2} + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: f7890ea48a664c24a93157740a69a6b4, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} - m_RefCount: 0 @@ -2889,16 +3007,8 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: a4be41ef4c3a41b4886bd2a7ebc18934, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 2296b66ba2d784788856784a71eb6aaf, type: 2} - m_RefCount: 1 @@ -2918,6 +3028,14 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} + - m_RefCount: 2 + m_Data: {fileID: -1345423878, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} + - m_RefCount: 2 + m_Data: {fileID: -1696248969, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} + - m_RefCount: 2 + m_Data: {fileID: -1276159644, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} + - m_RefCount: 2 + m_Data: {fileID: 767084398, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} - m_RefCount: 0 @@ -2926,16 +3044,8 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 899381424, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} - m_RefCount: 1 m_Data: {fileID: 113733329, guid: ad684922a8aff654ebccc527594e7603, type: 3} - m_RefCount: 1 @@ -2947,7 +3057,7 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: -610339578, guid: ad684922a8aff654ebccc527594e7603, type: 3} m_TileMatrixArray: - - m_RefCount: 5 + - m_RefCount: 14 m_Data: e00: 1 e01: 0 @@ -2966,13 +3076,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 5 + - m_RefCount: 14 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Origin: {x: 0, y: 0, z: 0} - m_Size: {x: 9, y: 23, z: 1} + m_Size: {x: 9, y: 24, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -3661,8 +3771,8 @@ Tilemap: - first: {x: -1, y: 23, z: 0} second: serializedVersion: 2 - m_TileIndex: 29 - m_TileSpriteIndex: 22 + m_TileIndex: 23 + m_TileSpriteIndex: 23 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3708,16 +3818,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 4, y: 23, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 26 - m_TileSpriteIndex: 19 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 5, y: 23, z: 0} second: serializedVersion: 2 @@ -3759,6 +3859,116 @@ Tilemap: dummyAlignment: 0 m_AllTileFlags: 1073741825 - first: {x: 9, y: 23, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 14 + m_TileSpriteIndex: 25 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: 24, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 29 + m_TileSpriteIndex: 22 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: 24, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 27 + m_TileSpriteIndex: 20 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: 24, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 27 + m_TileSpriteIndex: 20 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: 24, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 27 + m_TileSpriteIndex: 20 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 24, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 27 + m_TileSpriteIndex: 20 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: 24, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 27 + m_TileSpriteIndex: 20 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: 24, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 27 + m_TileSpriteIndex: 20 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: 24, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 27 + m_TileSpriteIndex: 20 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: 24, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 27 + m_TileSpriteIndex: 20 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: 24, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 27 + m_TileSpriteIndex: 20 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: 24, z: 0} second: serializedVersion: 2 m_TileIndex: 28 @@ -3798,7 +4008,7 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 5 + - m_RefCount: 6 m_Data: {fileID: 11400000, guid: d3843ad5e2697b146baf24e096ad51f1, type: 2} - m_RefCount: 3 m_Data: {fileID: 11400000, guid: 2d3963ed22454914483e5fdd9d65bb95, type: 2} @@ -3816,15 +4026,15 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 952a9de76fcb6634793150d57f42fa21, type: 2} - - m_RefCount: 7 + - m_RefCount: 8 m_Data: {fileID: 11400000, guid: 82c7d78ba81a00240bcbc5ab396cb596, type: 2} - m_RefCount: 6 m_Data: {fileID: 11400000, guid: cde02b23f97284846bf33dc090036dff, type: 2} - m_RefCount: 2 m_Data: {fileID: 11400000, guid: e664f306dac1b414dafc83203c22d2cf, type: 2} - - m_RefCount: 3 - m_Data: {fileID: 11400000, guid: 4446d4935c6747e4cab46f1520850de6, type: 2} - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: 4446d4935c6747e4cab46f1520850de6, type: 2} + - m_RefCount: 11 m_Data: {fileID: 11400000, guid: cb645a1a13c92d6439fefd5b4fce35c6, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 9f13a5ba22df25c4696be62ac15e00a0, type: 2} @@ -3869,19 +4079,19 @@ Tilemap: m_Data: {fileID: 182081639, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} - m_RefCount: 2 m_Data: {fileID: 1662174430, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} - - m_RefCount: 3 - m_Data: {fileID: 770072911, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} - m_RefCount: 2 + m_Data: {fileID: 770072911, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} + - m_RefCount: 11 m_Data: {fileID: 1025941235, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} - m_RefCount: 1 m_Data: {fileID: 1165970067, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} - m_RefCount: 1 m_Data: {fileID: 1339022122, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} - - m_RefCount: 7 + - m_RefCount: 8 m_Data: {fileID: 796896325, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} - m_RefCount: 6 m_Data: {fileID: -620059057, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} - - m_RefCount: 5 + - m_RefCount: 6 m_Data: {fileID: -1848304707, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} - m_RefCount: 1 m_Data: {fileID: -234126973, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} @@ -3892,7 +4102,7 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 1509787832, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} m_TileMatrixArray: - - m_RefCount: 68 + - m_RefCount: 78 m_Data: e00: 1 e01: 0 @@ -3911,13 +4121,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 68 + - m_RefCount: 78 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Origin: {x: -1, y: -1, z: 0} - m_Size: {x: 11, y: 25, z: 1} + m_Size: {x: 11, y: 26, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -4936,7 +5146,7 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1.9435272, y: 2.0843735} m_EdgeRadius: 0 ---- !u!1001 &7833093170162406642 +--- !u!1001 &2168584656435139529 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -4944,65 +5154,37 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4740884614277713913} m_Modifications: - - target: {fileID: 3423160260848129340, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} - propertyPath: player - value: - objectReference: {fileID: 6754384466861484289, guid: 2359570f2fea24215ae3f989d41b590e, type: 3} - - target: {fileID: 3423160260848129340, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} - propertyPath: currentRoom - value: - objectReference: {fileID: 6459706332820108789} - - target: {fileID: 3423160260848129340, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} - propertyPath: coridorPrefab - value: - objectReference: {fileID: 7952199346456436073, guid: f1d6d1017155a6e48abf50c31198add1, type: 3} - - target: {fileID: 3423160260848129340, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} - propertyPath: newRoomPrefab - value: - objectReference: {fileID: 6369746937129949933, guid: 372ef81a87ef0ea46a8aac393f9e5aa1, type: 3} - - target: {fileID: 3423160260848129340, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} - propertyPath: teleportDestination - value: - objectReference: {fileID: 52977198066049657} - - target: {fileID: 6515928562466559834, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} - propertyPath: m_TagString - value: Untagged - objectReference: {fileID: 0} - - target: {fileID: 6515928562466559834, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} propertyPath: m_LocalPosition.x - value: 4.54 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} propertyPath: m_LocalPosition.y - value: 23.369 + value: 23.4 objectReference: {fileID: 0} - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} propertyPath: m_LocalPosition.z - value: 8.309 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} propertyPath: m_LocalRotation.w - value: 0.9659258 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} propertyPath: m_LocalRotation.x - value: 0.2588191 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -5016,26 +5198,13 @@ PrefabInstance: propertyPath: m_Name value: Door objectReference: {fileID: 0} - - target: {fileID: 8481200938870355337, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} - propertyPath: m_TagString - value: Wall - objectReference: {fileID: 0} - - target: {fileID: 8481200938870355337, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} ---- !u!4 &52977198066049657 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7784624545427469963, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} - m_PrefabInstance: {fileID: 7833093170162406642} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3690813019415027265 stripped +--- !u!4 &4725549377100372346 stripped Transform: m_CorrespondingSourceObject: {fileID: 6885118029593512627, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3} - m_PrefabInstance: {fileID: 7833093170162406642} + m_PrefabInstance: {fileID: 2168584656435139529} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/RoomSystem/Doors/Door.prefab b/Assets/Prefabs/RoomSystem/Doors/Door.prefab index 7b80543c..d110ad41 100644 --- a/Assets/Prefabs/RoomSystem/Doors/Door.prefab +++ b/Assets/Prefabs/RoomSystem/Doors/Door.prefab @@ -13,10 +13,10 @@ GameObject: - component: {fileID: 3423160260848129340} m_Layer: 0 m_Name: point_of_spawn - m_TagString: trap + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &7784624545427469963 Transform: @@ -65,7 +65,7 @@ BoxCollider2D: m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0, y: 0.11705446} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -76,7 +76,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 0.3, y: 0.5} + m_Size: {x: 0.3, y: 0.26589108} m_EdgeRadius: 0 --- !u!114 &3423160260848129340 MonoBehaviour: @@ -90,6 +90,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7d30b39a0543ca7429b53292692e717b, type: 3} m_Name: m_EditorClassIdentifier: + newRoomPrefab: {fileID: 6369746937129949933, guid: 372ef81a87ef0ea46a8aac393f9e5aa1, type: 3} --- !u!1 &8481200938870355337 GameObject: m_ObjectHideFlags: 0 @@ -105,7 +106,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &6885118029593512627 Transform: @@ -115,14 +116,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8481200938870355337} serializedVersion: 2 - m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} - m_LocalPosition: {x: 5.58, y: 8.28, z: -0.46} - m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.5, y: 23.2, z: 0} + m_LocalScale: {x: 2.5, y: 2, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7784624545427469963} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1831068373782692773 SpriteRenderer: m_ObjectHideFlags: 0 From 891c4bd9ac76b10007c800dc2c912a8f9bbb1fa2 Mon Sep 17 00:00:00 2001 From: AyakorK Date: Wed, 23 Oct 2024 18:41:41 +0200 Subject: [PATCH 3/4] feat: Add walls on first room --- .../Prefabs/RoomSystem/Corridor/Room.prefab | 288 ++++++++++++++++-- 1 file changed, 260 insertions(+), 28 deletions(-) diff --git a/Assets/Prefabs/RoomSystem/Corridor/Room.prefab b/Assets/Prefabs/RoomSystem/Corridor/Room.prefab index 16395db8..1368c904 100644 --- a/Assets/Prefabs/RoomSystem/Corridor/Room.prefab +++ b/Assets/Prefabs/RoomSystem/Corridor/Room.prefab @@ -2841,6 +2841,226 @@ Tilemap: m_GameObject: {fileID: 4171805761210331374} m_Enabled: 1 m_Tiles: + - first: {x: -1, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 19 + m_TileSpriteIndex: 19 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 10 + m_TileSpriteIndex: 10 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 10 + m_TileSpriteIndex: 10 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 10 + m_TileSpriteIndex: 10 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 10 + m_TileSpriteIndex: 10 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 10 + m_TileSpriteIndex: 10 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 10 + m_TileSpriteIndex: 10 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 10 + m_TileSpriteIndex: 10 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 20 + m_TileSpriteIndex: 20 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 19 + m_TileSpriteIndex: 19 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 18 + m_TileSpriteIndex: 18 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 18 + m_TileSpriteIndex: 18 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 18 + m_TileSpriteIndex: 18 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 18 + m_TileSpriteIndex: 18 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 18 + m_TileSpriteIndex: 18 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 18 + m_TileSpriteIndex: 18 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 9 + m_TileSpriteIndex: 9 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 8 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 20 + m_TileSpriteIndex: 20 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: 1, y: 3, z: 0} second: serializedVersion: 2 @@ -2987,10 +3207,10 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: fd272c572c944a64594d41a442296005, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 4d8c910fb1494eb4ca027a98f2815f63, type: 2} - m_RefCount: 2 m_Data: {fileID: 11400000, guid: edce0601bbf3b7143a103a4c0933dc33, type: 2} - m_RefCount: 2 @@ -2999,14 +3219,14 @@ Tilemap: m_Data: {fileID: 11400000, guid: b548c45d128f82a4f862aa3925f16355, type: 2} - m_RefCount: 2 m_Data: {fileID: 11400000, guid: f7890ea48a664c24a93157740a69a6b4, type: 2} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 029de91f0dbb2674aaf01dc7a78aa3f4, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: e676bf7a0e4275741b7e304b230185aa, type: 2} + - m_RefCount: 7 + m_Data: {fileID: 11400000, guid: 0d459f75a510f7d479157d42c6b74953, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 197cdebb84b6b9643992f78fc15fb72b, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: a4be41ef4c3a41b4886bd2a7ebc18934, type: 2} - m_RefCount: 1 @@ -3019,15 +3239,21 @@ Tilemap: m_Data: {fileID: 11400000, guid: f7ee739cc3d9041298fce75bcda9395a, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 205c1f7df595a422aa70444f2d4f9c00, type: 2} + - m_RefCount: 6 + m_Data: {fileID: 11400000, guid: 9d96b5c4fca53dc43af76495c7aadeeb, type: 2} + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: 53bb3b116979fa844adf3550e5abe28b, type: 2} + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: 6467737df35c5d1449b343df8c85e3e4, type: 2} m_TileSpriteArray: - m_RefCount: 0 m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 1129282767, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 916167026, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} - m_RefCount: 2 m_Data: {fileID: -1345423878, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} - m_RefCount: 2 @@ -3036,14 +3262,14 @@ Tilemap: m_Data: {fileID: -1276159644, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} - m_RefCount: 2 m_Data: {fileID: 767084398, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 228547632, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 375251146, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} + - m_RefCount: 7 + m_Data: {fileID: -936408226, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 693045916, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} - m_RefCount: 1 m_Data: {fileID: 899381424, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} - m_RefCount: 1 @@ -3056,8 +3282,14 @@ Tilemap: m_Data: {fileID: -2074922248, guid: ad684922a8aff654ebccc527594e7603, type: 3} - m_RefCount: 1 m_Data: {fileID: -610339578, guid: ad684922a8aff654ebccc527594e7603, type: 3} + - m_RefCount: 6 + m_Data: {fileID: -206158776, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} + - m_RefCount: 2 + m_Data: {fileID: -889601469, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} + - m_RefCount: 2 + m_Data: {fileID: 58971840, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3} m_TileMatrixArray: - - m_RefCount: 14 + - m_RefCount: 36 m_Data: e00: 1 e01: 0 @@ -3076,13 +3308,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 14 + - m_RefCount: 36 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: 0, y: 0, z: 0} - m_Size: {x: 9, y: 24, z: 1} + m_Origin: {x: -1, y: -2, z: 0} + m_Size: {x: 11, y: 26, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: From 5973a87824d833a11cad7cd9b2b68ced9520156c Mon Sep 17 00:00:00 2001 From: AyakorK Date: Wed, 23 Oct 2024 18:43:27 +0200 Subject: [PATCH 4/4] feat: Add bear_trap to trap manager --- Assets/Prefabs/RoomSystem/Corridor/Room.prefab | 1 + Assets/Scripts/Trap/TrapManager.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/Assets/Prefabs/RoomSystem/Corridor/Room.prefab b/Assets/Prefabs/RoomSystem/Corridor/Room.prefab index 1368c904..e0faffa6 100644 --- a/Assets/Prefabs/RoomSystem/Corridor/Room.prefab +++ b/Assets/Prefabs/RoomSystem/Corridor/Room.prefab @@ -2799,6 +2799,7 @@ MonoBehaviour: - {fileID: 6097000079642511365, guid: 127c53d14a0062f41a16963a87a85dc5, type: 3} - {fileID: 6762149095286452822, guid: d7c2a5ac1f23afe428f872343ed56d71, type: 3} - {fileID: 7646078152559978388, guid: 40bc1f37707e62f4297f85bf5c7b01b4, type: 3} + - {fileID: 9096874691272071173, guid: df9ca486b9215294b871fe77d6a52372, type: 3} --- !u!1 &4171805761210331374 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Trap/TrapManager.cs b/Assets/Scripts/Trap/TrapManager.cs index 1f847ebb..84509b2c 100644 --- a/Assets/Scripts/Trap/TrapManager.cs +++ b/Assets/Scripts/Trap/TrapManager.cs @@ -28,6 +28,7 @@ async void Start() trapPrefabDictionary.Add("crossbow_down_prefab", trapPrefabs[0]); trapPrefabDictionary.Add("crossbow_up_prefab", trapPrefabs[1]); trapPrefabDictionary.Add("crossbow_side_prefab", trapPrefabs[2]); + trapPrefabDictionary.Add("bear_trap", trapPrefabs[3]); clientSocket = SocketManager.Instance.ClientSocket;