diff --git a/Assets/Scenes/ClarinetScene.unity b/Assets/Scenes/ClarinetScene.unity index e55fc78..b8c3853 100644 --- a/Assets/Scenes/ClarinetScene.unity +++ b/Assets/Scenes/ClarinetScene.unity @@ -1090,6 +1090,51 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &663459184 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 663459186} + - component: {fileID: 663459185} + m_Layer: 0 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!156049354 &663459185 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 663459184} + m_Enabled: 1 + m_CellSize: {x: 1, y: 1, z: 0} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!4 &663459186 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 663459184} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1600355027} + m_Father: {fileID: 0} + m_RootOrder: 18 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &680912964 GameObject: m_ObjectHideFlags: 0 @@ -2846,6 +2891,238 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1597618776} m_CullTransparentMesh: 1 +--- !u!1 &1600355026 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1600355027} + - component: {fileID: 1600355029} + - component: {fileID: 1600355028} + m_Layer: 0 + m_Name: Swamp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1600355027 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600355026} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 663459186} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!483693784 &1600355028 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600355026} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1839735485 &1600355029 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600355026} + m_Enabled: 1 + m_Tiles: + - first: {x: -37, y: -12, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -36, y: -12, 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: -35, y: -12, 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: -34, y: -12, 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: -33, y: -12, 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: -32, y: -12, 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: -31, y: -12, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -30, y: -12, 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 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: 52a05c9a292a7cb4999c15d18c3f0f30, type: 2} + - m_RefCount: 3 + m_Data: {fileID: 11400000, guid: 798041ec2cd3c584bab050019dc27b84, type: 2} + - m_RefCount: 3 + m_Data: {fileID: 11400000, guid: 742576fe45dca9445bb5b2fa485ebbdd, type: 2} + m_TileSpriteArray: + - m_RefCount: 2 + m_Data: {fileID: -776105136, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3} + - m_RefCount: 3 + m_Data: {fileID: -1084513563, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3} + - m_RefCount: 3 + m_Data: {fileID: 396735244, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3} + m_TileMatrixArray: + - m_RefCount: 8 + 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: 8 + 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: -37, y: -12, z: 0} + m_Size: {x: 37, y: 12, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + 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 --- !u!1 &1718644535 GameObject: m_ObjectHideFlags: 0 @@ -17488,8 +17765,8 @@ Tilemap: - first: {x: -18, y: -12, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 25 + m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -17498,8 +17775,8 @@ Tilemap: - first: {x: -17, y: -12, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 25 + m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -17508,8 +17785,8 @@ Tilemap: - first: {x: -16, y: -12, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 25 + m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -17518,8 +17795,8 @@ Tilemap: - first: {x: -15, y: -12, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 25 + m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -17528,8 +17805,8 @@ Tilemap: - first: {x: -14, y: -12, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 25 + m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -17538,8 +17815,8 @@ Tilemap: - first: {x: -13, y: -12, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 25 + m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -17548,8 +17825,8 @@ Tilemap: - first: {x: -12, y: -12, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 25 + m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -17558,8 +17835,8 @@ Tilemap: - first: {x: -11, y: -12, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 25 + m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -17568,8 +17845,8 @@ Tilemap: - first: {x: -10, y: -12, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 25 + m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -24319,7 +24596,7 @@ Tilemap: m_TileAssetArray: - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 56 + - m_RefCount: 47 m_Data: {fileID: 11400000, guid: 613380c5913ee4d90b8e3dfef129417a, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} @@ -24367,14 +24644,14 @@ Tilemap: m_Data: {fileID: 11400000, guid: 04cedf9866eca447da67163af51e45a7, type: 2} - m_RefCount: 5 m_Data: {fileID: 11400000, guid: 8ad16cf41deb94cf4afd912c15465261, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 605c24591df054320be61ee96783195e, type: 2} + - m_RefCount: 10 + m_Data: {fileID: 11400000, guid: 798041ec2cd3c584bab050019dc27b84, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 07d86560ccaba4bfab96ffe5bd008715, type: 2} m_TileSpriteArray: - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 56 + - m_RefCount: 47 m_Data: {fileID: -1873221857, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} @@ -24422,8 +24699,8 @@ Tilemap: m_Data: {fileID: -408254474, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - m_RefCount: 1 m_Data: {fileID: -1027637906, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 208169506, guid: 2097266264e574d71a38da279b45c7c0, type: 3} + - m_RefCount: 10 + m_Data: {fileID: -1084513563, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3} - m_RefCount: 1 m_Data: {fileID: -268434342, guid: 2097266264e574d71a38da279b45c7c0, type: 3} m_TileMatrixArray: @@ -24621,138 +24898,6 @@ CompositeCollider2D: Y: -63125000 - X: -250937504 Y: -63125000 - - - X: -100000000 - Y: -210000000 - - X: -100000000 - Y: -200000000 - - X: -120000000 - Y: -200000000 - - X: -120000000 - Y: -160000000 - - X: -170000000 - Y: -160000000 - - X: -170000000 - Y: -150000000 - - X: -120000000 - Y: -150000000 - - X: -120000000 - Y: -160000000 - - X: -110000000 - Y: -160000000 - - X: -110000000 - Y: -190000000 - - X: -90000000 - Y: -190000000 - - X: -90000000 - Y: -200000000 - - X: -80000000 - Y: -200000000 - - X: -80000000 - Y: -210000000 - - - X: -143750000 - Y: -153750000 - - X: -146250000 - Y: -153750000 - - X: -146250000 - Y: -156250000 - - X: -143750000 - Y: -156250000 - - - X: -133750000 - Y: -153750000 - - X: -136250000 - Y: -153750000 - - X: -136250000 - Y: -156250000 - - X: -133750000 - Y: -156250000 - - - X: -123750000 - Y: -153750000 - - X: -126250000 - Y: -153750000 - - X: -126250000 - Y: -156250000 - - X: -123750000 - Y: -156250000 - - - X: -153750000 - Y: -153750000 - - X: -156250000 - Y: -153750000 - - X: -156250000 - Y: -156250000 - - X: -153750000 - Y: -156250000 - - - X: -163750000 - Y: -153750000 - - X: -166250000 - Y: -153750000 - - X: -166250000 - Y: -156250000 - - X: -163750000 - Y: -156250000 - - - X: -113750000 - Y: -163750000 - - X: -116250000 - Y: -163750000 - - X: -116250000 - Y: -166250000 - - X: -113750000 - Y: -166250000 - - - X: -113750000 - Y: -173750000 - - X: -116250000 - Y: -173750000 - - X: -116250000 - Y: -176250000 - - X: -113750000 - Y: -176250000 - - - X: -113750000 - Y: -183750000 - - X: -116250000 - Y: -183750000 - - X: -116250000 - Y: -186250000 - - X: -113750000 - Y: -186250000 - - - X: -113750000 - Y: -193750000 - - X: -116250000 - Y: -193750000 - - X: -116250000 - Y: -196250000 - - X: -113750000 - Y: -196250000 - - - X: -93750000 - Y: -193750000 - - X: -96250000 - Y: -193750000 - - X: -96250000 - Y: -196250000 - - X: -93750000 - Y: -196250000 - - - X: -103750000 - Y: -193750000 - - X: -106250000 - Y: -193750000 - - X: -106250000 - Y: -196250000 - - X: -103750000 - Y: -196250000 - - - X: -83750000 - Y: -203750000 - - X: -86250000 - Y: -203750000 - - X: -86250000 - Y: -206250000 - - X: -83750000 - Y: -206250000 - - - X: -93750000 - Y: -203750000 - - X: -96250000 - Y: -203750000 - - X: -96250000 - Y: -206250000 - - X: -93750000 - Y: -206250000 m_CompositePaths: m_Paths: [] m_VertexDistance: 0.11 diff --git a/Assets/Sprites/Tilesets/Swamp/grass_tileset_110.asset b/Assets/Sprites/Tilesets/Swamp/grass_tileset_110.asset index f3ae7dd..e81e0d2 100644 --- a/Assets/Sprites/Tilesets/Swamp/grass_tileset_110.asset +++ b/Assets/Sprites/Tilesets/Swamp/grass_tileset_110.asset @@ -33,4 +33,4 @@ MonoBehaviour: e33: 1 m_InstancedGameObject: {fileID: 0} m_Flags: 1 - m_ColliderType: 1 + m_ColliderType: 2 diff --git a/Assets/Sprites/Tilesets/Swamp/grass_tileset_2.asset b/Assets/Sprites/Tilesets/Swamp/grass_tileset_2.asset index b9468fc..52e3294 100644 --- a/Assets/Sprites/Tilesets/Swamp/grass_tileset_2.asset +++ b/Assets/Sprites/Tilesets/Swamp/grass_tileset_2.asset @@ -33,4 +33,4 @@ MonoBehaviour: e33: 1 m_InstancedGameObject: {fileID: 0} m_Flags: 1 - m_ColliderType: 1 + m_ColliderType: 2 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 6c41ad1..e27cb48 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -14,4 +14,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/GrappleScene.unity guid: 448086d7e4e5643efb9aa6c436632072 + - enabled: 1 + path: Assets/Scenes/ClarinetScene.unity + guid: 92afc354c694b744eaf9279e7a8d5c29 m_configObjects: {}