Movement work

Assets/Prefabs/Player/Player.prefab

@@ -15,6 +15,8 @@ GameObject:
   - component: {fileID: 22423270197361221}
   - component: {fileID: 3430607008353783612}
   - component: {fileID: 5813634793374795872}
+  - component: {fileID: 7137747041347675327}
+  - component: {fileID: 5292486849734085431}
   m_Layer: 6
   m_Name: Player
   m_TagString: Player
@@ -121,17 +123,18 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 72c1bd8f5d995784d813632e242e4fe8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  acceleration: 33
-  airSpeedModifier: 0.4
+  acceleration: 300
+  airSpeedModifier: 0.3
   maxSpeed: 15
   speedDecayTime: 1
   sprintMulti: 2
-  maxSprintBonus: 10
+  maxSprintBonus: 7.5
   sprintDecayTime: 1
-  sprintPercentMin: 0.1
+  sprintPercentMin: 0.2
   sprintTimeTotal: 3
   sprintTimeCurrent: 0
   sprintRecovery: 1
+  sprinting: 0
   staminaLocked: 0
   powerUpSpeedMulti: 1
   powerUpDecay: 1
@@ -142,8 +145,8 @@ MonoBehaviour:
   boostBonus: 0
   groundMask:
     serializedVersion: 2
-    m_Bits: 1
-  JumpForce: 999
+    m_Bits: 129
+  JumpForce: 444
   myBod: {fileID: 0}
   gliding: 0
   glideFallSpeed: 0
@@ -179,7 +182,7 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4099498095617253306}
   serializedVersion: 4
-  m_Mass: 2
+  m_Mass: 1
   m_Drag: 0
   m_AngularDrag: 0.05
   m_CenterOfMass: {x: 0, y: 0, z: 0}
@@ -197,7 +200,7 @@ Rigidbody:
   m_IsKinematic: 0
   m_Interpolate: 0
   m_Constraints: 0
-  m_CollisionDetection: 0
+  m_CollisionDetection: 2
 --- !u!114 &5813634793374795872
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -211,6 +214,46 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attenuationObject: {fileID: 0}
+--- !u!114 &7137747041347675327
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4099498095617253306}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 64bd17d3301b64ff6beab6874734e116, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  damageMultiplier: 1
+  damageDone: 0
+--- !u!114 &5292486849734085431
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4099498095617253306}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 483303bbea85340c68e31c570d720d9c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mainMusic:
+    Guid:
+      Data1: -1660532474
+      Data2: 1142351880
+      Data3: -1885633660
+      Data4: -378681346
+    Path: event:/MUS/Main Music
+  levelTwoThresh: 10000
+  levelThreeThresh: 25000
+  levelFourThresh: 50000
+  levelFiveThresh: 100000
+  levelSixThresh: 200000
+  currentChaosAmt: 0
+  gameManager: {fileID: 0}
 --- !u!1001 &806111126373336961
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scenes/Test Scenes/TestMovement.unity

