Merge branch 'mobs-and-levels-dev' into Dev

Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Box1.prefab

@@ -12,6 +12,7 @@ GameObject:
   - component: {fileID: 1481518050494246612}
   - component: {fileID: 3705230596345764382}
   - component: {fileID: 8540838740554826689}
+  - component: {fileID: 7141406513768745092}
   m_Layer: 0
   m_Name: Box1
   m_TagString: Untagged
@@ -125,6 +126,23 @@ MeshCollider:
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: 4804237099644351873, guid: 8f709f2569dab0246a3f3e5d6496c6f7, type: 3}
+--- !u!114 &7141406513768745092
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2912531434603723723}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5ba1a19c534f4401aa287d4b68ce470c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::Code.Generator.Room
+  roomType: 0
+  roomTimer: 10
+  enterMarker: {fileID: 5351108812078542921}
+  exitMarker: {fileID: 3979983528654112753}
+  door: {fileID: 0}
 --- !u!1 &3998036461115855542
 GameObject:
   m_ObjectHideFlags: 0

Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level1 3.prefab

@@ -14,7 +14,7 @@ GameObject:
   - component: {fileID: 9197991519508847130}
   - component: {fileID: 8472909641842022895}
   m_Layer: 0
-  m_Name: Level1
+  m_Name: Level1 3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level1Box.prefab

@@ -235,7 +235,7 @@ GameObject:
   - component: {fileID: 3477723652303856792}
   - component: {fileID: 5983638633854855048}
   m_Layer: 15
-  m_Name: Level1 2
+  m_Name: Level1Box
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level1Save.prefab

@@ -260,7 +260,7 @@ GameObject:
   - component: {fileID: 3477723652303856792}
   - component: {fileID: 5983638633854855048}
   m_Layer: 15
-  m_Name: Level1 1
+  m_Name: Level1Save
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Save1.prefab

@@ -43,6 +43,7 @@ GameObject:
   - component: {fileID: 3551564624086142828}
   - component: {fileID: 1634039740568140710}
   - component: {fileID: 6845601055732463106}
+  - component: {fileID: 8351462140297953793}
   m_Layer: 0
   m_Name: Save1
   m_TagString: Untagged
@@ -156,6 +157,23 @@ MeshCollider:
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: 4804237099644351873, guid: 64d2d93f8ea384e47b134f3de5182b73, type: 3}
+--- !u!114 &8351462140297953793
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 985648457316358771}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5ba1a19c534f4401aa287d4b68ce470c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::Code.Generator.Room
+  roomType: 1
+  roomTimer: 10
+  enterMarker: {fileID: 3335730486935238478}
+  exitMarker: {fileID: 1591990838045886174}
+  door: {fileID: 5314621602992352196}
 --- !u!1 &3172166553278198835
 GameObject:
   m_ObjectHideFlags: 0
@@ -1023,3 +1041,14 @@ MeshCollider:
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: 0}
+--- !u!114 &5314621602992352196 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4514000022478534075, guid: 5a328d367b793ebb1a43053026a3f461, type: 3}
+  m_PrefabInstance: {fileID: 8603466462898282111}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5201718462848227471}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bc9fc6ce2cc24b68b2b330e4fd029b80, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Door.Door

Game/CourierOld/Assets/Resources_moved/Prefabs/Rooms.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 54c121dfe5ac4c361b9c8f216a8cd4b7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: