Refactor player

Assets/GameObjects/Prefabs/Player.prefab

@@ -24,11 +24,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 379718841342258282}
   m_LocalRotation: {x: -0.000000014901156, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -0.079, z: 0.751}
+  m_LocalPosition: {x: 0, y: 0.121, z: 0.7509999}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 5865459614374463333}
-  m_Father: {fileID: 1865991757674780053}
+  m_Father: {fileID: 6532210512705233048}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1108995136692721886
@@ -40,8 +40,9 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6532210512705233048}
+  - component: {fileID: 5936763286718212152}
   m_Layer: 0
-  m_Name: BobbingRoot
+  m_Name: Bobber
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -59,9 +60,29 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 5736092089644017385}
+  - {fileID: 2637233632139837434}
   m_Father: {fileID: 1865991757674780053}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &5936763286718212152
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1108995136692721886}
+  m_Enabled: 0
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 8468d9a1f10314a4c998349493611489, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &1607323028047207915
 GameObject:
   m_ObjectHideFlags: 0
@@ -91,8 +112,8 @@ Transform:
   m_LocalPosition: {x: 0, y: -0.02, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 4344588326737764943}
+  - {fileID: 4103164600241655739}
-  - {fileID: 9195014419894370611}
+  - {fileID: 2498596356784760024}
   m_Father: {fileID: 7391558912774766616}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -108,9 +129,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0967925ac1c8b7341a01d7b87cd66572, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  Soldiers:
+  - {fileID: 7931246460515997121}
+  - {fileID: 8380320334439546530}
+  Model: 0
   Player: {fileID: 7391558912774766619}
-  Soldier: {fileID: 7686299603569653813}
   HeadCollider: {fileID: 7391558913556166742}
+  GunGluedToHand: 1
+  Gun: {fileID: 1865991757674780053}
+  GunHandle: {fileID: 5713660789478474713}
 --- !u!114 &6585337033203946896
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -133,9 +160,9 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1865991757674780053}
-  - component: {fileID: 2075495528035690810}
+  - component: {fileID: 4825183178267082914}
   m_Layer: 0
-  m_Name: GunRoot
+  m_Name: Gun
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -149,102 +176,21 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2071588178488902664}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.15, y: -0.071, z: 0.309}
+  m_LocalPosition: {x: 0.15, y: -0.27100003, z: 0.309}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 5713660789478474713}
   - {fileID: 6532210512705233048}
-  - {fileID: 2637233632139837434}
-  m_Father: {fileID: 3811958100146932696}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!95 &2075495528035690810
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2071588178488902664}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 8468d9a1f10314a4c998349493611489, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
---- !u!1 &2694226706486366723
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6894328493782316953}
-  m_Layer: 0
-  m_Name: GunHolder
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6894328493782316953
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2694226706486366723}
-  m_LocalRotation: {x: 0.62209785, y: -0.096872635, z: -0.764866, w: -0.13634536}
-  m_LocalPosition: {x: -0.0015700015, y: -0.00089000113, z: -0.0011400004}
-  m_LocalScale: {x: 0.025000002, y: 0.024999993, z: 0.024999991}
-  m_Children: []
-  m_Father: {fileID: 7030345375001973551}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2970260390919355544
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3811958100146932696}
-  - component: {fileID: 4000144568201082722}
-  m_Layer: 0
-  m_Name: GunRootAboveAnimator
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3811958100146932696
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2970260390919355544}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 1865991757674780053}
   m_Father: {fileID: 4833458671639168932}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &4000144568201082722
+--- !u!114 &4825183178267082914
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2970260390919355544}
+  m_GameObject: {fileID: 2071588178488902664}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: c0e8b530a9e9275419a275e5557a0420, type: 3}
@@ -302,7 +248,7 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 0
-  MinDistance: 1
+  MinDistance: 2
   MaxDistance: 1000
   Pan2D: 0
   rolloffMode: 0