@@ -2386,158 +2386,6 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9ca90b3ecceec834086f723c6ea5a3a9, type: 3}
---- !u!1001 &1867716463
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 22423270197361221, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: maxSpeed
-      value: 15
-      objectReference: {fileID: 0}
-    - target: {fileID: 22423270197361221, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: JumpForce
-      value: 999
-      objectReference: {fileID: 0}
-    - target: {fileID: 22423270197361221, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: maxSprintBonus
-      value: 7.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 22423270197361221, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: sprintRecovery
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 22423270197361221, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: airSpeedModifier
-      value: 0.3
-      objectReference: {fileID: 0}
-    - target: {fileID: 22423270197361221, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: sprintPercentMin
-      value: 0.2
-      objectReference: {fileID: 0}
-    - target: {fileID: 22423270197361221, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: groundMask.m_Bits
-      value: 129
-      objectReference: {fileID: 0}
-    - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 18.2
-      objectReference: {fileID: 0}
-    - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 1.3
-      objectReference: {fileID: 0}
-    - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 8.7
-      objectReference: {fileID: 0}
-    - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3430607008353783612, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: m_CollisionDetection
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 4099498095617253306, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: m_Name
-      value: Player (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 4099498095617253306, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: m_Layer
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 4099498095617253306, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4099498095617253306, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: m_TagString
-      value: Player
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 4099498095617253306, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1867716466}
-    - targetCorrespondingSourceObject: {fileID: 4099498095617253306, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1867716465}
-  m_SourcePrefab: {fileID: 100100000, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
---- !u!1 &1867716464 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4099498095617253306, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-  m_PrefabInstance: {fileID: 1867716463}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &1867716465
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1867716464}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 483303bbea85340c68e31c570d720d9c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  mainMusic:
-    Guid:
-      Data1: -1660532474
-      Data2: 1142351880
-      Data3: -1885633660
-      Data4: -378681346
-    Path: event:/MUS/Main Music
-  levelTwoThresh: 10000
-  levelThreeThresh: 25000
-  levelFourThresh: 50000
-  levelFiveThresh: 100000
-  levelSixThresh: 200000
-  currentChaosAmt: 0
-  gameManager: {fileID: 0}
---- !u!114 &1867716466
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1867716464}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 64bd17d3301b64ff6beab6874734e116, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  damageMultiplier: 1
-  damageDone: 0
 --- !u!1 &1881952914
 GameObject:
   m_ObjectHideFlags: 0
@@ -2988,42 +2836,6 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 22423270197361221, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: JumpForce
-      value: 444
-      objectReference: {fileID: 0}
-    - target: {fileID: 22423270197361221, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: acceleration
-      value: 300
-      objectReference: {fileID: 0}
-    - target: {fileID: 22423270197361221, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: powerUpDecay
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 22423270197361221, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: maxSprintBonus
-      value: 7.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 22423270197361221, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: airSpeedModifier
-      value: 0.3
-      objectReference: {fileID: 0}
-    - target: {fileID: 22423270197361221, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: powerUpDecayTime
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 22423270197361221, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: sprintPercentMin
-      value: 0.2
-      objectReference: {fileID: 0}
-    - target: {fileID: 22423270197361221, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: groundMask.m_Bits
-      value: 129
-      objectReference: {fileID: 0}
-    - target: {fileID: 22423270197361221, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: powerUpActiveTime
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -3064,78 +2876,15 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 3430607008353783612, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: m_Mass
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3430607008353783612, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: m_CollisionDetection
-      value: 2
-      objectReference: {fileID: 0}
     - target: {fileID: 4099498095617253306, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
       propertyPath: m_Name
       value: Player
       objectReference: {fileID: 0}
-    - target: {fileID: 7636007634996125437, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 4099498095617253306, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1187611123541258544}
-    - targetCorrespondingSourceObject: {fileID: 4099498095617253306, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1187611123541258543}
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
---- !u!1 &1187611123541258542 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4099498095617253306, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
-  m_PrefabInstance: {fileID: 1187611123541258541}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &1187611123541258543
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1187611123541258542}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 483303bbea85340c68e31c570d720d9c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  mainMusic:
-    Guid:
-      Data1: -1660532474
-      Data2: 1142351880
-      Data3: -1885633660
-      Data4: -378681346
-    Path: event:/MUS/Main Music
-  levelTwoThresh: 10000
-  levelThreeThresh: 25000
-  levelFourThresh: 50000
-  levelFiveThresh: 100000
-  levelSixThresh: 200000
-  currentChaosAmt: 0
-  gameManager: {fileID: 0}
---- !u!114 &1187611123541258544
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1187611123541258542}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 64bd17d3301b64ff6beab6874734e116, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  damageMultiplier: 1
-  damageDone: 0
 --- !u!1001 &2510730070770546001
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -3645,7 +3394,6 @@ SceneRoots:
   - {fileID: 640060685}
   - {fileID: 1585779859}
   - {fileID: 1187611123541258541}
-  - {fileID: 1867716463}
   - {fileID: 2645743919560437174}
   - {fileID: 689104400258981583}
   - {fileID: 763532945}