diff --git a/MuseumGame/Assets/Scenes/Winter/WinterBoss.unity b/MuseumGame/Assets/Scenes/Winter/WinterBoss.unity index 0103ff7..9ab84af 100644 --- a/MuseumGame/Assets/Scenes/Winter/WinterBoss.unity +++ b/MuseumGame/Assets/Scenes/Winter/WinterBoss.unity @@ -1040,17 +1040,61 @@ Tilemap: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 704042389} m_Enabled: 1 - m_Tiles: {} + m_Tiles: + - first: {x: 11, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 11, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 m_AnimatedTiles: {} - m_TileAssetArray: [] - m_TileSpriteArray: [] - m_TileMatrixArray: [] - m_TileColorArray: [] + m_TileAssetArray: + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: 4ac17d9e082984f54910344bb19b363f, type: 2} + m_TileSpriteArray: + - m_RefCount: 2 + m_Data: {fileID: -5416656696368440886, guid: 058f60ec88c1b564b88727548b47cce4, type: 3} + m_TileMatrixArray: + - m_RefCount: 2 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 2 + 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: 0, y: 0, z: 1} + m_Origin: {x: 0, y: -4, z: 0} + m_Size: {x: 12, y: 4, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -1201,16 +1245,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 11, y: -4, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: -11, y: -3, z: 0} second: serializedVersion: 2 @@ -1221,25 +1255,15 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 11, y: -3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 4 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 4ac17d9e082984f54910344bb19b363f, type: 2} m_TileSpriteArray: - - m_RefCount: 4 + - m_RefCount: 2 m_Data: {fileID: -5416656696368440886, guid: 058f60ec88c1b564b88727548b47cce4, type: 3} m_TileMatrixArray: - - m_RefCount: 4 + - m_RefCount: 2 m_Data: e00: 1 e01: 0 @@ -1258,7 +1282,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 4 + - m_RefCount: 2 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -1565,7 +1589,9 @@ MonoBehaviour: size: 2 newPos: -8 damageTaken: 10 - doors: [] + doors: + - {fileID: 1385169605} + - {fileID: 704042389} --- !u!95 &1747811964 Animator: serializedVersion: 3 @@ -1729,7 +1755,7 @@ SpriteRenderer: m_Size: {x: 5.8, y: 3.26} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &1869656763 @@ -1811,7 +1837,7 @@ SpriteRenderer: m_Size: {x: 5.8, y: 3.26} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &1932154424 @@ -1893,6 +1919,6 @@ SpriteRenderer: m_Size: {x: 5.8, y: 3.26} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 5ad452a..d25b288 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7b1f113b1d3c29246904221a1521ebee3f08edf033fbf22a7129370bfb25 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 + value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f1cece57a2decee22f0 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f07f5ef7a2decee22f0 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f07eaf2313dacf238e0f323 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b + value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e2926ecee3134acf238e0f323 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 + value: 22424703114646680e0b0227036c72111f19352f223d68252320092a flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb + value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f15edf52676f7e93ffdfe flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c72111f19352f223d68252320092a + value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f11edf32776f7e93ffdfe flags: 0 vcSharedLogLevel: value: 0d5e400f0650