Merge branch 'development' into feature/Swinging-Blade

# Conflicts:
#	Assets/Scenes/TestControls.unity

Assets/MoveFloor.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
+using Unity.Mathematics;
 using UnityEngine;
 
 namespace MAVRIC.GEEKCup
@@ -13,6 +11,7 @@ namespace MAVRIC.GEEKCup
         [Range(0f, 10f)]
         [SerializeField] private float distance = 1f;
         
+        [PostNormalize]
         [SerializeField] private Vector3 direction = Vector3.right;
         
         private Vector3 startPos;
@@ -21,13 +20,17 @@ namespace MAVRIC.GEEKCup
         {
             startPos = transform.position;
         }
+        
         private void Update()
         {
-            if (Vector3.Distance(startPos, transform.position) >= distance || Vector3.Distance(startPos, transform.position) <= -distance)
+            if (Vector3.Distance(startPos, transform.position) >= distance * 0.5f || Vector3.Distance(startPos, transform.position) <= -distance * 0.5f)
             {
                 direction *= -1;
             }
-            transform.Translate((direction * 0.5f) * (speed * Time.deltaTime), Space.Self);
+
+            var speedScaled = speed * Time.deltaTime;
+            
+            transform.Translate(direction.normalized * speedScaled, Space.Self);
         }
     }
 }

Assets/Obstacles/Mavrik_Floor.prefab

@@ -12,7 +12,6 @@ GameObject:
   - component: {fileID: 33473778465350852}
   - component: {fileID: 23046709272025714}
   - component: {fileID: 65511906868894760}
-  - component: {fileID: 4307562666089112652}
   m_Layer: 0
   m_Name: Mavrik_Floor
   m_TagString: Untagged
@@ -106,18 +105,3 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 5.0003223, y: 0.2504834, z: 5.000693}
   m_Center: {x: -2.4997997, y: -0.10384083, z: 2.500337}
---- !u!114 &4307562666089112652
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1977579826803422}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4bab126a795d2f947be3865b060141b4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  speed: 1
-  distance: 3.54
-  direction: {x: 2, y: 0, z: 0}

Assets/Obstacles/Mavrik_Moving_Floor_LR.prefab

@@ -9,6 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 9202412964388832783}
+  - component: {fileID: 4286995637743126827}
   m_Layer: 0
   m_Name: Mavrik_Moving_Floor_LR
   m_TagString: Untagged
@@ -26,12 +27,27 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.15, y: 0.15, z: 0.3}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 4068998512539540012}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4286995637743126827
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5852534905605273225}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4bab126a795d2f947be3865b060141b4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  speed: 1
+  distance: 1
+  direction: {x: 1, y: 0, z: 0}
 --- !u!1001 &4069329506645428568
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -46,23 +62,27 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3}
       propertyPath: m_LocalScale.x
-      value: 1.5589
+      value: 0.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.2
       objectReference: {fileID: 0}
     - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3}
       propertyPath: m_LocalScale.z
-      value: 0.7636
+      value: 0.2
       objectReference: {fileID: 0}
     - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 1.3972
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 1.29
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 0.59106
+      value: -0.5
       objectReference: {fileID: 0}
     - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3}
       propertyPath: m_LocalRotation.w
@@ -92,6 +112,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab

@@ -1,86 +1,75 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &5852534905605273225
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 9202412964388832783}
-  m_Layer: 0
-  m_Name: Mavrik_Moving_Floor_UD
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &9202412964388832783
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5852534905605273225}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.15, y: 0.15, z: 0.15}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 4068998512539540012}
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &4069329506645428568
+--- !u!1001 &588363746560620146
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 9202412964388832783}
+    m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 1977579826803422, guid: 82dd9495d55e381469aa18791816e641, type: 3}
-      propertyPath: m_Name
-      value: Mavrik_Floor
+    - target: {fileID: 4286995637743126827, guid: 8bb5b5825668a3a4d843e44289f40265,
+        type: 3}
+      propertyPath: direction.x
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3}
+    - target: {fileID: 4286995637743126827, guid: 8bb5b5825668a3a4d843e44289f40265,
+        type: 3}
+      propertyPath: direction.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265,
+        type: 3}
+      propertyPath: m_Name
+      value: Mavrik_Moving_Floor_UD 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
+        type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3}
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
+        type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.43
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3}
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
+        type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3}
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
+        type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3}
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
+        type: 3}
       propertyPath: m_LocalRotation.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3}
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
+        type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3}
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
+        type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3}
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
+        type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3}
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
+        type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3}
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
+        type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
@@ -88,10 +77,4 @@ PrefabInstance:
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 82dd9495d55e381469aa18791816e641, type: 3}
---- !u!4 &4068998512539540012 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641,
-    type: 3}
-  m_PrefabInstance: {fileID: 4069329506645428568}
-  m_PrefabAsset: {fileID: 0}
+  m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3}

Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3e1810e9bda7d474f8a8848fdadc7393
+guid: b34cfc8e13e184f39aaabb834d9726eb
 PrefabImporter:
   externalObjects: {}
   userData: 

Assets/Obstacles/Mavrik_Sword_Spinning.prefab