@@ -378,6 +324,36 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+--- !u!1 &7084970559242515990
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5713660789478474713}
+  m_Layer: 0
+  m_Name: GunHandle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5713660789478474713
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7084970559242515990}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.112, z: -0.173}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1865991757674780053}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7391558912582364398
 GameObject:
   m_ObjectHideFlags: 0
@@ -514,7 +490,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 550df8ac62d76a64a8c621ea6b32398f, type: 2}
   - {fileID: 11400000, guid: 2d9739d3745581a41ae0ed6a569766d5, type: 2}
   Gun: {fileID: 1865991757674780053}
-  GunBobber: {fileID: 2075495528035690810}
+  GunBobber: {fileID: 5936763286718212152}
   DisabledOnDeath:
   - {fileID: 7391558912582364398}
   - {fileID: 7391558913556166741}
@@ -525,7 +501,7 @@ MonoBehaviour:
     m_Bits: 823
   Cooldown: 1
   Lerpables:
-  - {fileID: 4000144568201082722}
+  - {fileID: 4825183178267082914}
   - {fileID: 6585337033203946896}
   Lean: 0
   LaserPrefab: {fileID: 8009551885746485900, guid: 5c99da0361d098646b319a35fcc80095, type: 3}
@@ -548,7 +524,7 @@ MonoBehaviour:
   GroundCastLength: 0.2
   GroundLayer:
     serializedVersion: 2
-    m_Bits: 256
+    m_Bits: 11009
   ShowGroundCast: 0
   ShowMoveVector: 0
 --- !u!1 &7391558913556166741
@@ -749,7 +725,7 @@ Transform:
   m_LocalPosition: {x: 0, y: 1.6, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 3811958100146932696}
+  - {fileID: 1865991757674780053}
   m_Father: {fileID: 7391558912774766616}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -820,7 +796,90 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 572981381687391808, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
   m_PrefabInstance: {fileID: 892884152691873703}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &4305913406570759588
