Merge remote-tracking branch 'origin/master'

Assets/Scenes/Cementary.unity

@@ -94542,7 +94542,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 430323202}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 2.449, y: 33.529, z: 4.010647}
+  m_LocalPosition: {x: 2.495, y: 33.496, z: 4.010647}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1368903194}
@@ -184276,6 +184276,16 @@ Tilemap:
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
+  - first: {x: 33, y: 6, z: 0}
+    second:
+      serializedVersion: 2
+      m_TileIndex: 11
+      m_TileSpriteIndex: 45
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_TileObjectToInstantiateIndex: 65535
+      dummyAlignment: 0
+      m_AllTileFlags: 1073741825
   - first: {x: 44, y: 6, z: 0}
     second:
       serializedVersion: 2
@@ -184326,6 +184336,26 @@ Tilemap:
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
+  - first: {x: 59, y: 6, z: 0}
+    second:
+      serializedVersion: 2
+      m_TileIndex: 5
+      m_TileSpriteIndex: 40
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_TileObjectToInstantiateIndex: 65535
+      dummyAlignment: 0
+      m_AllTileFlags: 1073741825
+  - first: {x: 33, y: 7, z: 0}
+    second:
+      serializedVersion: 2
+      m_TileIndex: 8
+      m_TileSpriteIndex: 37
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_TileObjectToInstantiateIndex: 65535
+      dummyAlignment: 0
+      m_AllTileFlags: 1073741825
   - first: {x: 16, y: 21, z: 0}
     second:
       serializedVersion: 2
@@ -184418,19 +184448,19 @@ Tilemap:
     m_Data: {fileID: 11400000, guid: 6ec961d3d283f8044a1519f99b9c1fc3, type: 2}
   - m_RefCount: 1
     m_Data: {fileID: 11400000, guid: d7425ffb6280be5419d7e0b3cab98e07, type: 2}
-  - m_RefCount: 1
+  - m_RefCount: 2
     m_Data: {fileID: 11400000, guid: 9e8f11907811fc74f9927424a3ce6a35, type: 2}
   - m_RefCount: 2
     m_Data: {fileID: 11400000, guid: 473cd8080a510c046bac65a8972e1188, type: 2}
   - m_RefCount: 0
     m_Data: {fileID: 0}
-  - m_RefCount: 1
+  - m_RefCount: 2
     m_Data: {fileID: 11400000, guid: 0b4f09407a6a5d8488c283b261e61d42, type: 2}
   - m_RefCount: 6
     m_Data: {fileID: 11400000, guid: fde9439f3f6ff2f40bd7bd0c96c3fe35, type: 2}
   - m_RefCount: 1
     m_Data: {fileID: 11400000, guid: 55899e1592f1fd14899e4f0856bdc162, type: 2}
-  - m_RefCount: 1
+  - m_RefCount: 2
     m_Data: {fileID: 11400000, guid: 7b38ebda1550d7d4d85b1175ab5eeee8, type: 2}
   - m_RefCount: 0
     m_Data: {fileID: 0}
@@ -184575,13 +184605,13 @@ Tilemap:
     m_Data: {fileID: 0}
   - m_RefCount: 1
     m_Data: {fileID: -2255439837117920575, guid: 3a08fefc7df696140a7a44798f351457, type: 3}
-  - m_RefCount: 1
+  - m_RefCount: 2
     m_Data: {fileID: -5171500412666655693, guid: 3a08fefc7df696140a7a44798f351457, type: 3}
   - m_RefCount: 1
     m_Data: {fileID: 2102880159370495528, guid: 3a08fefc7df696140a7a44798f351457, type: 3}
   - m_RefCount: 1
     m_Data: {fileID: -5215574440687559048, guid: 3a08fefc7df696140a7a44798f351457, type: 3}
-  - m_RefCount: 1
+  - m_RefCount: 2
     m_Data: {fileID: -4708345747543669312, guid: 3a08fefc7df696140a7a44798f351457, type: 3}
   - m_RefCount: 1
     m_Data: {fileID: -7065577905438093053, guid: 3a08fefc7df696140a7a44798f351457, type: 3}
