Merge branch 'player'

Assets/Prefabs/MapObjects/mirror.prefab

@@ -213,7 +213,7 @@ PrefabInstance:
     - target: {fileID: 5956712601794644638, guid: 6cee9ce2ee605c54c957dc68c69cea90,
         type: 3}
       propertyPath: ReflectLayers.m_Bits
-      value: 5943
+      value: 14135
       objectReference: {fileID: 0}
     - target: {fileID: 5956712601804180398, guid: 6cee9ce2ee605c54c957dc68c69cea90,
         type: 3}
@@ -313,7 +313,7 @@ PrefabInstance:
     - target: {fileID: 5956712601794644638, guid: 6cee9ce2ee605c54c957dc68c69cea90,
         type: 3}
       propertyPath: ReflectLayers.m_Bits
-      value: 5943
+      value: 14135
       objectReference: {fileID: 0}
     - target: {fileID: 5956712601804180398, guid: 6cee9ce2ee605c54c957dc68c69cea90,
         type: 3}

Assets/Prefabs/MapObjects/oneside mirror.prefab

@@ -52,7 +52,7 @@ MonoBehaviour:
   FarClipPlane: 100
   ReflectLayers:
     serializedVersion: 2
-    m_Bits: 1847
+    m_Bits: 10039
   AddFlareLayer: 0
   NormalIsForward: 1
   AspectRatio: 1.5

Assets/Prefabs/Navmesh.prefab

@@ -57,6 +57,6 @@ MonoBehaviour:
   m_OverrideTileSize: 0
   m_TileSize: 256
   m_OverrideVoxelSize: 0
-  m_VoxelSize: 0.1
+  m_VoxelSize: 0.06666667
   m_BuildHeightMesh: 0
-  m_NavMeshData: {fileID: 23800000, guid: abf93e927e1a1de4b83fc8150dff8999, type: 2}
+  m_NavMeshData: {fileID: 0}

Assets/Prefabs/Objects/case.prefab

@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 6644778239092870404}
   - component: {fileID: 6376510568108478465}
   - component: {fileID: 4433976770430682297}
-  m_Layer: 0
+  m_Layer: 13
   m_Name: Cylinder
   m_TagString: floor
   m_Icon: {fileID: 0}
@@ -92,7 +92,7 @@ GameObject:
   - component: {fileID: -2850530927027858165}
   - component: {fileID: -4559840392902712278}
   - component: {fileID: -954323813722370706}
-  m_Layer: 0
+  m_Layer: 13
   m_Name: case
   m_TagString: floor
   m_Icon: {fileID: 0}

Assets/Scenes/PlayStage.unity

@@ -305,7 +305,7 @@ Light:
   m_BounceIntensity: 1
   m_ColorTemperature: 6570
   m_UseColorTemperature: 0
-  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_BoundingSphereOverride: {x: 0.03125, y: 0.109375, z: 0.03125, w: -0.03125}
   m_UseBoundingSphereOverride: 0
   m_ShadowRadius: 0
   m_ShadowAngle: 0
@@ -430,7 +430,7 @@ Camera:
   m_Depth: -1
   m_CullingMask:
     serializedVersion: 2
-    m_Bits: 3895
+    m_Bits: 12087
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0

ProjectSettings/TagManager.asset

@@ -7,6 +7,7 @@ TagManager:
   - wall
   - floor
   - wallSign
+  - briefcase
   layers:
   - Default
   - TransparentFX
@@ -21,7 +22,7 @@ TagManager:
   - PostProcessing
   - RenderTexture
   - Head
-  - 
+  - Briefcase
   - 
   - 
   -