merge: Merge develop to menu

.gitignore

@@ -290,4 +290,8 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
+
+# Environment file
+.env
+
 # End of https://www.toptal.com/developers/gitignore/api/macos,windows,linux,unity,intellij+all,clion+all

Assets/Prefabs/Player.prefab

@@ -14,6 +14,7 @@ GameObject:
   - component: {fileID: 1803017460098482366}
   - component: {fileID: 2136192976700920181}
   - component: {fileID: 2952415180134692435}
+  - component: {fileID: 7904266034163262073}
   m_Layer: 0
   m_Name: Player
   m_TagString: Untagged
@@ -212,3 +213,15 @@ PolygonCollider2D:
       - {x: 0.057479188, y: -0.12709153}
       - {x: 0.046700563, y: -0.12571843}
   m_UseDelaunayMesh: 0
+--- !u!114 &7904266034163262073
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1463738777561398421}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9d1d8695cfa6948278518a6a55e0b730, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Assets/Prefabs/RoomSystem/Corridor/CorridorX7.prefab

@@ -1328,6 +1328,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3022020511561805294}
+  - component: {fileID: 1349095506272017240}
   m_Layer: 0
   m_Name: CorridorX7
   m_TagString: Map
@@ -1352,6 +1353,18 @@ Transform:
   - {fileID: 1238582843666978988}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1349095506272017240
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6369746937129949933}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9880ea29492da44c995f334244a5d19e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7452483412117750499
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/RoomSystem/Corridor/Room.prefab

@@ -2254,6 +2254,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3176463435939833076}
+  - component: {fileID: 3498959641617480557}
   m_Layer: 0
   m_Name: Room
   m_TagString: Map
@@ -2278,6 +2279,18 @@ Transform:
   - {fileID: 8436259702988649751}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3498959641617480557
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6459706332820108789}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9880ea29492da44c995f334244a5d19e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &8327367539400217474
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/EmptyRoom_2.unity

@@ -122,18 +122,19 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
---- !u!1 &98536830
+--- !u!1 &6611451
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 98536832}
-  - component: {fileID: 98536831}
-  m_Layer: 0
-  m_Name: TrapManager
+  - component: {fileID: 6611452}
+  - component: {fileID: 6611454}
+  - component: {fileID: 6611453}
+  m_Layer: 5
+  m_Name: Image
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -145,6 +146,7 @@ MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
+: {fileID: 1250698880}
   m_GameObject: {fileID: 98536830}
   m_Enabled: 1
   m_EditorHideFlags: 0
@@ -630,8 +632,11 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 583d4dca14d33eb4094ca6f875781ab9, type: 3}
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 6459706332820108789, guid: 35bed5d2a54129845bcff6b3abaa746b, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 791950512}
+  m_SourcePrefab: {fileID: 100100000, guid: 35bed5d2a54129845bcff6b3abaa746b, type: 3}
 --- !u!1001 &8803801296905376457
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -760,3 +765,4 @@ SceneRoots:
   - {fileID: 8615776833325847340}
   - {fileID: 8803801296905376457}
   - {fileID: 1166055672053893236}
+  - {fileID: 1655521569}