+--- !u!1001 &2676956051575718707
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1734861684113691137}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+      propertyPath: m_Name
+      value: SoldierM
+      objectReference: {fileID: 0}
+    - target: {fileID: 5866666021909216657, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+      propertyPath: m_Controller
+      value: 
+      objectReference: {fileID: 9100000, guid: 9917118805dd64449bd5bc1b9d284eff, type: 2}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+--- !u!95 &8380320334439546530 stripped
+Animator:
+  m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+  m_PrefabInstance: {fileID: 2676956051575718707}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &2498596356784760024 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+  m_PrefabInstance: {fileID: 2676956051575718707}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &4574503883554023504
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -833,7 +892,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
       propertyPath: m_LocalPosition.z
@@ -873,512 +932,35 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
       propertyPath: m_LocalScale.x
-      value: 0.4
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.4
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
       propertyPath: m_LocalScale.z
-      value: 0.4
+      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: -8670776965962096019, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8670776965962096019, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8514005654889199914, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.003704905
-      objectReference: {fileID: 0}
-    - target: {fileID: -8514005654889199914, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.12723981
-      objectReference: {fileID: 0}
-    - target: {fileID: -8514005654889199914, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0.028867956
-      objectReference: {fileID: 0}
-    - target: {fileID: -8514005654889199914, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.99144495
-      objectReference: {fileID: 0}
-    - target: {fileID: -8514005654889199914, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 7.450611e-11
-      objectReference: {fileID: 0}
-    - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.11726038
-      objectReference: {fileID: 0}
-    - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0.78692883
-      objectReference: {fileID: 0}
-    - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.10534324
-      objectReference: {fileID: 0}
-    - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.59657013
-      objectReference: {fileID: 0}
-    - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 2.9802363e-10
-      objectReference: {fileID: 0}
-    - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.005000001
-      objectReference: {fileID: 0}
-    - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 1.0658127e-16
-      objectReference: {fileID: 0}
-    - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.4025505
-      objectReference: {fileID: 0}
-    - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0.5795139
-      objectReference: {fileID: 0}
-    - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0.39851758
-      objectReference: {fileID: 0}
-    - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.5859185
-      objectReference: {fileID: 0}
-    - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -4.1526386e-11
-      objectReference: {fileID: 0}
-    - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.010049878
-      objectReference: {fileID: 0}
-    - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 7.450577e-11
-      objectReference: {fileID: 0}
-    - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.5337629
-      objectReference: {fileID: 0}
-    - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.46430966
-      objectReference: {fileID: 0}
-    - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.52586335
-      objectReference: {fileID: 0}
-    - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.4722092
-      objectReference: {fileID: 0}
-    - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0.00692738
-      objectReference: {fileID: 0}
-    - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.0015562114
-      objectReference: {fileID: 0}
-    - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0.00002694261
-      objectReference: {fileID: 0}
-    - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.7331161
-      objectReference: {fileID: 0}
-    - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.6280448
-      objectReference: {fileID: 0}
-    - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.20716763
-      objectReference: {fileID: 0}
-    - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.15868898
-      objectReference: {fileID: 0}
-    - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -0.0009899489
-      objectReference: {fileID: 0}
-    - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.0069296476
-      objectReference: {fileID: 0}
-    - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 8.344645e-10
-      objectReference: {fileID: 0}
-    - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.53583217
-      objectReference: {fileID: 0}
-    - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0.4953873
-      objectReference: {fileID: 0}
-    - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0.52479625
-      objectReference: {fileID: 0}
-    - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.43825138
-      objectReference: {fileID: 0}
-    - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -1.3915952e-11
-      objectReference: {fileID: 0}
-    - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.010049876
-      objectReference: {fileID: 0}
-    - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 5.9604643e-10
-      objectReference: {fileID: 0}
-    - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.04723739
-      objectReference: {fileID: 0}
-    - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.00006174668
-      objectReference: {fileID: 0}
-    - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.924667
-      objectReference: {fileID: 0}
-    - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: -0.37783542
-      objectReference: {fileID: 0}
-    - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 3.352766e-10
-      objectReference: {fileID: 0}
-    - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.005
-      objectReference: {fileID: 0}
-    - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0.0000000026822078
-      objectReference: {fileID: 0}
-    - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.9822163
-      objectReference: {fileID: 0}
-    - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.03571471
-      objectReference: {fileID: 0}
-    - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.035714716
-      objectReference: {fileID: 0}
-    - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.18083201
-      objectReference: {fileID: 0}
-    - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 3.6172504e-10
-      objectReference: {fileID: 0}
-    - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.0035000027
-      objectReference: {fileID: 0}
-    - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0.0015000001
-      objectReference: {fileID: 0}
-    - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.22521979
-      objectReference: {fileID: 0}
-    - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0.6452314
-      objectReference: {fileID: 0}
-    - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.72016627
-      objectReference: {fileID: 0}
-    - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: -0.11963704
-      objectReference: {fileID: 0}
-    - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 6.439291e-17
-      objectReference: {fileID: 0}
-    - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.006929654
-      objectReference: {fileID: 0}
-    - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -0.0009899485
-      objectReference: {fileID: 0}
-    - target: {fileID: -99557941888743577, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.000000029802322
-      objectReference: {fileID: 0}
-    - target: {fileID: -99557941888743577, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0.7071067
-      objectReference: {fileID: 0}
-    - target: {fileID: -99557941888743577, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0.000000059604645
-      objectReference: {fileID: 0}
-    - target: {fileID: -99557941888743577, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: -0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: -99557941888743577, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.00000013411045
-      objectReference: {fileID: 0}
-    - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.000000014901161
-      objectReference: {fileID: 0}
-    - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.000000014901161
-      objectReference: {fileID: 0}
-    - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 3.552715e-17
-      objectReference: {fileID: 0}
-    - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.009
-      objectReference: {fileID: 0}
-    - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -3.5527146e-17
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
       propertyPath: m_Name
       value: SoldierF
       objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.7136195
-      objectReference: {fileID: 0}
-    - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0.38093486
-      objectReference: {fileID: 0}
-    - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.17746559
-      objectReference: {fileID: 0}
-    - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: -0.56048363
-      objectReference: {fileID: 0}
-    - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0.004
-      objectReference: {fileID: 0}
-    - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.0049999994
-      objectReference: {fileID: 0}
-    - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 2.2351737e-10
-      objectReference: {fileID: 0}
-    - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.8333873
-      objectReference: {fileID: 0}
-    - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0.07265535
-      objectReference: {fileID: 0}
-    - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0.53159094
-      objectReference: {fileID: 0}
-    - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: -0.1326572
-      objectReference: {fileID: 0}
-    - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -0.0039999997
-      objectReference: {fileID: 0}
-    - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.0050000004
-      objectReference: {fileID: 0}
-    - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 5.3290694e-17
-      objectReference: {fileID: 0}
     - target: {fileID: 5866666021909216657, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
       propertyPath: m_Controller
       value: 
       objectReference: {fileID: 9100000, guid: 9917118805dd64449bd5bc1b9d284eff, type: 2}
-    - target: {fileID: 5866666021909216657, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_ApplyRootMotion
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.15342893
-      objectReference: {fileID: 0}
-    - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.026746389
-      objectReference: {fileID: 0}
-    - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.0037069293
-      objectReference: {fileID: 0}
-    - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.98779076
-      objectReference: {fileID: 0}
-    - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -1.1920907e-10
-      objectReference: {fileID: 0}
-    - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.0069999993
-      objectReference: {fileID: 0}
-    - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -3.516517e-10
-      objectReference: {fileID: 0}
-    - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.11964582
-      objectReference: {fileID: 0}
-    - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0.043068472
-      objectReference: {fileID: 0}
-    - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.0032882574
-      objectReference: {fileID: 0}
-    - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.9918766
-      objectReference: {fileID: 0}
-    - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -1.1920905e-10
-      objectReference: {fileID: 0}
-    - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 1.2048304e-11
-      objectReference: {fileID: 0}
-    - target: {fileID: 8267027504997795347, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.9436777
-      objectReference: {fileID: 0}
-    - target: {fileID: 8267027504997795347, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.027592212
-      objectReference: {fileID: 0}
-    - target: {fileID: 8267027504997795347, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.0338224
-      objectReference: {fileID: 0}
-    - target: {fileID: 8267027504997795347, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: -0.32797417
-      objectReference: {fileID: 0}
-    - target: {fileID: 8267027504997795347, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -1.1920927e-10
-      objectReference: {fileID: 0}
-    - target: {fileID: 8267027504997795347, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -1.4901158e-10
-      objectReference: {fileID: 0}
-    - target: {fileID: 8372328156874772898, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.998392
-      objectReference: {fileID: 0}
-    - target: {fileID: 8372328156874772898, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0.018809479
-      objectReference: {fileID: 0}
-    - target: {fileID: 8372328156874772898, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0.013097852
-      objectReference: {fileID: 0}
-    - target: {fileID: 8372328156874772898, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: -0.051848374
-      objectReference: {fileID: 0}
-    - target: {fileID: 8372328156874772898, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -0.002
-      objectReference: {fileID: 0}
-    - target: {fileID: 8372328156874772898, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 1.192093e-10
-      objectReference: {fileID: 0}
-    - target: {fileID: 8722905492793823144, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_TagString
-      value: PlayerHead
-      objectReference: {fileID: 0}
-    - target: {fileID: 9070741543337286203, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-      propertyPath: m_TagString
-      value: PlayerTorso
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
---- !u!4 &7030345375001973551 stripped
+--- !u!95 &7931246460515997121 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-  m_PrefabInstance: {fileID: 4305913406570759588}
-  m_PrefabAsset: {fileID: 0}
---- !u!95 &7686299603569653813 stripped
 Animator:
   m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-  m_PrefabInstance: {fileID: 4305913406570759588}
+  m_PrefabInstance: {fileID: 4574503883554023504}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &4344588326737764943 stripped
+--- !u!4 &4103164600241655739 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-  m_PrefabInstance: {fileID: 4305913406570759588}
+  m_PrefabInstance: {fileID: 4574503883554023504}
   m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5192659304772370690
 PrefabInstance:
@@ -1454,97 +1036,3 @@ Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3}
   m_PrefabInstance: {fileID: 5192659304772370690}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &8651970793420056280
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 1734861684113691137}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.4
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.4
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.4
-      objectReference: {fileID: 0}
-    - target: {fileID: 508586945372118967, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_TagString
-      value: PlayerTorso
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_Name
-      value: SoldierM
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5866666021909216657, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_Controller
-      value: 
-      objectReference: {fileID: 9100000, guid: 9917118805dd64449bd5bc1b9d284eff, type: 2}
-    - target: {fileID: 5866666021909216657, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_ApplyRootMotion
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7683905409254160203, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-      propertyPath: m_TagString
-      value: PlayerHead
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
---- !u!4 &9195014419894370611 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-  m_PrefabInstance: {fileID: 8651970793420056280}
-  m_PrefabAsset: {fileID: 0}

Assets/Graphics/Animation/Gun/GunIdle.anim

@@ -65,14 +65,14 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    path: BobbingRoot
+    path: 
   m_PositionCurves:
   - curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: 0, y: -0.2, z: 0}
+        value: {x: 0, y: 0, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -81,7 +81,7 @@ AnimationClip:
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.6666667
-        value: {x: 0, y: -0.21, z: 0.005}
+        value: {x: 0, y: -0.01, z: 0.005}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -90,7 +90,7 @@ AnimationClip:
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 1.3333334
-        value: {x: 0, y: -0.2, z: 0}
+        value: {x: 0, y: 0, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -100,7 +100,7 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    path: BobbingRoot
+    path: 
   m_ScaleCurves: []
   m_FloatCurves: []
   m_PPtrCurves: []
@@ -112,14 +112,14 @@ AnimationClip:
   m_ClipBindingConstant:
     genericBindings:
     - serializedVersion: 2
-      path: 3042182627
+      path: 0
       attribute: 1
       script: {fileID: 0}
       typeID: 4
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: 3042182627
+      path: 0
       attribute: 4
       script: {fileID: 0}
       typeID: 4
@@ -181,7 +181,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalPosition.x
-    path: BobbingRoot
+    path: 
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -189,7 +189,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -0.2
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -198,7 +198,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.6666667
-        value: -0.21
+        value: -0.01
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -207,7 +207,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 1.3333334
-        value: -0.2
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -218,7 +218,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalPosition.y
-    path: BobbingRoot
+    path: 
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -255,7 +255,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalPosition.z
-    path: BobbingRoot
+    path: 
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -270,6 +270,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.33333334
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.6666667
         value: 0
@@ -279,6 +288,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 1.3333334
         value: 0
@@ -292,7 +310,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: localEulerAnglesRaw.x
-    path: BobbingRoot
+    path: 
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -307,6 +325,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.33333334
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.6666667
         value: 0
@@ -316,6 +343,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 1.3333334
         value: 0
@@ -329,7 +365,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: localEulerAnglesRaw.y
-    path: BobbingRoot
+    path: 
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -384,7 +420,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: localEulerAnglesRaw.z
-    path: BobbingRoot
+    path: 
     classID: 4
     script: {fileID: 0}
   m_EulerEditorCurves:
@@ -395,7 +431,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: BobbingRoot
+    path: 
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -405,7 +441,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: BobbingRoot
+    path: 
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -415,9 +451,9 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: BobbingRoot
+    path: 
     classID: 4
     script: {fileID: 0}
-  m_HasGenericRootTransform: 0
+  m_HasGenericRootTransform: 1
   m_HasMotionFloatCurves: 0
   m_Events: []

Assets/Graphics/Animation/Gun/GunWalk.anim

@@ -20,7 +20,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: 0, y: -0.2, z: 0}
+        value: {x: 0, y: 0, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -29,7 +29,7 @@ AnimationClip:
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.23333333
-        value: {x: 0, y: -0.19, z: 0}
+        value: {x: 0, y: 0.01, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -38,7 +38,7 @@ AnimationClip:
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.45
-        value: {x: 0, y: -0.2, z: 0}
+        value: {x: 0, y: 0, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -48,7 +48,7 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    path: BobbingRoot
+    path: 
   m_ScaleCurves: []
   m_FloatCurves: []
   m_PPtrCurves: []
@@ -60,7 +60,7 @@ AnimationClip:
   m_ClipBindingConstant:
     genericBindings:
     - serializedVersion: 2
-      path: 3042182627
+      path: 0
       attribute: 1
       script: {fileID: 0}
       typeID: 4
@@ -122,7 +122,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalPosition.x
-    path: BobbingRoot
+    path: 
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -130,7 +130,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -0.2
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -139,7 +139,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.23333333
-        value: -0.19
+        value: 0.01
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -148,7 +148,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.45
-        value: -0.2
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -159,7 +159,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalPosition.y
-    path: BobbingRoot
+    path: 
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -196,10 +196,10 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalPosition.z
-    path: BobbingRoot
+    path: 
     classID: 4
     script: {fileID: 0}
   m_EulerEditorCurves: []
-  m_HasGenericRootTransform: 0
+  m_HasGenericRootTransform: 1
   m_HasMotionFloatCurves: 0
   m_Events: []

Assets/Scripts/Animation/SoldierProceduralAnimator.cs

@@ -1,71 +1,58 @@
 using UnityEngine;
 using NeonTea.Quakeball.Players;
+using NeonTea.Quakeball.Util;
 
 namespace NeonTea.Quakeball.Animation {
     /// <summary>Animates the parts that can't be animated via the animation system, e.g. aiming.</summary>
     public class SoldierProceduralAnimator : MonoBehaviour {
+        public enum SoldierModel {
+            Female = 0,
+            Male = 1,
+        }
+
+        public Animator[] Soldiers;
+        public SoldierModel Model;
         public Player Player;
-        public Animator Soldier;
         public Transform HeadCollider;
 
-        private Transform Body;
+        [Header("Gun holding")]
-        private Transform Torso;
+        public bool GunGluedToHand = true;
-        private Transform Head;
+        public Transform Gun;
-
+        public Transform GunHandle;
-        private Vector3 BodyBaseEulers;
-        private Vector3 TorsoBaseEulers;
-        private Vector3 HeadBaseEulers;
-
-        private Vector3 BodyEulers;
-        private Vector3 TorsoEulers;
-        private Vector3 HeadEulers;
 
+        private Animator Animator;
         private float BodyYaw = 0;
+        private Transform BehindHand;
+        private Transform FrontHand;
 
         private void Awake() {
-            Body = Soldier.transform;
+            foreach (Animator animator in Soldiers) {
-            Torso = GameObject.FindGameObjectWithTag("PlayerTorso").transform;
+                animator.gameObject.SetActive(false);
-            Head = GameObject.FindGameObjectWithTag("PlayerHead").transform;
+            }
+            Animator = Soldiers[(int)Model].GetComponent<Animator>();
+            Animator.gameObject.SetActive(true);
+            Transform Head = TransformUtil.FindChildWithName(Animator.transform, "HEAD");
             HeadCollider.parent = Head;
-            BodyEulers = BodyBaseEulers = Body.localEulerAngles;
+            BehindHand = TransformUtil.FindChildWithName(Animator.transform, "HAND.R");
-            TorsoEulers = TorsoBaseEulers = Torso.localEulerAngles;
+            FrontHand = TransformUtil.FindChildWithName(Animator.transform, "HAND.L");
-            HeadEulers = HeadBaseEulers = Head.localEulerAngles;
         }
 
         private void Update() {
-            Soldier.SetFloat("Movement", Player.GroundVelocity.magnitude / Player.MoveStyle.TargetVelocity);
+            Animator.SetFloat("Movement", Player.GroundVelocity.magnitude / Player.MoveStyle.TargetVelocity);
         }
 
         private void LateUpdate() {
-            if (Player.MoveDirection.magnitude > 0) {
+            if (Player.GroundVelocity.magnitude > 0) {
-                float NewBodyYaw = Vector3.SignedAngle(Vector3.forward, Player.MoveDirection, Vector3.up);
+                BodyYaw = Vector3.SignedAngle(Vector3.forward, Player.GroundVelocity.normalized, Vector3.up);
-                if (BodyYaw < -90 && NewBodyYaw > 90) {
-                    BodyEulers += new Vector3(0, 360, 0);
-                }
-                if (BodyYaw > 90 && NewBodyYaw < -90) {
-                    BodyEulers -= new Vector3(0, 360, 0);
-                }
-                BodyYaw = NewBodyYaw;
             }
-            float Yaw = Player.Yaw - BodyYaw;
+            transform.localEulerAngles = new Vector3(0, BodyYaw, 0);
-            while (Yaw < -180) {
+
-                Yaw += 360;
+            if (GunGluedToHand) {
+                Vector3 GunOffset = GunHandle.position - Gun.position;
+                Vector3 GunDirection = (FrontHand.position - BehindHand.position).normalized;
+                Gun.position = BehindHand.position - GunOffset;
+                Gun.LookAt(Gun.position + GunDirection);
             }
-            while (Yaw > 180) {
-                Yaw -= 360;
-            }
-
-            Vector3 TargetBodyEulers = BodyBaseEulers + new Vector3(0, BodyYaw, 0);
-            BodyEulers = Vector3.Lerp(BodyEulers, TargetBodyEulers, 10f * Time.deltaTime);
-            Body.localEulerAngles = BodyEulers;
-
-            Vector3 TargetTorsoEulers = TorsoBaseEulers + new Vector3(0, Yaw, 0);
-            TorsoEulers = Vector3.Lerp(TorsoEulers, TargetTorsoEulers, 10f * Time.deltaTime);
-            Torso.localEulerAngles = TorsoEulers;
-
-            Vector3 TargetHeadEulers = HeadBaseEulers + new Vector3(-Player.Pitch, 0, 0);
-            HeadEulers = Vector3.Lerp(HeadEulers, TargetHeadEulers, 10f * Time.deltaTime);
-            Head.localEulerAngles = HeadEulers;
         }
     }
 }

Assets/Scripts/Interface/StatScreen.cs

@@ -43,6 +43,7 @@ namespace NeonTea.Quakeball.Interface {
             BackroundPanel.gameObject.SetActive(Open);
             if (Open && (Time.time - LastUpdate) > 0.5f && Net.Singleton.Instance != null) {
                 UpdateRows();
+                LastUpdate = Time.time;
             }
         }
 

Assets/Scripts/Util/TransformUtil.cs

@@ -0,0 +1,20 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace NeonTea.Quakeball.Util {
+    public static class TransformUtil {
+        public static Transform FindChildWithName(Transform t, string name) {
+            if (t.name == name) {
+                return t;
+            }
+            for (int i = 0; i < t.childCount; i++) {
+                Transform child = FindChildWithName(t.GetChild(i), name);
+                if (child != null) {
+                    return child;
+                }
+            }
+            return null;
+        }
+    }
+}

Assets/Scripts/Util/TransformUtil.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e6e4dc0494f156142b4059faa86c7486
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: