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

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

@@ -33,7 +33,9 @@ Transform:
   m_LocalScale: {x: 2, y: 2, z: 2}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 7706667664134421335}
+  - {fileID: 8897788953115388564}
+  - {fileID: 2701391753304029161}
+  - {fileID: 7254091017620377029}
   - {fileID: 2846352733245818337}
   - {fileID: 3431205680822026359}
   - {fileID: 2452183199171507967}
@@ -174,6 +176,195 @@ Transform:
   m_Children: []
   m_Father: {fileID: 2531220095456698737}
   m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+--- !u!1 &5285786073311382744
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7254091017620377029}
+  - component: {fileID: 6866465583812893036}
+  - component: {fileID: 4045566662944763094}
+  - component: {fileID: 1733264248055605106}
+  m_Layer: 15
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7254091017620377029
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5285786073311382744}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.71, y: 0, z: 3.808}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2531220095456698737}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &6866465583812893036
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5285786073311382744}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1.716955, y: 1.32, z: 2.17}
+  m_Center: {x: -0.4815224, y: 0, z: 0}
+--- !u!114 &4045566662944763094
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5285786073311382744}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 630780fe69aa45eda7d4bcf966516c7d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Orders.Order.RoomDispenserTrigger
+  orderDispenser: {fileID: 0}
+--- !u!54 &1733264248055605106
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5285786073311382744}
+  serializedVersion: 5
+  m_Mass: 1
+  m_LinearDamping: 0
+  m_AngularDamping: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 0
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!1 &6930441642230027415
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2701391753304029161}
+  - component: {fileID: 2307971360625533314}
+  - component: {fileID: 2505654922307354670}
+  - component: {fileID: 5273987199454154751}
+  m_Layer: 15
+  m_Name: Trigger
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2701391753304029161
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6930441642230027415}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000037748947, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.02, y: -0.51, z: 0.19}
+  m_LocalScale: {x: 3.16146, y: 0.941755, z: 10.76828}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2531220095456698737}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &2307971360625533314
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6930441642230027415}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 2.9766362, y: 1.8379288, z: 0.61419207}
+  m_Center: {x: -0.5026816, y: 1.5372393, z: 0.16614115}
+--- !u!114 &2505654922307354670
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6930441642230027415}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4207b7568dc3482393ac1860a31909b4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::Code.Generator.RoomTrigger
+--- !u!54 &5273987199454154751
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6930441642230027415}
+  serializedVersion: 5
+  m_Mass: 1
+  m_LinearDamping: 0
+  m_AngularDamping: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 0
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
 --- !u!1 &9104377702317550678
 GameObject:
   m_ObjectHideFlags: 0
@@ -700,6 +891,76 @@ Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 71055304af244254bba1d54e41058ab0, type: 3}
   m_PrefabInstance: {fileID: 2888124706300258204}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &6871778052384250651
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 2531220095456698737}
+    m_Modifications:
+    - target: {fileID: 525310225355114464, guid: 751890caa1647ec6689f24933fbcb770, type: 3}
+      propertyPath: m_ExcludeLayers.m_Bits
+      value: 69431
+      objectReference: {fileID: 0}
+    - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3417650473070914357, guid: 751890caa1647ec6689f24933fbcb770, type: 3}
+      propertyPath: m_Name
+      value: "\u0442\u0440\u0443\u0431\u0430"
+      objectReference: {fileID: 0}
+    - target: {fileID: 5059296592775712702, guid: 751890caa1647ec6689f24933fbcb770, type: 3}
+      propertyPath: m_Layer
+      value: 15
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 751890caa1647ec6689f24933fbcb770, type: 3}
+--- !u!4 &8897788953115388564 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3}
+  m_PrefabInstance: {fileID: 6871778052384250651}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7861094012685098978
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -804,107 +1065,3 @@ Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d7b86715f6793ff44ac74af769641c37, type: 3}
   m_PrefabInstance: {fileID: 7861094012685098978}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &7888384694579223740
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 2531220095456698737}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: d9f1519c4f8473a47801a8dac4b12255, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.6308
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: d9f1519c4f8473a47801a8dac4b12255, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.6308
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: d9f1519c4f8473a47801a8dac4b12255, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.6308
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: d9f1519c4f8473a47801a8dac4b12255, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -1.198
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: d9f1519c4f8473a47801a8dac4b12255, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -0.048
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: d9f1519c4f8473a47801a8dac4b12255, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 5.116
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: d9f1519c4f8473a47801a8dac4b12255, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: d9f1519c4f8473a47801a8dac4b12255, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.000000037748947
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: d9f1519c4f8473a47801a8dac4b12255, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: d9f1519c4f8473a47801a8dac4b12255, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: d9f1519c4f8473a47801a8dac4b12255, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: d9f1519c4f8473a47801a8dac4b12255, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: d9f1519c4f8473a47801a8dac4b12255, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: d9f1519c4f8473a47801a8dac4b12255, type: 3}
-      propertyPath: m_Name
-      value: "\u0442\u0440\u0443\u0431\u0430 (3)"
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: d9f1519c4f8473a47801a8dac4b12255, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 653217005347108973}
-  m_SourcePrefab: {fileID: 100100000, guid: d9f1519c4f8473a47801a8dac4b12255, type: 3}
---- !u!1 &7041454726315565549 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d9f1519c4f8473a47801a8dac4b12255, type: 3}
-  m_PrefabInstance: {fileID: 7888384694579223740}
-  m_PrefabAsset: {fileID: 0}
---- !u!64 &653217005347108973
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7041454726315565549}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 5
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 0}
---- !u!4 &7706667664134421335 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d9f1519c4f8473a47801a8dac4b12255, type: 3}
-  m_PrefabInstance: {fileID: 7888384694579223740}
-  m_PrefabAsset: {fileID: 0}