Merging model and player#1

Assets/Scenes/Greatest_map_ever/Greatest_map_ever.unity

@@ -1302,6 +1302,12 @@ Transform:
   m_Father: {fileID: 671439045}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+--- !u!4 &868386701 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
+    type: 3}
+  m_PrefabInstance: {fileID: 1809549197}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &884498019
 GameObject:
   m_ObjectHideFlags: 0
@@ -1340,7 +1346,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 0}
+    m_TransformParent: {fileID: 868386701}
     m_Modifications:
     - target: {fileID: 2836004473841745626, guid: f432554f564e69242897607d34218939,
         type: 3}
@@ -1350,22 +1356,22 @@ PrefabInstance:
     - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
         type: 3}
       propertyPath: m_RootOrder
-      value: 6
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 13.8
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 1.22
+      value: -1
       objectReference: {fileID: 0}
     - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: -11.53
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
         type: 3}
@@ -1409,94 +1415,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: f432554f564e69242897607d34218939, type: 3}
---- !u!1 &1061293906 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2836004475591695743, guid: f432554f564e69242897607d34218939,
-    type: 3}
-  m_PrefabInstance: {fileID: 1061293905}
-  m_PrefabAsset: {fileID: 0}
---- !u!64 &1061293907
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1061293906}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 0}
---- !u!136 &1061293908
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1061293906}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.5
-  m_Height: 1
-  m_Direction: 1
-  m_Center: {x: 0, y: 1, z: 0}
---- !u!114 &1061293909
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1061293906}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9826297ef4d853741b2af768441ec7f7, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  input_View: {x: 0, y: 0}
-  cameraHolder: {fileID: 0}
-  feetTransform: {fileID: 0}
-  playerSettings:
-    ViewXSensetivity: 0
-    ViewYSensetivity: 0
-    ViewXInverted: 0
-    ViewYInverted: 0
-    SprintingHold: 0
-    MovementSmoothing: 0
-    RunningForwardSpeed: 0
-    RunningStrafeSpeed: 0
-    WalkingForwardSpeed: 0
-    WalkingBackwardSpeed: 0
-    WalkingStrafeSpeed: 0
-    JumpingHeight: 0
-    JumpingFalloff: 0
-    FallingSmoothing: 0
-    SpeedEffector: 1
-    CrouchSpeedEffector: 0
-    ProneSpeedEffector: 0
-    FallingSpeedEffector: 0
-  ViewClampYMin: -70
-  ViewClampYMax: 80
-  playerMask:
-    serializedVersion: 2
-    m_Bits: 0
-  gravityAmount: 0
-  gravityMin: 0
-  jumpingForce: {x: 0, y: 0, z: 0}
-  playerStance: 0
-  playerStanceSmoothing: 0
-  playerStandStance:
-    CameraHeight: 0
-    StanceCollider: {fileID: 0}
-  playerCrouchStance:
-    CameraHeight: 0
-    StanceCollider: {fileID: 0}
-  playerProneStance:
-    CameraHeight: 0
-    StanceCollider: {fileID: 0}
-  currentWeapon: {fileID: 0}
 --- !u!1 &1116745543
 GameObject:
   m_ObjectHideFlags: 0
@@ -2342,10 +2260,15 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: -4942972567661207728, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
         type: 3}
       propertyPath: m_RootOrder
-      value: 7
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
         type: 3}
@@ -2417,6 +2340,16 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4528203471293941515, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4528203471293941515, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -2.417
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 99bb17a23a489624baeaf337f91a4f84, type: 3}
 --- !u!1 &1858987083