@@ -184591,10 +184621,10 @@ Tilemap:
     m_Data: {fileID: -5526086787534258956, guid: 3a08fefc7df696140a7a44798f351457, type: 3}
   - m_RefCount: 1
     m_Data: {fileID: 5460642430969849104, guid: 3a08fefc7df696140a7a44798f351457, type: 3}
-  - m_RefCount: 1
+  - m_RefCount: 2
     m_Data: {fileID: -4787789861565838938, guid: 3a08fefc7df696140a7a44798f351457, type: 3}
   m_TileMatrixArray:
-  - m_RefCount: 25
+  - m_RefCount: 28
     m_Data:
       e00: 1
       e01: 0
@@ -184613,7 +184643,7 @@ Tilemap:
       e32: 0
       e33: 1
   m_TileColorArray:
-  - m_RefCount: 25
+  - m_RefCount: 28
     m_Data: {r: 1, g: 1, b: 1, a: 1}
   m_TileObjectToInstantiateArray: []
   m_AnimationFrameRate: 1

ProjectSettings/EditorBuildSettings.asset

@@ -47,4 +47,13 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/NewGame - Confirmation.unity
     guid: 5a154444dad816d41b4e975d5866fd40
+  - enabled: 1
+    path: Assets/Scenes/Catacombs.unity
+    guid: 82ce5bf2f2f272c43b47777bf3d879e2
+  - enabled: 1
+    path: Assets/Scenes/FirstLabirynthCave.unity
+    guid: a4346d5149b2f1a4f8c7821efbb5e4a4
+  - enabled: 1
+    path: Assets/Scenes/SecondLabirynthCave.unity
+    guid: 69001702ffc3307468ca42491ced18b5
   m_configObjects: {}

UserSettings/EditorUserSettings.asset

@@ -6,35 +6,35 @@ EditorUserSettings:
   serializedVersion: 4
   m_ConfigSettings:
     RecentlyUsedScenePath-0:
-      value: 22424703114646680e0b0227036c72111f19352f223d667d6d0a123df6f23b34f1a923e7ee2e26
-      flags: 0
-    RecentlyUsedScenePath-1:
-      value: 200b1b3316501b4842040d290521103419001626232922236202182ac0e93a3cf1a817faf43f2b2f7631ec390a3b4f2afc031d12
-      flags: 0
-    RecentlyUsedScenePath-2:
-      value: 22424703114646680e0b0227036c7c1102161b25212a357e38271427fb
-      flags: 0
-    RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9
-      flags: 0
-    RecentlyUsedScenePath-4:
       value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021
       flags: 0
-    RecentlyUsedScenePath-5:
+    RecentlyUsedScenePath-1:
       value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021
       flags: 0
-    RecentlyUsedScenePath-6:
+    RecentlyUsedScenePath-2:
       value: 22424703114646680e0b0227036c70050204112e291f2f2a2c3b1920caef212be7a923e7ee2e26
       flags: 0
-    RecentlyUsedScenePath-7:
+    RecentlyUsedScenePath-3:
       value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb
       flags: 0
-    RecentlyUsedScenePath-8:
+    RecentlyUsedScenePath-4:
       value: 22424703114646680e0b0227036c68190c160a2e042733232867083debf42d
       flags: 0
-    RecentlyUsedScenePath-9:
+    RecentlyUsedScenePath-5:
       value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
       flags: 0
+    RecentlyUsedScenePath-6:
+      value: 22424703114646680e0b0227036c7c151b12163e2d3a3f7e38271427fb
+      flags: 0
+    RecentlyUsedScenePath-7:
+      value: 22424703114646680e0b0227036c791904040c062d2a2f223427093bc1e1223dacf238e0f323
+      flags: 0
+    RecentlyUsedScenePath-8:
+      value: 22424703114646680e0b0227036c6c151518162e002924393f301327eac3352ee7a923e7ee2e26
+      flags: 0
+    RecentlyUsedScenePath-9:
+      value: 22424703114646680e0b0227036c7c1102161b25212a357e38271427fb
+      flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650
       flags: 0