From af4e402731d281a85eadec7b7985c400639a5db1 Mon Sep 17 00:00:00 2001 From: Anonymous Raccoon <32224410+AnonymusRaccoon@users.noreply.github.com> Date: Sat, 6 Oct 2018 22:06:29 +0200 Subject: [PATCH] Dirt gravity now work. --- Assets/{ => Prefabs}/Player 1.prefab | 0 Assets/{ => Prefabs}/Player 1.prefab.meta | 0 Assets/Scenes/SampleScene.unity | 279 ++++++++++++++++++---- Assets/Script/EnvironementManager.cs | 24 +- 4 files changed, 245 insertions(+), 58 deletions(-) rename Assets/{ => Prefabs}/Player 1.prefab (100%) rename Assets/{ => Prefabs}/Player 1.prefab.meta (100%) diff --git a/Assets/Player 1.prefab b/Assets/Prefabs/Player 1.prefab similarity index 100% rename from Assets/Player 1.prefab rename to Assets/Prefabs/Player 1.prefab diff --git a/Assets/Player 1.prefab.meta b/Assets/Prefabs/Player 1.prefab.meta similarity index 100% rename from Assets/Player 1.prefab.meta rename to Assets/Prefabs/Player 1.prefab.meta diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 409ab57..0f51a92 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -427,6 +427,177 @@ Tilemap: m_GameObject: {fileID: 489446559} m_Enabled: 1 m_Tiles: + - first: {x: -11, y: -7, z: 0} + second: + m_TileIndex: 10 + m_TileSpriteIndex: 10 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: -10, y: -7, z: 0} + second: + m_TileIndex: 20 + m_TileSpriteIndex: 20 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: -9, y: -7, z: 0} + second: + m_TileIndex: 30 + m_TileSpriteIndex: 30 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: -8, y: -7, z: 0} + second: + m_TileIndex: 36 + m_TileSpriteIndex: 36 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: -7, y: -7, z: 0} + second: + m_TileIndex: 41 + m_TileSpriteIndex: 41 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: -6, y: -7, z: 0} + second: + m_TileIndex: 46 + m_TileSpriteIndex: 46 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: -5, y: -7, z: 0} + second: + m_TileIndex: 52 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: -4, y: -7, z: 0} + second: + m_TileIndex: 60 + m_TileSpriteIndex: 60 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: -3, y: -7, z: 0} + second: + m_TileIndex: 68 + m_TileSpriteIndex: 68 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: -2, y: -7, z: 0} + second: + m_TileIndex: 76 + m_TileSpriteIndex: 76 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: -1, y: -7, z: 0} + second: + m_TileIndex: 86 + m_TileSpriteIndex: 86 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 0, y: -7, z: 0} + second: + m_TileIndex: 96 + m_TileSpriteIndex: 96 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 1, y: -7, z: 0} + second: + m_TileIndex: 106 + m_TileSpriteIndex: 106 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 2, y: -7, z: 0} + second: + m_TileIndex: 116 + m_TileSpriteIndex: 116 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 3, y: -7, z: 0} + second: + m_TileIndex: 126 + m_TileSpriteIndex: 126 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 4, y: -7, z: 0} + second: + m_TileIndex: 136 + m_TileSpriteIndex: 136 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 5, y: -7, z: 0} + second: + m_TileIndex: 146 + m_TileSpriteIndex: 146 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 6, y: -7, z: 0} + second: + m_TileIndex: 156 + m_TileSpriteIndex: 156 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 7, y: -7, z: 0} + second: + m_TileIndex: 166 + m_TileSpriteIndex: 166 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 - first: {x: -12, y: -6, z: 0} second: m_TileIndex: 1 @@ -2312,7 +2483,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 90685066d7017014c9b9f62420d2b4a0, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 3a7a70bec2147254ebf4744ec7f08ecb, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 392188b7b12826e4db585f63f10933ea, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 9cc01a9d6b5e27d418ec034d794a27d8, type: 2} @@ -2332,7 +2503,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 35ae072320399ab41a4809603ce4ea78, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: a5770dadf367e6c4aa50bf9509922666, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 2aa7ccd1fe1233e4099f294c031b316b, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 783862ab63b69784b917ac838808c4ac, type: 2} @@ -2352,7 +2523,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 803fd5ec3aeb3814c9faa30c1f313a9b, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: eef846d2e9cb5a04681667e7b8168516, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: d3d554f8e8356f74cbd36c65cec94f86, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: e443ff920adc52c4aac26b97898c0add, type: 2} @@ -2364,7 +2535,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: defa265e93d79d74cb7373fc027ebd0d, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 2648e979a03af8448ab06727e4c6129d, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 9c8ccad348a96ff45a20a0355aa5355f, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: b801ba8c93efe5440bb2307d2c0bc074, type: 2} @@ -2374,7 +2545,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 3efab6857c17a0d47aa1aa4558f1083b, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 300846d40c919e94eb846c1bde2f473a, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 5ba03c1b7e5f61a4c8ab25c5a59b2cc6, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: d8effd416dfc2bd49808fe802ad42703, type: 2} @@ -2384,7 +2555,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 06f531348e98fb947b2266bdbb3e91d0, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 0af812e348de84f4a990ce16bf1a746d, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 6cd8a08367e03434b977978617c65e4b, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 3d07cf22308ae4d4a8b23c0cc2f673b5, type: 2} @@ -2396,7 +2567,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: ba88dfe97f396114aae41969365668be, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 942ef4a4c92b89c4ab5d83c2e18b160b, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: ce254a34317086c42b3736f6195072e4, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: fb6f4e359c26e6c4fb262dbfe5218ae0, type: 2} @@ -2412,7 +2583,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: cbb15ede3eea156499bee8c11cb1bcec, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 1cb22e26afbb99b4e987275dc6f9fa1b, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: e27ed0e9d1c381449b9ba0d073ba4d60, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 62a6bf67aec63364296684369613611e, type: 2} @@ -2428,7 +2599,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 56c2fb8a21732f0429982b7f00024b7e, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: f0e43729a43f14e47bc73c7b17eba999, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 9f1e7d9bb434ecc42b992f41d00ae2d3, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 8940e3069c3540248952b206888664b6, type: 2} @@ -2444,7 +2615,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 91ddcac045b012c4a906048c234e5435, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: e4a174bdd62464c4f858a027e3717b3f, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 539b21c94178fa14abfd6c38897fb434, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 3879441f2ea84ac4b8d29b1363a33c4b, type: 2} @@ -2464,7 +2635,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 5d0857adac98aba4f82bc0c766542ef7, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 2cd3595b7e3660b4793f6c0ea915a683, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 08c691eaf6404144ca2926a2b30d1ea4, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: d457d82006d0c2142bbbf8231cbce82d, type: 2} @@ -2484,7 +2655,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: c6f3a80e2f9797c41bef8c1a5425f6ea, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: a157957bcbcc3834bacffea0346da858, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: ad9b47d159f88fb45b0c88be6ad151d3, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 193e06f5a2130024daaa8766b6929bea, type: 2} @@ -2504,7 +2675,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: a4b676ed0c7064345b1373e12904f252, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 1a44150ee865d3f40b40d8452e14899e, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 96c2ca8fa4251c04e83e1ca1cfa8c341, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 8b13adb0d2505a844ab400e40499cff1, type: 2} @@ -2524,7 +2695,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 8d44e1d65ef71334192685068aef0108, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 77492dfc143e19a4196e63b53a8d3e5c, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: d0b8e9e7eac82a94a970f3854e0dff8d, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 951dc3eb23d9d2246b6f2a11c2359fc3, type: 2} @@ -2544,7 +2715,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 67fe3e305bf3e3d47ab5708adf029702, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: e0aedbe7eced11644b002523ba84a3a8, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 81eae1ee088b9934b8bb101f3707cab6, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 9dda67de222fe284496d877975229065, type: 2} @@ -2564,7 +2735,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 8a8acfc461fb809458804bb464a9d276, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: af52f1a2e9862e64db0d851a2ceec040, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 47a1bf6e800f2894699687c26fd2bcf2, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: df65c2ec4357d484db201378f94fa90d, type: 2} @@ -2584,7 +2755,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 96a897d6c05a1784a973a85fa5ce4e3e, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: fa02be4ff65746d4fa4dea8111c7a976, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: ef29cb380d851fa49b1024ba064e5a1b, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 643393d774586ee449e2d18c23b8280d, type: 2} @@ -2604,7 +2775,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 1afbd5ee191df054bb84df9751c244c3, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 6119e5c6bdbed7949b48228ebfe75b84, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 00560e3cab5ce734b86ebeb045608bd7, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 4477f3ce3cd0575448beb5194176ad17, type: 2} @@ -2624,8 +2795,10 @@ Tilemap: m_Data: {fileID: 11400000, guid: 136b0eecbe7aedb4b8e8b9704701f062, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 509b5946e4af1264aa83b9a81e4932ba, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 7a8d7ce7680f31440af1015491e25894, type: 2} + - m_RefCount: 0 + m_Data: {fileID: 0} m_TileSpriteArray: - m_RefCount: 41 m_Data: {fileID: 21300000, guid: 4b853489fd7a76b4b9b6de748100e91d, type: 3} @@ -2647,7 +2820,7 @@ Tilemap: m_Data: {fileID: 21300400, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300440, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300480, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300122, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} @@ -2667,7 +2840,7 @@ Tilemap: m_Data: {fileID: 21300402, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300442, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300482, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300124, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} @@ -2687,7 +2860,7 @@ Tilemap: m_Data: {fileID: 21300404, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300444, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300484, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300206, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} @@ -2699,7 +2872,7 @@ Tilemap: m_Data: {fileID: 21300406, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300446, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300486, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300248, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} @@ -2709,7 +2882,7 @@ Tilemap: m_Data: {fileID: 21300408, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300448, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300488, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300130, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} @@ -2719,7 +2892,7 @@ Tilemap: m_Data: {fileID: 21300410, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300450, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300490, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300132, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} @@ -2731,7 +2904,7 @@ Tilemap: m_Data: {fileID: 21300412, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300452, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300492, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300134, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} @@ -2747,7 +2920,7 @@ Tilemap: m_Data: {fileID: 21300414, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300454, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300494, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300136, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} @@ -2763,7 +2936,7 @@ Tilemap: m_Data: {fileID: 21300416, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300456, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300496, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300138, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} @@ -2779,7 +2952,7 @@ Tilemap: m_Data: {fileID: 21300418, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300458, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300498, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300140, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} @@ -2799,7 +2972,7 @@ Tilemap: m_Data: {fileID: 21300420, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300460, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300500, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300142, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} @@ -2819,7 +2992,7 @@ Tilemap: m_Data: {fileID: 21300422, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300462, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300502, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300144, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} @@ -2839,7 +3012,7 @@ Tilemap: m_Data: {fileID: 21300424, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300464, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300504, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300146, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} @@ -2859,7 +3032,7 @@ Tilemap: m_Data: {fileID: 21300426, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300466, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300506, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300148, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} @@ -2879,7 +3052,7 @@ Tilemap: m_Data: {fileID: 21300428, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300468, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300508, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300150, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} @@ -2899,7 +3072,7 @@ Tilemap: m_Data: {fileID: 21300430, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300470, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300510, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300152, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} @@ -2919,7 +3092,7 @@ Tilemap: m_Data: {fileID: 21300432, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300472, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300512, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300154, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} @@ -2939,7 +3112,7 @@ Tilemap: m_Data: {fileID: 21300434, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300474, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300514, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300156, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} @@ -2959,10 +3132,12 @@ Tilemap: m_Data: {fileID: 21300436, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300476, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300516, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} m_TileMatrixArray: - - m_RefCount: 207 + - m_RefCount: 226 m_Data: e00: 1 e01: 0 @@ -2981,12 +3156,12 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 207 + - m_RefCount: 226 m_Data: {r: 1, g: 1, b: 1, a: 1} m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: -12, y: -6, z: 0} - m_Size: {x: 25, y: 13, z: 1} + m_Origin: {x: -12, y: -7, z: 0} + m_Size: {x: 25, y: 14, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -3084,11 +3259,21 @@ CompositeCollider2D: Y: 50150004 - X: -120000000 Y: -60180000 - - X: 90000000 + - X: -110029296 Y: -60180000 + - X: -110029296 + Y: -70210000 + - X: 80029296 + Y: -70210000 + - X: 80029296 + Y: -60023284 + - X: 90000000 + Y: -60023284 m_CompositePaths: m_Paths: - - - {x: 9, y: 5.0150003} + - - {x: 8.00293, y: -6.0023284} + - {x: 9, y: -6.0023284} + - {x: 9, y: 5.0150003} - {x: 8.004884, y: 5.0150003} - {x: 8.004884, y: 5.021857} - {x: -6.0029297, y: 5.021857} @@ -3111,7 +3296,9 @@ CompositeCollider2D: - {x: -11.00293, y: 5.0150003} - {x: -12, y: 5.0150003} - {x: -12, y: -6.018} - - {x: 9, y: -6.018} + - {x: -11.00293, y: -6.018} + - {x: -11.00293, y: -7.021} + - {x: 8.00293, y: -7.021} m_VertexDistance: 0.0005 --- !u!50 &489446565 Rigidbody2D: diff --git a/Assets/Script/EnvironementManager.cs b/Assets/Script/EnvironementManager.cs index 9551525..154b93c 100644 --- a/Assets/Script/EnvironementManager.cs +++ b/Assets/Script/EnvironementManager.cs @@ -23,30 +23,30 @@ public class EnvironementManager : MonoBehaviour if (tilemap.GetTile(new Vector3Int(pos.x - 1, pos.y, pos.z)) != null && !BlockIsStable(new Vector3Int(pos.x - 1, pos.y, pos.z))) { - tilemap.SetTile(new Vector3Int(pos.x - 1, pos.y, pos.z), null); + BreakTile(new Vector3Int(pos.x - 1, pos.y, pos.z)); SpawnFallingBlock(new Vector3Int(pos.x - 1, pos.y, pos.z)); } if (tilemap.GetTile(new Vector3Int(pos.x + 1, pos.y, pos.z)) != null && !BlockIsStable(new Vector3Int(pos.x + 1, pos.y, pos.z))) { - tilemap.SetTile(new Vector3Int(pos.x + 1, pos.y, pos.z), null); - SpawnFallingBlock(new Vector3Int(pos.x - 1, pos.y, pos.z)); + BreakTile(new Vector3Int(pos.x + 1, pos.y, pos.z)); + SpawnFallingBlock(new Vector3Int(pos.x + 1, pos.y, pos.z)); } if (tilemap.GetTile(new Vector3Int(pos.x, pos.y + 1, pos.z)) != null && !BlockIsStable(new Vector3Int(pos.x, pos.y + 1, pos.z))) { - tilemap.SetTile(new Vector3Int(pos.x, pos.y + 1, pos.z), null); - SpawnFallingBlock(new Vector3Int(pos.x - 1, pos.y, pos.z)); + BreakTile(new Vector3Int(pos.x, pos.y + 1, pos.z)); + SpawnFallingBlock(new Vector3Int(pos.x, pos.y + 1, pos.z)); } } - bool BlockIsStable(Vector3Int pos, int loopUnder = 0) + bool BlockIsStable(Vector3Int pos, int loopUnder = 0, bool checkedLeft = false, bool checkedRight = false) { if (BlockStableUnder(pos, loopUnder)) return true; - if (BlockStableLeft(pos)) + if (!checkedLeft && BlockStableLeft(pos)) return true; - if (BlockStableRight(pos)) + if (!checkedRight && BlockStableRight(pos)) return true; return false; @@ -68,7 +68,7 @@ public class EnvironementManager : MonoBehaviour if (tilemap.GetTile(pos) == imuable) return true; - if (tilemap.GetTile(new Vector3Int(pos.x - 1, pos.y, pos.z)) != null && BlockIsStable(new Vector3Int(pos.x - 1, pos.y, pos.z))) + if (tilemap.GetTile(new Vector3Int(pos.x - 1, pos.y, pos.z)) != null && BlockIsStable(new Vector3Int(pos.x - 1, pos.y, pos.z), 0, false, true)) return true; return false; @@ -79,7 +79,7 @@ public class EnvironementManager : MonoBehaviour if (tilemap.GetTile(pos) == imuable) return true; - if (tilemap.GetTile(new Vector3Int(pos.x + 1, pos.y, pos.z)) != null && BlockIsStable(new Vector3Int(pos.x + 1, pos.y, pos.z))) + if (tilemap.GetTile(new Vector3Int(pos.x + 1, pos.y, pos.z)) != null && BlockIsStable(new Vector3Int(pos.x + 1, pos.y, pos.z), 0, true, false)) return true; return false; @@ -104,8 +104,8 @@ public class EnvironementManager : MonoBehaviour } else { - tile = tilemap.GetTile(new Vector3Int(pos.x, pos.y + 1, pos.z)); - int index = int.Parse(tile.name.Substring(5)) + ((int)ITileType.Dirt + 1); + tile = tilemap.GetTile(new Vector3Int(pos.x, pos.y - 2, pos.z)); + int index = int.Parse(tile.name.Substring(5)); return (TileBase)Resources.Load("Dirt_" + index); } }