diff --git a/Assets/Prefabs/DEBUG/PersistantData/DebugCanvas.prefab b/Assets/Prefabs/DEBUG/PersistantData/DebugCanvas.prefab index 751b3af..c13e00e 100644 --- a/Assets/Prefabs/DEBUG/PersistantData/DebugCanvas.prefab +++ b/Assets/Prefabs/DEBUG/PersistantData/DebugCanvas.prefab @@ -1113,7 +1113,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Rolling Caves + m_text: Rolling Caverns m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 6854b27dee6494bd1bab796422f6a3b1, type: 2} m_sharedMaterial: {fileID: 55571796086095593, guid: 6854b27dee6494bd1bab796422f6a3b1, type: 2} @@ -1387,7 +1387,7 @@ RectTransform: m_Children: - {fileID: 7749526488533549851} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2463,7 +2463,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Clarinet Swamp + m_text: Reed Swamp m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 6854b27dee6494bd1bab796422f6a3b1, type: 2} m_sharedMaterial: {fileID: 55571796086095593, guid: 6854b27dee6494bd1bab796422f6a3b1, type: 2} diff --git a/Assets/Scenes/GrappleScene.unity b/Assets/Scenes/GrappleScene.unity index a63c66e..f595fb3 100644 --- a/Assets/Scenes/GrappleScene.unity +++ b/Assets/Scenes/GrappleScene.unity @@ -1521,6 +1521,7 @@ Transform: - {fileID: 1866363915} - {fileID: 906228767} - {fileID: 1383539494} + - {fileID: 2120089895} - {fileID: 1027734973} - {fileID: 1507343986} - {fileID: 672084753} @@ -3960,6 +3961,84 @@ Transform: m_CorrespondingSourceObject: {fileID: 493245979038171992, guid: fe6515c8ba67e4334bd83dff507ec83e, type: 3} m_PrefabInstance: {fileID: 1107305515} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1126560255 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1413690797} + m_Modifications: + - target: {fileID: 367295637452716247, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} + propertyPath: m_Name + value: GrappleBox (7) + objectReference: {fileID: 0} + - target: {fileID: 1025473297745678352, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} + propertyPath: m_Radius + value: 1.9 + objectReference: {fileID: 0} + - target: {fileID: 1025473297745678352, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} + propertyPath: m_Offset.y + value: -19.99 + objectReference: {fileID: 0} + - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} + propertyPath: m_LocalScale.x + value: 3.02 + objectReference: {fileID: 0} + - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} + propertyPath: m_LocalPosition.x + value: -23.47 + objectReference: {fileID: 0} + - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} + propertyPath: m_LocalPosition.y + value: 16.94 + objectReference: {fileID: 0} + - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} + propertyPath: m_LocalPosition.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} +--- !u!4 &1126560256 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3} + m_PrefabInstance: {fileID: 1126560255} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1192387873 PrefabInstance: m_ObjectHideFlags: 0 @@ -4963,6 +5042,7 @@ Transform: - {fileID: 1817875257} - {fileID: 684906576} - {fileID: 1325296802} + - {fileID: 1126560256} m_Father: {fileID: 0} m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -52090,6 +52170,36 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -25, y: 16, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 26 + m_TileSpriteIndex: 23 + m_TileMatrixIndex: 2 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -24, y: 16, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 26 + m_TileSpriteIndex: 23 + m_TileMatrixIndex: 2 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -23, y: 16, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 26 + m_TileSpriteIndex: 23 + m_TileMatrixIndex: 2 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: 1, y: 16, z: 0} second: serializedVersion: 2 @@ -113014,7 +113124,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 605c24591df054320be61ee96783195e, type: 2} - m_RefCount: 204 m_Data: {fileID: 11400000, guid: db381af5bd75b4f909d3c46f4deafd2e, type: 2} - - m_RefCount: 21 + - m_RefCount: 24 m_Data: {fileID: 11400000, guid: 8ad16cf41deb94cf4afd912c15465261, type: 2} - m_RefCount: 17 m_Data: {fileID: 11400000, guid: 5ce4e22fedcc84d03b3e2f51a7fb77fa, type: 2} @@ -113095,7 +113205,7 @@ Tilemap: m_Data: {fileID: 1707607318, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - m_RefCount: 18 m_Data: {fileID: 208169506, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - - m_RefCount: 21 + - m_RefCount: 24 m_Data: {fileID: 858304779, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - m_RefCount: 13 m_Data: {fileID: -1027637906, guid: 2097266264e574d71a38da279b45c7c0, type: 3} @@ -113172,7 +113282,7 @@ Tilemap: e31: 0 e32: 0 e33: 1 - - m_RefCount: 21 + - m_RefCount: 24 m_Data: e00: -1 e01: 0.00000008742278 @@ -113281,7 +113391,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 10382 + - m_RefCount: 10385 m_Data: {r: 1, g: 1, b: 1, a: 1} - m_RefCount: 0 m_Data: {r: 0.742567, g: 0.36139938, b: 0.43682057, a: 1} @@ -114570,8 +114680,28 @@ CompositeCollider2D: Y: 190000000 - X: -270000000 Y: 170000000 - - X: -220000000 + - X: -250000000 Y: 170000000 + - X: -250000000 + Y: 167500000 + - X: -248124992 + Y: 166875008 + - X: -240937504 + Y: 166875008 + - X: -240000000 + Y: 167500000 + - X: -238124992 + Y: 166875008 + - X: -230937504 + Y: 166875008 + - X: -230000000 + Y: 167500000 + - X: -228124992 + Y: 166875008 + - X: -220937504 + Y: 166875008 + - X: -220000000 + Y: 167500000 - X: -220000000 Y: 220000000 - X: -140000000 @@ -115653,7 +115783,17 @@ CompositeCollider2D: - {x: -24, y: 19} - {x: -27, y: 19} - {x: -27, y: 17} - - {x: -22, y: 17} + - {x: -25, y: 17} + - {x: -25, y: 16.75} + - {x: -24.8125, y: 16.687502} + - {x: -24.09375, y: 16.687502} + - {x: -24, y: 16.75} + - {x: -23.8125, y: 16.687502} + - {x: -23.09375, y: 16.687502} + - {x: -23, y: 16.75} + - {x: -22.8125, y: 16.687502} + - {x: -22.09375, y: 16.687502} + - {x: -22, y: 16.75} - {x: -22, y: 22} - {x: -14, y: 22} - {x: -14, y: 21.937502} @@ -116328,7 +116468,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3} propertyPath: m_LocalPosition.y - value: 9.604257 + value: 7.18 objectReference: {fileID: 0} - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3} propertyPath: m_LocalPosition.z @@ -116512,6 +116652,76 @@ Transform: m_CorrespondingSourceObject: {fileID: 5447655033524966674, guid: 5e69412b9141e4bdeaaaf00f6dce7b82, type: 3} m_PrefabInstance: {fileID: 2062345891} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2120089894 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 340437845} + m_Modifications: + - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3} + propertyPath: m_LocalPosition.x + value: -68.88 + objectReference: {fileID: 0} + - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3} + propertyPath: m_LocalPosition.y + value: 48.02 + objectReference: {fileID: 0} + - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3} + propertyPath: m_LocalPosition.z + value: -1.3654507 + objectReference: {fileID: 0} + - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 493245979038171997, guid: c33beb037603b4e12a75275ec13369ef, type: 3} + propertyPath: m_Name + value: Bat (18) + objectReference: {fileID: 0} + - target: {fileID: 493245979038171999, guid: c33beb037603b4e12a75275ec13369ef, type: 3} + propertyPath: m_FlipX + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c33beb037603b4e12a75275ec13369ef, type: 3} +--- !u!4 &2120089895 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3} + m_PrefabInstance: {fileID: 2120089894} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1926772931522546277 PrefabInstance: m_ObjectHideFlags: 0