@@ -63,15 +63,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0.383
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.302
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -0.124
+      value: -0.1
       objectReference: {fileID: 0}
     - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3}
       propertyPath: m_LocalRotation.w
@@ -126,15 +126,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0.383
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.302
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 0.133
+      value: 0.1
       objectReference: {fileID: 0}
     - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3}
       propertyPath: m_LocalRotation.w
@@ -189,11 +189,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0.2842522
+      value: -0.1
       objectReference: {fileID: 0}
     - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.3015899
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3}
       propertyPath: m_LocalPosition.z
@@ -252,15 +252,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0.511
+      value: 0.1
       objectReference: {fileID: 0}
     - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.302
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -0.002
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3}
       propertyPath: m_LocalRotation.w

Assets/Scenes/TestControls.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
+  m_IndirectSpecularColor: {r: 0.18028373, g: 0.22571398, b: 0.30692294, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -1232,7 +1232,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 2041401174}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &756557177
+--- !u!1001 &484828569
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -1240,57 +1240,57 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 5852534905605273225, guid: 3e1810e9bda7d474f8a8848fdadc7393,
+    - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265,
         type: 3}
       propertyPath: m_Name
-      value: Mavrik_Moving_Floor_UD
+      value: Mavrik_Moving_Floor_LR
       objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393,
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -2.565
+      value: -3
       objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393,
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.084350824
+      value: 0.1
       objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393,
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 0.737
+      value: 3
       objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393,
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.9578666
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393,
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393,
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.2872136
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393,
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393,
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393,
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 33.382
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393,
+    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
@@ -1299,7 +1299,7 @@ PrefabInstance:
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3}
 --- !u!1 &765144257
 GameObject:
   m_ObjectHideFlags: 0
@@ -2434,6 +2434,74 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1178232459}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1261485309
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 6418237261709279483, guid: b34cfc8e13e184f39aaabb834d9726eb,
+        type: 3}
+      propertyPath: m_Name
+      value: Mavrik_Moving_Floor_UD
+      objectReference: {fileID: 0}
+    - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b34cfc8e13e184f39aaabb834d9726eb, type: 3}
 --- !u!1 &1320667993
 GameObject:
   m_ObjectHideFlags: 0
@@ -2469,197 +2537,6 @@ Transform:
   - {fileID: 1663162369}
   m_Father: {fileID: 434066458}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1461727046
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265,
-        type: 3}
-      propertyPath: m_Name
-      value: Mavrik_Moving_Floor_LR
-      objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -4.4812126
-      objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.084350824
-      objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 1.6904504
-      objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.95816565
-      objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.2862143
-      objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 33.263
-      objectReference: {fileID: 0}
-    - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3}
---- !u!1001 &1479721660
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 686146779665115163, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -0.02
-      objectReference: {fileID: 0}
-    - target: {fileID: 686146779665115163, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 686146779665115163, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -0.115
-      objectReference: {fileID: 0}
-    - target: {fileID: 1083514133312506310, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -0.020999908
-      objectReference: {fileID: 0}
-    - target: {fileID: 1083514133312506310, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1083514133312506310, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0.119
-      objectReference: {fileID: 0}
-    - target: {fileID: 1674005170711084260, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -0.143
-      objectReference: {fileID: 0}
-    - target: {fileID: 1674005170711084260, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1946705203569613395, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_Name
-      value: Mavrik_Sword_Spinning
-      objectReference: {fileID: 0}
-    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -2.0544503
-      objectReference: {fileID: 0}
-    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.588
-      objectReference: {fileID: 0}
-    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0.895
-      objectReference: {fileID: 0}
-    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5551598098542832212, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0.104
-      objectReference: {fileID: 0}
-    - target: {fileID: 5551598098542832212, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5551598098542832212, guid: b4dc7aa08b379624c8c5295a57a26267,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: b4dc7aa08b379624c8c5295a57a26267, type: 3}
 --- !u!1 &1507380958
 GameObject:
   m_ObjectHideFlags: 0
@@ -2780,6 +2657,74 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   drag: 0
   angularDrag: 0
+--- !u!1001 &1597296109
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1946705203569613395, guid: b4dc7aa08b379624c8c5295a57a26267,
+        type: 3}
+      propertyPath: m_Name
+      value: Mavrik_Sword_Spinning
+      objectReference: {fileID: 0}
+    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -1.345
+      objectReference: {fileID: 0}
+    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.529
+      objectReference: {fileID: 0}
+    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 1.581
+      objectReference: {fileID: 0}
+    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b4dc7aa08b379624c8c5295a57a26267, type: 3}
 --- !u!1 &1663162368
 GameObject:
   m_ObjectHideFlags: 0
@@ -5355,6 +5300,6 @@ SceneRoots:
   - {fileID: 1895921797}
   - {fileID: 1885907698}
   - {fileID: 196185785}
-  - {fileID: 756557177}
-  - {fileID: 1461727046}
-  - {fileID: 1479721660}
+  - {fileID: 1261485309}
+  - {fileID: 1597296109}
+  - {fileID: 484828569}