diff --git a/Assets/Palettes/LevelPalette.prefab b/Assets/Palettes/LevelPalette.prefab index 3438a46..cf03f9b 100644 --- a/Assets/Palettes/LevelPalette.prefab +++ b/Assets/Palettes/LevelPalette.prefab @@ -101,7 +101,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 16 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -111,7 +111,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 12 - m_TileSpriteIndex: 1 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -131,7 +131,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 7 - m_TileSpriteIndex: 2 + m_TileSpriteIndex: 4294967295 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -181,7 +181,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 3 - m_TileSpriteIndex: 7 + m_TileSpriteIndex: 4294967295 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -191,7 +191,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 4 - m_TileSpriteIndex: 8 + m_TileSpriteIndex: 4294967295 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -201,7 +201,17 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 5 - m_TileSpriteIndex: 9 + m_TileSpriteIndex: 4294967295 + 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: 17 + m_TileSpriteIndex: 10 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -211,7 +221,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 13 - m_TileSpriteIndex: 10 + m_TileSpriteIndex: 7 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -221,7 +231,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 11 + m_TileSpriteIndex: 4294967295 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -231,7 +241,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 1 - m_TileSpriteIndex: 12 + m_TileSpriteIndex: 4294967295 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -241,7 +251,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 2 - m_TileSpriteIndex: 13 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -251,7 +261,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 14 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -293,13 +303,15 @@ Tilemap: m_Data: {fileID: 11400000, guid: b9f559ebe3dc30f41a5b963775b7b15a, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 3f89afda70a9b464cb51b38b1410fd58, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: a01b3ed4763b6b948ad3cc337953ba62, type: 2} m_TileSpriteArray: - m_RefCount: 1 m_Data: {fileID: 21300000, guid: d3b3cc2a1240bac40951958e257f2984, type: 3} - m_RefCount: 1 - m_Data: {fileID: 1371389217, guid: d4db151fbe2751a408aea21a96ebdd19, type: 3} + m_Data: {fileID: -2133342697, guid: d4db151fbe2751a408aea21a96ebdd19, type: 3} - m_RefCount: 1 - m_Data: {fileID: 21300000, guid: c2872d401b788cb4ea1d556ff8d524c0, type: 3} + m_Data: {fileID: 1371389217, guid: d4db151fbe2751a408aea21a96ebdd19, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300000, guid: c6e8544807d83604d85e701d98f8ca91, type: 3} - m_RefCount: 1 @@ -308,26 +320,16 @@ Tilemap: m_Data: {fileID: 1008980597, guid: d4db151fbe2751a408aea21a96ebdd19, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300000, guid: 89ef4f64706367d498e9e80cd9d2819b, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300000, guid: 439ff980df09bbf4b8c381c342478302, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300000, guid: 308af5810d97410439f42bad8c734569, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300000, guid: c2b1d85c88a14fb43b38edd6a81fb90a, type: 3} - m_RefCount: 1 m_Data: {fileID: -1127884870, guid: d4db151fbe2751a408aea21a96ebdd19, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300000, guid: 56695aff6012eb246b1b1cd28454f933, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300000, guid: 52aeeb19424a3ba438d998f3a41d6aa8, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300000, guid: 0ad2983bed21bb049b065cbc6efc57e8, type: 3} - m_RefCount: 1 m_Data: {fileID: -1907729535, guid: d4db151fbe2751a408aea21a96ebdd19, type: 3} - m_RefCount: 1 - m_Data: {fileID: -2133342697, guid: d4db151fbe2751a408aea21a96ebdd19, type: 3} + m_Data: {fileID: -974747892, guid: 7c2d6acd22d2d0c40b84d99967afb42a, type: 3} m_TileMatrixArray: - - m_RefCount: 17 + - m_RefCount: 18 m_Data: e00: 1 e01: 0 @@ -346,10 +348,10 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 16 + - m_RefCount: 17 m_Data: {r: 1, g: 1, b: 1, a: 1} - m_RefCount: 1 - m_Data: {r: 0.70377195, g: 0.44529033, b: 0.5272387, a: 1} + m_Data: {r: 0.7871933, g: 0.47979766, b: 0.5446725, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -423,7 +425,7 @@ TilemapRenderer: m_Mode: 0 m_DetectChunkCullingBounds: 0 m_MaskInteraction: 0 ---- !u!114 &3078893808619420526 +--- !u!114 &6019155510506342490 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Prefabs/Torch.prefab b/Assets/Prefabs/Torch.prefab index 966500a..229fe48 100644 --- a/Assets/Prefabs/Torch.prefab +++ b/Assets/Prefabs/Torch.prefab @@ -32,7 +32,7 @@ Transform: m_Children: - {fileID: 2194954945554171866} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &5539403884435416691 Animator: @@ -131,7 +131,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6936005445610605957} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0.0062603806, w: 0.9999804} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -166,7 +166,7 @@ MonoBehaviour: m_AlphaBlendOnOverlap: 0 m_OverlapOperation: 0 m_NormalMapDistance: 3 - m_NormalMapQuality: 2 + m_NormalMapQuality: 1 m_UseNormalMap: 0 m_ShadowIntensityEnabled: 0 m_ShadowIntensity: 0.75 @@ -175,10 +175,10 @@ MonoBehaviour: m_LocalBounds: m_Center: {x: 0, y: -0.00000011920929, z: 0} m_Extent: {x: 0.9985302, y: 0.99853027, z: 0} - m_PointLightInnerAngle: 360 - m_PointLightOuterAngle: 360 + m_PointLightInnerAngle: 329.47 + m_PointLightOuterAngle: 329.47 m_PointLightInnerRadius: 0 - m_PointLightOuterRadius: 1 + m_PointLightOuterRadius: 1.6876591 m_ShapeLightParametricSides: 5 m_ShapeLightParametricAngleOffset: 0 m_ShapeLightParametricRadius: 1 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 06865e4..26c1e77 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -193,8 +193,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -133646357 - m_SortingLayer: 2 + m_SortingLayerID: 769195415 + m_SortingLayer: 3 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 75e389298ad4a4346ba49430514b0629, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -2136,8 +2136,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -133646357 - m_SortingLayer: 2 + m_SortingLayerID: 769195415 + m_SortingLayer: 3 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 618309f12a7ca8b47b9aac8c7e39fc07, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -2202,7 +2202,7 @@ MonoBehaviour: m_Intensity: 1 m_LightVolumeIntensity: 1 m_LightVolumeIntensityEnabled: 0 - m_ApplyToSortingLayers: 00000000413d3badebb708f897fdd82d + m_ApplyToSortingLayers: 00000000413d3badebb708f897fdd82d8315a380 m_LightCookieSprite: {fileID: 0} m_DeprecatedPointLightCookieSprite: {fileID: 0} m_LightOrder: 0 @@ -2321,7 +2321,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: animator: {fileID: 1627236053} - MovementSpeed: 0.1 + MovementSpeed: 2 ladderLayer: serializedVersion: 2 m_Bits: 64 @@ -2388,7 +2388,7 @@ Transform: m_Children: - {fileID: 129193792} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!50 &510997472 Rigidbody2D: @@ -3092,7 +3092,7 @@ Transform: - {fileID: 2012902680} - {fileID: 1322461127} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1213536072 GameObject: @@ -3329,7 +3329,7 @@ TilemapRenderer: m_SortingLayer: 2 m_SortingOrder: 0 m_ChunkSize: {x: 32, y: 32, z: 32} - m_ChunkCullingBounds: {x: 0, y: 0.21757579, z: 0} + m_ChunkCullingBounds: {x: 0.007692337, y: 0.007692337, z: 0} m_MaxChunkCount: 16 m_MaxFrameAge: 16 m_SortOrder: 0 @@ -3348,8 +3348,8 @@ Tilemap: - first: {x: -7, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3358,8 +3358,8 @@ Tilemap: - first: {x: 8, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3368,8 +3368,8 @@ Tilemap: - first: {x: 12, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3378,8 +3378,8 @@ Tilemap: - first: {x: 16, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3388,8 +3388,8 @@ Tilemap: - first: {x: -7, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3398,8 +3398,8 @@ Tilemap: - first: {x: 8, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3408,8 +3408,8 @@ Tilemap: - first: {x: 13, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3418,8 +3418,8 @@ Tilemap: - first: {x: 16, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3428,8 +3428,8 @@ Tilemap: - first: {x: -7, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3438,8 +3438,8 @@ Tilemap: - first: {x: -3, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3448,8 +3448,8 @@ Tilemap: - first: {x: 8, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3458,8 +3458,8 @@ Tilemap: - first: {x: 14, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3468,8 +3468,8 @@ Tilemap: - first: {x: -7, y: -2, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3478,8 +3478,8 @@ Tilemap: - first: {x: -3, y: -2, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3488,8 +3488,8 @@ Tilemap: - first: {x: 8, y: -2, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3498,8 +3498,8 @@ Tilemap: - first: {x: 14, y: -2, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3508,8 +3508,8 @@ Tilemap: - first: {x: -7, y: -1, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3518,8 +3518,8 @@ Tilemap: - first: {x: -3, y: -1, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3528,8 +3528,8 @@ Tilemap: - first: {x: 10, y: -1, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3538,8 +3538,8 @@ Tilemap: - first: {x: 14, y: -1, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3548,8 +3548,8 @@ Tilemap: - first: {x: -3, y: 0, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3558,8 +3558,8 @@ Tilemap: - first: {x: 10, y: 0, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3568,8 +3568,8 @@ Tilemap: - first: {x: 14, y: 0, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3578,8 +3578,8 @@ Tilemap: - first: {x: -3, y: 1, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3588,8 +3588,8 @@ Tilemap: - first: {x: 8, y: 1, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3598,8 +3598,8 @@ Tilemap: - first: {x: 14, y: 1, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3608,8 +3608,8 @@ Tilemap: - first: {x: -2, y: 2, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3618,8 +3618,8 @@ Tilemap: - first: {x: 8, y: 2, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 4 + m_TileIndex: 4 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3635,10 +3635,10 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} + - m_RefCount: 28 + m_Data: {fileID: 11400000, guid: a01b3ed4763b6b948ad3cc337953ba62, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 28 - m_Data: {fileID: 11400000, guid: 54907339171673047ba183db663902df, type: 2} m_TileSpriteArray: - m_RefCount: 0 m_Data: {fileID: 0} @@ -3646,10 +3646,10 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} + - m_RefCount: 28 + m_Data: {fileID: -974747892, guid: 7c2d6acd22d2d0c40b84d99967afb42a, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 28 - m_Data: {fileID: 21300000, guid: 89ef4f64706367d498e9e80cd9d2819b, type: 3} m_TileMatrixArray: - m_RefCount: 28 m_Data: @@ -3994,12 +3994,12 @@ MonoBehaviour: m_ComponentVersion: 1 m_LightType: 3 m_BlendStyleIndex: 0 - m_FalloffIntensity: 0.5 + m_FalloffIntensity: 0.27 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_LightVolumeIntensity: 1 m_LightVolumeIntensityEnabled: 0 - m_ApplyToSortingLayers: 00000000413d3badebb708f897fdd82d + m_ApplyToSortingLayers: 00000000413d3badebb708f897fdd82d8315a380 m_LightCookieSprite: {fileID: 0} m_DeprecatedPointLightCookieSprite: {fileID: 0} m_LightOrder: 0 @@ -4017,7 +4017,7 @@ MonoBehaviour: m_Extent: {x: 0.9985302, y: 0.99853027, z: 0} m_PointLightInnerAngle: 360 m_PointLightOuterAngle: 360 - m_PointLightInnerRadius: 0 + m_PointLightInnerRadius: 0.41692847 m_PointLightOuterRadius: 19.960735 m_ShapeLightParametricSides: 5 m_ShapeLightParametricAngleOffset: 0 @@ -4033,12 +4033,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1665077322} m_LocalRotation: {x: 0, y: 0, z: -0.09011659, w: 0.9959312} - m_LocalPosition: {x: 6.3122845, y: 8.06997, z: 0} + m_LocalPosition: {x: 5.69, y: 4.65, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1679266697 GameObject: diff --git a/Assets/Scripts/Character.cs b/Assets/Scripts/Character.cs index 6c658fd..d428b90 100644 --- a/Assets/Scripts/Character.cs +++ b/Assets/Scripts/Character.cs @@ -20,7 +20,9 @@ public class Character : MonoBehaviour protected bool isAllowVertical = true; - protected bool isAllowHorisontal = true; + protected bool isAllowRight=true; + protected bool isAllowLeft= true; + private void Start() { _body = GetComponent(); @@ -29,13 +31,17 @@ public class Character : MonoBehaviour protected void MoveTo(float inputHorizontal,float inputVertical) { - var groundCheck = Physics2D.BoxCast(_boxCollider.bounds.center, _boxCollider.bounds.size, 0f, Vector2.down, .1f, groundLayer); + var groundCheck = CheckBounds(Vector2.down, groundLayer); float v_movement=0; if (groundCheck || _isOnLadder) { + var leftCheck = CheckBounds(Vector2.left, groundLayer); + var rightCheck = CheckBounds(Vector2.right, groundLayer); + if(leftCheck) { isAllowLeft = false; } + if (rightCheck) { isAllowRight = false; } + isAllowVertical = false; - isAllowHorisontal = true; _isFall = false; float h_movement = inputHorizontal; if (h_movement > 0 && !_facingRight) @@ -49,7 +55,7 @@ public class Character : MonoBehaviour animator.SetBool("Walk", h_movement != 0); - if (IsLadder(Vector2.down)) + if (CheckBounds(Vector2.down, ladderLayer)) { isAllowVertical = true; _isOnLadder = true; @@ -57,7 +63,7 @@ public class Character : MonoBehaviour if (v_movement > 0) { - if (!IsLadder(Vector2.up)) + if (!CheckBounds(Vector2.up,ladderLayer)) { v_movement = 0; } @@ -75,9 +81,9 @@ public class Character : MonoBehaviour } } - private RaycastHit2D IsLadder(Vector2 direction) + private RaycastHit2D CheckBounds(Vector2 direction,LayerMask layer) { - return Physics2D.BoxCast(_boxCollider.bounds.center, _boxCollider.bounds.size, 0f, direction, .1f, ladderLayer); + return Physics2D.BoxCast(_boxCollider.bounds.center, _boxCollider.bounds.size, 0f, direction, .1f, layer); } @@ -94,7 +100,7 @@ public class Character : MonoBehaviour } if (_isFall) { - if (IsLadder(Vector2.down)) + if (CheckBounds(Vector2.down,ladderLayer)) { _isOnLadder = true; } diff --git a/Assets/Scripts/EnemyAI.cs b/Assets/Scripts/EnemyAI.cs index b92d3f7..9ec0c31 100644 --- a/Assets/Scripts/EnemyAI.cs +++ b/Assets/Scripts/EnemyAI.cs @@ -1,22 +1,28 @@ using UnityEngine; using static UnityEditor.Searcher.SearcherWindow.Alignment; -public class EnemyAI :Character +public class EnemyAI : Character { private void Update() { float horizontal = 0; float vertical = 0; - if (Mathf.Abs(Player.Instance.transform.position.y - transform.position.y) > 0.5f && isAllowVertical) + + if (Player.Instance.transform.position.x - transform.position.x > -0.1f && isAllowLeft) { - vertical = Player.Instance.transform.position.y - transform.position.y; - }else - if (Mathf.Abs(Player.Instance.transform.position.x - transform.position.x)>0.5f && isAllowHorisontal) - { - horizontal = Player.Instance.transform.position.x - transform.position.x; + horizontal = -1; } - - + else if (Player.Instance.transform.position.x - transform.position.x > 0.1f && isAllowRight) + { + horizontal = 1; + } + + else if (Mathf.Abs(Player.Instance.transform.position.y - transform.position.y) > 0.1f && isAllowVertical) + { + var deltaY = Player.Instance.transform.position.y - transform.position.y; + vertical = deltaY > 0 ? 1 : -1; + } + base.MoveTo(horizontal, vertical); } } diff --git a/Assets/Sprites/Arts.meta b/Assets/Sprites/Arts.meta new file mode 100644 index 0000000..16decda --- /dev/null +++ b/Assets/Sprites/Arts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1037ff48491ac294a89da2fb2151cd3b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Arts/Environment.jpg b/Assets/Sprites/Arts/Environment.jpg new file mode 100644 index 0000000..fe7b348 Binary files /dev/null and b/Assets/Sprites/Arts/Environment.jpg differ diff --git a/Assets/Sprites/bullet.png.meta b/Assets/Sprites/Arts/Environment.jpg.meta similarity index 88% rename from Assets/Sprites/bullet.png.meta rename to Assets/Sprites/Arts/Environment.jpg.meta index 083312f..e4da3a6 100644 --- a/Assets/Sprites/bullet.png.meta +++ b/Assets/Sprites/Arts/Environment.jpg.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 9615672a3fbba7a4b8ad88b9084b4139 +guid: b7d38d9e837e72b4e95dc965092949d8 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 0 + filterMode: 1 aniso: 1 mipBias: 0 wrapU: 1 @@ -46,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 32 + spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -62,6 +64,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -73,6 +77,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -85,10 +90,11 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: WebGL + buildTarget: Server maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -97,6 +103,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -112,9 +119,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Sprites/New folder/VkingDana.jfif b/Assets/Sprites/Arts/VkingDana.jfif similarity index 100% rename from Assets/Sprites/New folder/VkingDana.jfif rename to Assets/Sprites/Arts/VkingDana.jfif diff --git a/Assets/Sprites/New folder/VkingDana.jfif.meta b/Assets/Sprites/Arts/VkingDana.jfif.meta similarity index 100% rename from Assets/Sprites/New folder/VkingDana.jfif.meta rename to Assets/Sprites/Arts/VkingDana.jfif.meta diff --git a/Assets/Sprites/New folder/VkingDana.png b/Assets/Sprites/Arts/VkingDana.png similarity index 100% rename from Assets/Sprites/New folder/VkingDana.png rename to Assets/Sprites/Arts/VkingDana.png diff --git a/Assets/Sprites/New folder/VkingDana.png.meta b/Assets/Sprites/Arts/VkingDana.png.meta similarity index 100% rename from Assets/Sprites/New folder/VkingDana.png.meta rename to Assets/Sprites/Arts/VkingDana.png.meta diff --git a/Assets/Sprites/New folder/game-weapon-icons-viking-jump-die-animation.zip b/Assets/Sprites/Arts/game-weapon-icons-viking-jump-die-animation.zip similarity index 100% rename from Assets/Sprites/New folder/game-weapon-icons-viking-jump-die-animation.zip rename to Assets/Sprites/Arts/game-weapon-icons-viking-jump-die-animation.zip diff --git a/Assets/Sprites/New folder/game-weapon-icons-viking-jump-die-animation.zip.meta b/Assets/Sprites/Arts/game-weapon-icons-viking-jump-die-animation.zip.meta similarity index 100% rename from Assets/Sprites/New folder/game-weapon-icons-viking-jump-die-animation.zip.meta rename to Assets/Sprites/Arts/game-weapon-icons-viking-jump-die-animation.zip.meta diff --git a/Assets/Sprites/Arts/platforms.pdn b/Assets/Sprites/Arts/platforms.pdn new file mode 100644 index 0000000..8804c80 Binary files /dev/null and b/Assets/Sprites/Arts/platforms.pdn differ diff --git a/Assets/Sprites/New folder/game-icons-set-character-viking-walk-cycle.zip.meta b/Assets/Sprites/Arts/platforms.pdn.meta similarity index 74% rename from Assets/Sprites/New folder/game-icons-set-character-viking-walk-cycle.zip.meta rename to Assets/Sprites/Arts/platforms.pdn.meta index e14ed00..7158e77 100644 --- a/Assets/Sprites/New folder/game-icons-set-character-viking-walk-cycle.zip.meta +++ b/Assets/Sprites/Arts/platforms.pdn.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f1eae6a7e81f91f4bb650dc48f853775 +guid: 917ee0b9ca86c6742b284099c72c688c DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Sprites/New folder/game-icons-set-character-viking-walk-cycle.zip b/Assets/Sprites/New folder/game-icons-set-character-viking-walk-cycle.zip deleted file mode 100644 index 46bf4cb..0000000 Binary files a/Assets/Sprites/New folder/game-icons-set-character-viking-walk-cycle.zip and /dev/null differ diff --git a/Assets/Sprites/Tileset.png b/Assets/Sprites/Tileset.png new file mode 100644 index 0000000..a16862e Binary files /dev/null and b/Assets/Sprites/Tileset.png differ diff --git a/Assets/Sprites/Tileset.png.meta b/Assets/Sprites/Tileset.png.meta new file mode 100644 index 0000000..73d740b --- /dev/null +++ b/Assets/Sprites/Tileset.png.meta @@ -0,0 +1,259 @@ +fileFormatVersion: 2 +guid: 7c2d6acd22d2d0c40b84d99967afb42a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 130 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Tileset_0 + rect: + serializedVersion: 2 + x: 92 + y: 176 + width: 133 + height: 131 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0354262f08cc7754d9be6a4d115c2d1b + internalID: 1045964120 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Tileset_1 + rect: + serializedVersion: 2 + x: 233 + y: 176 + width: 132 + height: 132 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ee075fd35e03f744bae3d980048a22c5 + internalID: -974747892 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Tileset_2 + rect: + serializedVersion: 2 + x: 371 + y: 280 + width: 135 + height: 23 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0173be16c3c05ce49bdf9895fbcc66ed + internalID: 606517438 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Tileset_3 + rect: + serializedVersion: 2 + x: 519 + y: 176 + width: 105 + height: 68 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 08746451f36704a418d5226514dfb978 + internalID: -277072053 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Tileset_4 + rect: + serializedVersion: 2 + x: 633 + y: 176 + width: 102 + height: 72 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5c19ba1c4b7651a4793592a1136a70eb + internalID: 362627935 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Tileset_5 + rect: + serializedVersion: 2 + x: 92 + y: 36 + width: 133 + height: 131 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a808d108936d8294eb1bf712b4efb522 + internalID: 221868806 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Tileset_0: 1045964120 + Tileset_1: -974747892 + Tileset_2: 606517438 + Tileset_3: -277072053 + Tileset_4: 362627935 + Tileset_5: 221868806 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Tileset_1.asset b/Assets/Sprites/Tileset_1.asset new file mode 100644 index 0000000..a198251 --- /dev/null +++ b/Assets/Sprites/Tileset_1.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Tileset_1 + m_EditorClassIdentifier: + m_Sprite: {fileID: -974747892, guid: 7c2d6acd22d2d0c40b84d99967afb42a, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + 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_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Sprites/Tileset_1.asset.meta b/Assets/Sprites/Tileset_1.asset.meta new file mode 100644 index 0000000..0788cf7 --- /dev/null +++ b/Assets/Sprites/Tileset_1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a01b3ed4763b6b948ad3cc337953ba62 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/bullet.png b/Assets/Sprites/bullet.png deleted file mode 100644 index 7a635e6..0000000 Binary files a/Assets/Sprites/bullet.png and /dev/null differ diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 360f445..12ce8ec 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -46,9 +46,12 @@ TagManager: - name: Background uniqueID: 2906340673 locked: 0 - - name: PlayerGround + - name: LevelGround uniqueID: 4161320939 locked: 0 - - name: Foreground + - name: PlayerGround uniqueID: 769195415 locked: 0 + - name: Foreground + uniqueID: 2158171523 + locked: 0