diff --git a/Assets/AssetsFORELLE/Script/ObjPressurePlateMod.cs b/Assets/AssetsFORELLE/Script/ObjPressurePlateMod.cs index 40871d4..4ce074c 100644 --- a/Assets/AssetsFORELLE/Script/ObjPressurePlateMod.cs +++ b/Assets/AssetsFORELLE/Script/ObjPressurePlateMod.cs @@ -24,9 +24,11 @@ void OnTriggerEnter2D(Collider2D other) { } +/* void OnTriggerExit2D(Collider2D other) { if (other.CompareTag("PressurePlatable")) { door.SetActive(true); } } +*/ } diff --git a/Assets/AssetsFORELLE/Sprites/Character/Enemy/Le Fish/le_fisch_draft.png.meta b/Assets/AssetsFORELLE/Sprites/Character/Enemy/Le Fish/le_fisch_draft.png.meta index bf79a62..0d79e2c 100644 --- a/Assets/AssetsFORELLE/Sprites/Character/Enemy/Le Fish/le_fisch_draft.png.meta +++ b/Assets/AssetsFORELLE/Sprites/Character/Enemy/Le Fish/le_fisch_draft.png.meta @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 16 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index e39a71b..360e85b 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -874,6 +874,26 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 74, y: -5, 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: 75, y: -5, 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: 26, y: -4, z: 0} second: serializedVersion: 2 @@ -1546,6 +1566,8 @@ Tilemap: m_Data: {fileID: 11400000, guid: 5053177dc9407104f8c0447e9bcad9bf, type: 2} - m_RefCount: 5 m_Data: {fileID: 11400000, guid: 50133fa4e0e4afb4ba606440af34a5bb, type: 2} + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: 15fde7a57a2625045ad0e1205ab6bc03, type: 2} m_TileSpriteArray: - m_RefCount: 11 m_Data: {fileID: 2131019399, guid: 25de63371975c93428d774786f3b0309, type: 3} @@ -1557,8 +1579,10 @@ Tilemap: m_Data: {fileID: 1885021431, guid: 25de63371975c93428d774786f3b0309, type: 3} - m_RefCount: 5 m_Data: {fileID: 1011569190, guid: 25de63371975c93428d774786f3b0309, type: 3} + - m_RefCount: 2 + m_Data: {fileID: 1920180403, guid: 45efae2189e416f4b9b78c0a9569ac0f, type: 3} m_TileMatrixArray: - - m_RefCount: 132 + - m_RefCount: 134 m_Data: e00: 1 e01: 0 @@ -1577,13 +1601,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 132 + - m_RefCount: 134 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: -10, z: 0} - m_Size: {x: 37, y: 12, z: 1} + m_Size: {x: 76, y: 12, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -1670,6 +1694,10 @@ PrefabInstance: propertyPath: m_Name value: FloatingPlatform(A) (1) objectReference: {fileID: 0} + - target: {fileID: 8980830585989345926, guid: ec1db46ed495a864da8579ecd96eb0d5, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 63ebef9d0499e6145ba8e32fe788cc92, type: 3} - target: {fileID: 9186447655588152684, guid: ec1db46ed495a864da8579ecd96eb0d5, type: 3} propertyPath: m_RootOrder value: 0 @@ -1999,6 +2027,7 @@ Transform: m_Children: - {fileID: 13895806} - {fileID: 2114933839} + - {fileID: 1582341026} m_Father: {fileID: 1317111512} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2120,6 +2149,67 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!1001 &381346741 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 245296660} + m_Modifications: + - target: {fileID: 1496965085621171596, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: door + value: + objectReference: {fileID: 2051002546} + - target: {fileID: 1496965085621171597, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1496965085621171597, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: m_LocalPosition.x + value: 78.52533 + objectReference: {fileID: 0} + - target: {fileID: 1496965085621171597, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: m_LocalPosition.y + value: -8.721411 + objectReference: {fileID: 0} + - target: {fileID: 1496965085621171597, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: m_LocalPosition.z + value: 0.22388083 + objectReference: {fileID: 0} + - target: {fileID: 1496965085621171597, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1496965085621171597, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1496965085621171597, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1496965085621171597, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1496965085621171597, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1496965085621171597, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1496965085621171597, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1496965085621171599, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: m_Name + value: BigPressurePlate_normal + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} --- !u!1 &385685517 GameObject: m_ObjectHideFlags: 0 @@ -2208,9 +2298,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 817866079} - {fileID: 1414207621} - {fileID: 1501535135} - - {fileID: 817866079} + - {fileID: 2051002549} m_Father: {fileID: 1317111512} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4253,6 +4344,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} m_PrefabInstance: {fileID: 1977137912} m_PrefabAsset: {fileID: 0} +--- !u!4 &1582341026 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1496965085621171597, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + m_PrefabInstance: {fileID: 381346741} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1629334693 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 828797199} + m_Modifications: + - target: {fileID: 6161590568038202171, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} + propertyPath: m_Name + value: door3 + objectReference: {fileID: 0} + - target: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} + propertyPath: m_LocalPosition.x + value: 82.52533 + objectReference: {fileID: 0} + - target: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} + propertyPath: m_LocalPosition.y + value: -6.7214103 + objectReference: {fileID: 0} + - target: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} + propertyPath: m_LocalPosition.z + value: 0.22388083 + objectReference: {fileID: 0} + - target: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} --- !u!1 &1642550968 GameObject: m_ObjectHideFlags: 0 @@ -4312,7 +4465,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} propertyPath: m_RootOrder - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} propertyPath: m_LocalPosition.x @@ -12197,8 +12350,8 @@ Tilemap: - first: {x: 85, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 0 + m_TileSpriteIndex: 0 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -12207,8 +12360,8 @@ Tilemap: - first: {x: 86, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 0 + m_TileSpriteIndex: 0 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -12217,8 +12370,8 @@ Tilemap: - first: {x: 87, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 0 + m_TileSpriteIndex: 0 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -12227,8 +12380,8 @@ Tilemap: - first: {x: 88, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 0 + m_TileSpriteIndex: 0 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -12237,8 +12390,8 @@ Tilemap: - first: {x: 89, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 0 + m_TileSpriteIndex: 0 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -12927,8 +13080,8 @@ Tilemap: - first: {x: 83, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 0 + m_TileSpriteIndex: 0 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -12944,56 +13097,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 85, y: -4, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 86, y: -4, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 87, y: -4, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 88, y: -4, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 89, y: -4, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 90, y: -4, z: 0} second: serializedVersion: 2 @@ -13654,71 +13757,11 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 83, y: -3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 84, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 85, y: -3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 86, y: -3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 87, y: -3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 88, y: -3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 89, y: -3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 0 + m_TileSpriteIndex: 0 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -14244,66 +14287,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 84, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 85, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 86, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 87, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 88, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 89, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 90, y: -2, z: 0} second: serializedVersion: 2 @@ -20796,9 +20779,9 @@ Tilemap: m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 99 + - m_RefCount: 106 m_Data: {fileID: 11400000, guid: e9a1498872aee134b9585312cb00987d, type: 2} - - m_RefCount: 1534 + - m_RefCount: 1510 m_Data: {fileID: 11400000, guid: 202a85484a5734b4a93707da8900a952, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} @@ -20807,9 +20790,9 @@ Tilemap: - m_RefCount: 0 m_Data: {fileID: 0} m_TileSpriteArray: - - m_RefCount: 99 + - m_RefCount: 106 m_Data: {fileID: -712921470, guid: 45efae2189e416f4b9b78c0a9569ac0f, type: 3} - - m_RefCount: 1534 + - m_RefCount: 1510 m_Data: {fileID: -2108126159, guid: 45efae2189e416f4b9b78c0a9569ac0f, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} @@ -20818,7 +20801,7 @@ Tilemap: - m_RefCount: 0 m_Data: {fileID: 0} m_TileMatrixArray: - - m_RefCount: 1633 + - m_RefCount: 1616 m_Data: e00: 1 e01: 0 @@ -20837,7 +20820,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 1633 + - m_RefCount: 1616 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -20940,7 +20923,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1906893163} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 80.34533, y: -6.34141, z: 0.11194041} + m_LocalPosition: {x: 87.07, y: -6.29, z: 0.11194041} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -20960,7 +20943,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} propertyPath: m_LocalPosition.x @@ -28669,8 +28652,8 @@ Tilemap: - first: {x: 71, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 0 + m_TileSpriteIndex: 0 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -28746,26 +28729,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 79, y: -5, 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: 80, y: -5, 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: 81, y: -5, z: 0} second: serializedVersion: 2 @@ -28809,8 +28772,8 @@ Tilemap: - first: {x: 85, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 0 + m_TileSpriteIndex: 0 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -28819,8 +28782,8 @@ Tilemap: - first: {x: 86, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 0 + m_TileSpriteIndex: 0 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -28829,8 +28792,8 @@ Tilemap: - first: {x: 87, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 0 + m_TileSpriteIndex: 0 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -28839,8 +28802,8 @@ Tilemap: - first: {x: 88, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 0 + m_TileSpriteIndex: 0 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -28849,8 +28812,8 @@ Tilemap: - first: {x: 89, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 0 + m_TileSpriteIndex: 0 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -29566,86 +29529,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 71, 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: 83, y: -4, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 84, y: -4, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 85, y: -4, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 86, y: -4, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 87, y: -4, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 88, y: -4, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 89, y: -4, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 90, y: -4, z: 0} second: serializedVersion: 2 @@ -30316,76 +30199,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 83, y: -3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 84, y: -3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 85, y: -3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 86, y: -3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 87, y: -3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 88, y: -3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 89, y: -3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 90, y: -3, z: 0} second: serializedVersion: 2 @@ -30886,76 +30699,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 83, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 84, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 85, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 86, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 87, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 88, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 89, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 90, y: -2, z: 0} second: serializedVersion: 2 @@ -37678,9 +37421,9 @@ Tilemap: m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 112 + - m_RefCount: 115 m_Data: {fileID: 11400000, guid: 92ae8533e6d106b47a1aacc33c40317c, type: 2} - - m_RefCount: 1546 + - m_RefCount: 1519 m_Data: {fileID: 11400000, guid: 15fde7a57a2625045ad0e1205ab6bc03, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} @@ -37693,9 +37436,9 @@ Tilemap: - m_RefCount: 0 m_Data: {fileID: 0} m_TileSpriteArray: - - m_RefCount: 112 + - m_RefCount: 115 m_Data: {fileID: -1225805465, guid: 45efae2189e416f4b9b78c0a9569ac0f, type: 3} - - m_RefCount: 1546 + - m_RefCount: 1519 m_Data: {fileID: 1920180403, guid: 45efae2189e416f4b9b78c0a9569ac0f, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} @@ -37708,7 +37451,7 @@ Tilemap: - m_RefCount: 0 m_Data: {fileID: 0} m_TileMatrixArray: - - m_RefCount: 1658 + - m_RefCount: 1634 m_Data: e00: 1 e01: 0 @@ -37727,7 +37470,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 1658 + - m_RefCount: 1634 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -37920,6 +37663,16 @@ PrefabInstance: objectReference: {fileID: 817866078} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} +--- !u!1 &2051002546 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6161590568038202171, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} + m_PrefabInstance: {fileID: 1629334693} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2051002549 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} + m_PrefabInstance: {fileID: 1629334693} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2111998704 PrefabInstance: m_ObjectHideFlags: 0 @@ -38320,7 +38073,7 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: d4e4429d49378634589d84fc73dad4ac, type: 3} - target: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} propertyPath: m_LocalPosition.x