Procedual Animation Hand Fix

See "Procedual Animation Hand Fix" issue

Assets/Objects/Human/Human.blend.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
 guid: 94eb43ab67867914c9ac3de46caa4c67
 ModelImporter:
-  serializedVersion: 21100
+  serializedVersion: 21202
   internalIDToNameTable:
   - first:
       74: -623603649343465320
@@ -17,8 +17,10 @@ ModelImporter:
     bakeSimulation: 0
     resampleCurves: 1
     optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
     motionNodeName: 
-    rigImportErrors: 
+    rigImportErrors: "Copied Avatar Rig Configuration mis-match. Transform hierarchy
+      does not match:\n\tTransform 'Spine' for human bone 'Spine' not found\n"
     rigImportWarnings: 
     animationImportErrors: 
     animationImportWarnings: 
@@ -26,7 +28,7 @@ ModelImporter:
     animationDoRetargetingWarnings: 0
     importAnimatedCustomProperties: 0
     importConstraints: 0
-    animationCompression: 1
+    animationCompression: 3
     animationRotationError: 0.5
     animationPositionError: 0.5
     animationScaleError: 0.5
@@ -46,6 +48,7 @@ ModelImporter:
     importBlendShapes: 1
     importCameras: 1
     importLights: 1
+    nodeNameCollisionStrategy: 0
     fileIdsGeneration: 2
     swapUVChannels: 0
     generateSecondaryUV: 0
@@ -57,6 +60,7 @@ ModelImporter:
     skinWeightsMode: 0
     maxBonesPerVertex: 4
     minBoneWeight: 0.001
+    optimizeBones: 1
     meshOptimizationFlags: -1
     indexFormat: 0
     secondaryUVAngleDistortion: 8
@@ -91,13 +95,13 @@ ModelImporter:
     globalScale: 1
     rootMotionBoneName: 
     hasTranslationDoF: 0
-    hasExtraRoot: 0
+    hasExtraRoot: 1
     skeletonHasParents: 1
   lastHumanDescriptionAvatarSource: {instanceID: 0}
   autoGenerateAvatarMappingIfUnspecified: 1
-  animationType: 2
+  animationType: 3
   humanoidOversampling: 1
-  avatarSetup: 0
+  avatarSetup: 1
   addHumanoidExtraRootOnlyWhenUsingAvatar: 1
   additionalBone: 0
   userData: 

Assets/Objects/Human/HumanAnimationControler.controller

@@ -46,7 +46,7 @@ BlendTree:
     m_Motion: {fileID: 5138602965388526686, guid: 97968620e18a7bb47b9b9d1407b00047, type: 3}
     m_Threshold: 0.25
     m_Position: {x: 1, y: 0}
-    m_TimeScale: 1
+    m_TimeScale: 2
     m_CycleOffset: 0
     m_DirectBlendParameter: Time
     m_Mirror: 0
@@ -62,7 +62,7 @@ BlendTree:
     m_Motion: {fileID: 5138602965388526686, guid: 97968620e18a7bb47b9b9d1407b00047, type: 3}
     m_Threshold: 0.75
     m_Position: {x: -1, y: 0}
-    m_TimeScale: -1
+    m_TimeScale: -2
     m_CycleOffset: 0
     m_DirectBlendParameter: Time
     m_Mirror: 0
@@ -172,25 +172,25 @@ AnimatorController:
     m_DefaultFloat: 1
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Blend
     m_Type: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: x
     m_Type: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: y
     m_Type: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer

Assets/Prefabs/Player/NewSimplePlayer.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 815ba91b9da92294f8041b56643e5e15
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Prefabs/Player/Player Animation Test.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: a14d876ac00bdf6498e30b3e58b68fdf
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/Player/AimDownSights.cs

@@ -1,34 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class AimDownSights : MonoBehaviour
-{
-    [SerializeField] float aimSpeed = 0.01f;
-    [SerializeField][Range(0,1)] public  float aimVal = 0;
-    [SerializeField] private GameObject gun;
-    [SerializeField] GameObject AimPoint;
-    [SerializeField] GameObject HoldPoint;
-    public bool isAiming = false;
-    bool ADS() 
-    {
-        
-        return true;
-    }
-    private void FixedUpdate()
-    {
-        if (Input.GetButton("Aim")) 
-        {
-            isAiming = true;
-            aimVal += aimSpeed;
-        } 
-        else 
-        {
-            isAiming = false;
-            aimVal -= aimSpeed;
-        }
-        aimVal = Mathf.Clamp(aimVal,0,1);
-
-        gun.transform.position = Vector3.Lerp(HoldPoint.transform.position, AimPoint.transform.position,Mathf.Pow(aimVal,1.3f)) ;
-    }
-}

Assets/Scripts/Player/AimDownSights.cs.meta

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

Assets/Scripts/Player/Headbob.cs

@@ -1,78 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using Mirror;
-public class Headbob : NetworkBehaviour
-{
-    [SerializeField] private PlayerController playerController;
-    [SerializeField] private ShootAnimation gunAnimation;
-
-
-    [SerializeField] private float posCheckDistance = 0.01f;
-    [SerializeField] private float checkDist = 0.0f;
-    private float currentDist = 0;
-
-    [Header("Step Settings")]
-    [SerializeField] private float stepAmplitudeWalking;
-    [SerializeField] private float stepAmplitudeSprinting;
-    [SerializeField] [Range(0.01f, 10.0f)] private float stepFrequency;
-    [SerializeField] private Transform Neck;
-
-    private Vector3 lastPos;
-    private Vector3 startPos;
-    private Vector3 newPos;
-    private float oldDist = 0;
-    private float lerpVal = 0;
-
-
-    [Header("Gun Settings")]
-    [SerializeField] GameObject gunRotation;
-    [SerializeField] float rotationMultiplier = 0.1f;
-
-
-
-    private void Start()
-    {
-        lastPos = this.transform.position;
-        //startPos = this.transform.position;
-    }
-
-    private void Update()
-    {
-        
-        float amplitude;
-        if (playerController.isGrounded)
-        {
-            lerpVal = 0;
-            float dist = Vector3.Distance(lastPos, this.transform.position);
-            if (playerController.isSprinting)
-                amplitude = stepAmplitudeSprinting;
-            else
-                amplitude = stepAmplitudeWalking;
-
-            if (dist > posCheckDistance)
-            {
-                currentDist += dist;
-                lastPos = this.transform.position;
-            }
-            else
-            {
-                checkDist = currentDist + dist;
-            }
-            gunAnimation.gunSideSwey(getSin(amplitude, stepFrequency/2, checkDist),playerController.inputDirection.magnitude);
-            newPos = new Vector3(getSin(amplitude / 2, stepFrequency, checkDist), getSin(amplitude, stepFrequency, checkDist), 0);
-            Neck.localPosition = newPos;
-        }
-        else
-        {
-            Neck.localPosition = Vector3.zero;            
-        }
-        
-    }
-
-    private float getSin(float multiplier, float devisor,float x)
-    {
-        return multiplier * Mathf.Sin((x/3.14f) * 10 * devisor);
-    }
-    
-}

Assets/Scripts/Player/Headbob.cs.meta

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

Assets/Scripts/Player/PlayerColor.cs

@@ -1,28 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using Mirror;
-
-public class PlayerColor : NetworkBehaviour
-{
-    [SyncVar(hook = "SetColor")]
-    public Color color;
-    public Renderer renderer;
-
-    void SetColor(Color oldColor, Color newColor)
-    {
-        if (color == null)
-        {
-            color = renderer.material.color;
-        }
-
-        renderer.material.color = newColor;
-        color = newColor;
-
-    }
-
-    public override void OnStartClient()
-    {
-        renderer.material.color = color;
-    }
-}

Assets/Scripts/Player/PlayerColor.cs.meta

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

Assets/Scripts/Player/PlayerController.cs

@@ -161,7 +161,6 @@ public class PlayerController : NetworkBehaviour
             moveDirection = new Vector3(moveDirection.x, 0, moveDirection.z); 
             currentDir = moveDirection;
         }
-        Debug.Log(currentMaxSpeed);
         velocity = Vector3.SmoothDamp(velocity, currentDir * currentMaxSpeed + new Vector3(0, velocityY, 0),ref refVelocity,moveSmoothTime);
         localVelocity = transform.InverseTransformDirection(velocity);
         controller.Move(velocity * Time.deltaTime);

Assets/Scripts/Player/ProcedualAnimationController.cs

@@ -5,6 +5,14 @@ using Mirror;
 
 public class ProcedualAnimationController : NetworkBehaviour
 {
+    [Header("Hand Settings")]
+    [SerializeField] private Transform rightHandREF;
+    [SerializeField] private Transform leftHandREF;
+    [SerializeField] private Transform gunRightHandREF;
+    [SerializeField] private Transform gunLeftHandREF;
+    [SerializeField] private Vector3   defaultRightHandPosition = Vector3.zero;
+    [SerializeField] private Vector3   defaultLeftHandPosition  = Vector3.zero;
+
 
     [Header("Step Settings")]
     [SerializeField] private float stepAmplitudeWalking;
@@ -99,6 +107,28 @@ public class ProcedualAnimationController : NetworkBehaviour
         playerAnimator.SetFloat("x", playerController.localVelocity.x / playerController.currentMaxSpeed);
         playerAnimator.SetFloat("y", playerController.localVelocity.z / playerController.currentMaxSpeed);
     }
+
+    public void handPositioning()
+    {
+        if (gunRightHandREF != null)
+        {
+            rightHandREF.position = gunRightHandREF.position;
+            rightHandREF.rotation = gunRightHandREF.rotation;
+        }
+        else 
+        {
+            rightHandREF.position = defaultRightHandPosition;
+        }
+        if (gunLeftHandREF != null)
+        {
+            leftHandREF.position = gunLeftHandREF.position;
+            leftHandREF.rotation = gunLeftHandREF.rotation;
+        }
+        else
+        {
+            leftHandREF.position = defaultLeftHandPosition;
+        }
+    }
     public void OnSwitchWeapon(GameObject currentWeapon)
     {
         if (isLocalPlayer) {
@@ -141,7 +171,7 @@ public class ProcedualAnimationController : NetworkBehaviour
         if (isLocalPlayer)
         {
             walkAnimation();
-
+            handPositioning();
             CmdAim(Input.GetButton("Aim"));
         }
         /*-----Aiming-----*/

Assets/Scripts/Weapons/ShootAnimation.cs

@@ -1,156 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class ShootAnimation : MonoBehaviour
-{
-
-    [Header("GameObjects")]
-    [SerializeField] private GameObject gun;
-    [SerializeField] private GameObject gunHolder;
-    [SerializeField] private GameObject gunPositionObj;
-    [SerializeField] private GameObject gunRotationObj;
-    
-
-    [Header("Settings")]
-    [SerializeField] bool positionRecoil = true;
-    [SerializeField] bool rotationRecoil = true;
-
-    [Header("Position Settings")]
-    [SerializeField] float positionMultX = 25f;
-    [SerializeField] float positionMultY = 25f;
-    [SerializeField] float positionMultZ = 25f;
-
-    [Header("Rotation Settings")]
-    [SerializeField] PlayerMouseLook playerMouseLook;
-    [SerializeField] float cameraRecoilX = 0.1f;
-    [SerializeField] float cameraRecoilY = 0.1f;
-
-
-    [SerializeField] bool rotX = true;
-    [SerializeField] float rotationMultX = 25f;
-    [SerializeField] float rotationOffsetX = 0.1f;
-    [SerializeField] bool rotY = true;
-    [SerializeField] float rotationMultY = 25f;
-    [SerializeField] bool rotZ = true;
-    [SerializeField] float rotationMultZ = 15f;
-
-    [Header("Swey Settings")]
-    [SerializeField] AimDownSights ADSController;
-    [SerializeField] bool sideSwey = true;
-    [SerializeField] float sweyMult = 15f;
-    [SerializeField] float sweyWhileAim = 0.1f;
-    float swey = 0f;
-
-
-
-    [SerializeField] float returnForce = 0.006f;
-    [SerializeField] float impulsForce = 0.025f;
-    [SerializeField] float maxRecoil = 0.1f;
-
-    private Animator anim;
-
-    Vector3 startPos,startRot;
-
-    float zOffset = 0f;
-    float zVelocity = 0f;
-
-    int recoilCounter = 0;
-
-    //Has to be called once at the beginning and then again when switching guns
-    public void OnSwitchWeapon(float fireRate)
-    {
-        //gun = newGun;
-        anim = gun.GetComponent<Animator>();
-        anim.SetFloat("ShootSpeed",1f/(60f/fireRate));
-        startPos = gunPositionObj.transform.localPosition;
-        startRot = gunRotationObj.transform.localRotation.eulerAngles;
-    }
-
-
-    public void recoil(float force)
-    {
-        //Play the animation
-        anim.Play("Shoot");
-        playerMouseLook.fullPitch -= cameraRecoilX * Mathf.PerlinNoise(Time.time * 3f + 10f, 1f);
-        transform.Rotate(Vector3.up * ((Mathf.PerlinNoise(Time.time * 1f + 10f, 1f) - 0.5f) * 2f) * cameraRecoilY);
-        //Add force for the recoil
-        recoilCounter++;
-    }
-
-    public void gunSideSwey(float sinVal,float moveInput) 
-    {
-
-            swey = (sweyMult * sinVal * moveInput * 0.7f
-                 + sweyMult * sinVal * moveInput * ((Mathf.PerlinNoise(Time.time * 1f + 10f, 1f) - 0.5f) * 2f) * 0.3f) * Mathf.Clamp((1 - ADSController.aimVal) * (1 - ADSController.aimVal), sweyWhileAim,1f);
-        
-    }
-
-
-    void FixedUpdate()
-    {
-        //Apply recoil based on the number of shots fired
-        for (int i = 0; i < recoilCounter; i++) 
-        {
-            zVelocity -= impulsForce * 0.9f + impulsForce * 0.1f  * Mathf.PerlinNoise(i,1f);
-        }
-        recoilCounter = 0;
-
-
-        zOffset += zVelocity;
-
-        if (zOffset > 0)
-        {
-            zOffset = 0f;
-            zVelocity = 0f;
-        }
-        else if (zOffset < 0)
-        {
-            zVelocity += returnForce * 0.9f + returnForce * 0.1f * Mathf.PerlinNoise(Time.time,1f);
-            
-        }
-
-        zOffset = Mathf.Clamp(zOffset,-maxRecoil * 0.5f + -maxRecoil * 0.5f * Mathf.PerlinNoise(Time.time * 1000,1),0);
-
-        //Position recoil
-        if (positionRecoil)
-        {
-            int sideLock = 0;
-
-            if (sideSwey) sideLock = 1;
-            gunPositionObj.transform.localPosition = startPos + new Vector3(
-                positionMultX * zOffset * ((Mathf.PerlinNoise(Time.time * 1f + 10f, 1f) - 0.5f) * 2f) + sideLock * swey,
-                positionMultY * zOffset * Mathf.PerlinNoise(Time.time * 2f + 20f, 2f),
-                positionMultZ* zOffset * ((Mathf.PerlinNoise(Time.time * 3f + 30f, 3f) - 0.5f) * 2f));
-        }
-        else 
-        {
-            gunPositionObj.transform.localPosition = startPos;
-        }
-
-        //Rotation recoil
-        if (rotationRecoil)
-        {
-            int xLock = 0;
-            int yLock = 0;
-            int zLock = 0;
-            
-
-            if (rotX) xLock = 1;
-            if (rotY) yLock = 1;
-            if (rotZ) zLock = 1;
-            
-
-            gunRotationObj.transform.localRotation = Quaternion.Euler(
-                startRot.x + xLock * rotationMultX * zOffset * Mathf.PerlinNoise(Time.time * 3f + 30f, 4f),
-                startRot.y + yLock * rotationMultY * zOffset * ((Mathf.PerlinNoise(Time.time * 2f + 10f, 3f) - 0.5f) * 2f),
-                startRot.z + zLock * rotationMultZ * zOffset * ((Mathf.PerlinNoise(Time.time * 1.5f, 2f) - 0.5f) * 2f));
-        }
-        else
-        {
-            gunRotationObj.transform.localRotation = Quaternion.Euler(startRot.x, startRot.y, startRot.z);
-        }
-            
-
-    }
-}

Assets/Scripts/Weapons/ShootAnimation.cs.meta

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

UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -20,11 +20,11 @@ MonoBehaviour:
     x: 0
     y: 30
     width: 1536
-    height: 731
+    height: 730.8
   m_MinSize: {x: 400, y: 200}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: -1
+  controlID: 73
 --- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -34,89 +34,25 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_MinSize: {x: 200, y: 200}
+  m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: Game
+    m_Text: Console
-    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 538.4
+    x: 0
-    y: 73.6
+    y: 512
-    width: 866.7999
+    width: 1129.4
-    height: 418.2
+    height: 271.4
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
     m_SaveData: []
-  m_SerializedViewNames: []
-  m_SerializedViewValues: []
-  m_PlayModeViewName: GameView
-  m_ShowGizmos: 0
-  m_TargetDisplay: 0
-  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 706, y: 397.2}
-  m_TextureFilterMode: 0
-  m_TextureHideFlags: 61
-  m_RenderIMGUI: 1
-  m_EnterPlayModeBehavior: 0
-  m_UseMipMap: 0
-  m_VSyncEnabled: 1
-  m_Gizmos: 0
-  m_Stats: 0
-  m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000
-  m_ZoomArea:
-    m_HRangeLocked: 0
-    m_VRangeLocked: 0
-    hZoomLockedByDefault: 0
-    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -282.4
-    m_HBaseRangeMax: 282.4
-    m_VBaseRangeMin: -158.88
-    m_VBaseRangeMax: 158.88
-    m_HAllowExceedBaseRangeMin: 1
-    m_HAllowExceedBaseRangeMax: 1
-    m_VAllowExceedBaseRangeMin: 1
-    m_VAllowExceedBaseRangeMax: 1
-    m_ScaleWithWindow: 0
-    m_HSlider: 0
-    m_VSlider: 0
-    m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
-    m_EnableSliderZoomHorizontal: 0
-    m_EnableSliderZoomVertical: 0
-    m_UniformScale: 1
-    m_UpDirection: 1
-    m_DrawArea:
-      serializedVersion: 2
-      x: 0
-      y: 21
-      width: 866.7999
-      height: 397.2
-    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 433.39996, y: 198.6}
-    m_MarginLeft: 0
-    m_MarginRight: 0
-    m_MarginTop: 0
-    m_MarginBottom: 0
-    m_LastShownAreaInsideMargins:
-      serializedVersion: 2
-      x: -433.39996
-      y: -198.6
-      width: 866.7999
-      height: 397.2
-    m_MinimalGUI: 1
-  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 1083.4999, y: 522.75}
-  m_ClearInEditMode: 1
-  m_NoCameraWarning: 1
-  m_LowResolutionForAspectRatios: 01000000000000000000
-  m_XRRenderMode: 0
-  m_RenderTexture: {fileID: 0}
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -131,17 +67,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Children:
   - {fileID: 4}
-  - {fileID: 11}
+  - {fileID: 12}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1407.2
+    width: 1130.4
-    height: 731
+    height: 730.8
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 1
-  controlID: -1
+  controlID: 74
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -162,12 +98,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1407.2
+    width: 1130.4
-    height: 439.2
+    height: 438.4
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 8096}
   vertical: 0
-  controlID: -1
+  controlID: 21
 --- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -185,8 +121,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 398.4
+    width: 327.2
-    height: 439.2
+    height: 438.4
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 6}
@@ -215,9 +151,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 19
+    y: 73.6
-    width: 397.4
+    width: 326.2
-    height: 418.2
+    height: 417.4
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -225,9 +161,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
+      m_SelectedIDs: 9875ffff
-      m_LastClickedID: 0
+      m_LastClickedID: -35432
-      m_ExpandedIDs: 2afbffff
+      m_ExpandedIDs: 4c7affffa8890000be890000d8890000e0890000e2890000f0890000f6890000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -266,12 +202,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 398.4
+    x: 327.2
     y: 0
-    width: 140.00003
+    width: 495.2
-    height: 439.2
+    height: 438.4
-  m_MinSize: {x: 200, y: 200}
+  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 9}
   m_Panes:
   - {fileID: 8}
@@ -298,10 +234,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 328.80002
+    x: 327.2
     y: 73.6
-    width: 318
+    width: 493.2
-    height: 418
+    height: 417.4
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -310,6 +246,7 @@ MonoBehaviour:
     m_KeySerializationHelper:
     - {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2}
     - {fileID: -29801462378204144, guid: bcfd120671431f84097ebc1045370f76, type: 2}
+    - {fileID: -9128348295522208378, guid: bcfd120671431f84097ebc1045370f76, type: 2}
     m_ValueSerializationHelper:
     - e00: 0.70260465
       e01: 0
@@ -327,14 +264,30 @@ MonoBehaviour:
       e31: 0
       e32: 0
       e33: 1
-    - e00: 0.6782804
+    - e00: 0.87967086
       e01: 0
       e02: 0
-      e03: -240.35721
+      e03: -127.94919
       e10: 0
-      e11: 0.6782804
+      e11: 0.87967086
       e12: 0
-      e13: 92.776474
+      e13: 81.58563
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    - e00: 0.66389865
+      e01: 0
+      e02: 0
+      e03: -49.714203
+      e10: 0
+      e11: 0.66389865
+      e12: 0
+      e13: 78.09504
       e20: 0
       e21: 0
       e22: 1
@@ -348,6 +301,8 @@ MonoBehaviour:
   m_BreadCrumbs:
   - m_Target: {fileID: -29801462378204144, guid: bcfd120671431f84097ebc1045370f76, type: 2}
     m_ScrollPosition: {x: 0, y: 0}
+  - m_Target: {fileID: -9128348295522208378, guid: bcfd120671431f84097ebc1045370f76, type: 2}
+    m_ScrollPosition: {x: 0, y: 0}
   stateMachineGraph: {fileID: 0}
   stateMachineGraphGUI: {fileID: 0}
   blendTreeGraph: {fileID: 0}
@@ -379,10 +334,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 398.4
+    x: 327.2
     y: 73.6
-    width: 138.00003
+    width: 493.2
-    height: 418.2
+    height: 417.4
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -404,7 +359,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 1
       snapOffset: {x: -141, y: 149}
-      snapOffsetDelta: {x: 2.600006, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 1
       id: unity-grid-and-snap-toolbar
       index: 1
@@ -426,7 +381,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 24.8}
       snapCorner: 1
       id: unity-search-toolbar
       index: 1
@@ -447,7 +402,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -112.000015, y: 86}
+      snapOffset: {x: -112.00003, y: 86}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 1
       id: Orientation
@@ -459,7 +414,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 24.8}
       snapCorner: 0
       id: Scene View/Light Settings
       index: 0
@@ -481,7 +436,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 24.8}
       snapCorner: 0
       id: Scene View/Cloth Constraints
       index: 2
@@ -492,7 +447,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 24.8}
       snapCorner: 0
       id: Scene View/Cloth Collisions
       index: 3
@@ -503,7 +458,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 24.8}
       snapCorner: 0
       id: Scene View/Navmesh Display
       index: 4
@@ -514,7 +469,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 24.8}
       snapCorner: 0
       id: Scene View/Agent Display
       index: 5
@@ -525,7 +480,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 24.8}
       snapCorner: 0
       id: Scene View/Obstacle Display
       index: 6
@@ -536,7 +491,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 24.8}
       snapCorner: 0
       id: Scene View/Occlusion Culling
       index: 7
@@ -547,7 +502,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 24.8}
       snapCorner: 0
       id: Scene View/Physics Debugger
       index: 8
@@ -558,7 +513,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 24.8}
       snapCorner: 0
       id: Scene View/Scene Visibility
       index: 9
@@ -569,7 +524,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 24.8}
       snapCorner: 0
       id: Scene View/Particles
       index: 10
@@ -578,7 +533,7 @@ MonoBehaviour:
       containerId: overlay-container--right
       floating: 0
       collapsed: 0
-      displayed: 0
+      displayed: 1
       snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
@@ -587,7 +542,7 @@ MonoBehaviour:
       layout: 4
   m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
   m_Gizmos: 0
-  m_OverrideSceneCullingMask: 6917529027641081856
+  m_OverrideSceneCullingMask: 0
   m_SceneIsLit: 0
   m_SceneLighting: 1
   m_2DMode: 0
@@ -595,9 +550,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 11.616212, y: 1.3419256, z: 4.6519175}
+    m_Target: {x: 2.144991, y: 2.3722243, z: 0.4915308}
     speed: 2
-    m_Value: {x: 11.616212, y: 1.3419256, z: 4.6519175}
+    m_Value: {x: 8.289744, y: -0.14671704, z: 6.968469}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -609,7 +564,7 @@ MonoBehaviour:
   m_SceneViewState:
     m_AlwaysRefresh: 0
     showFog: 1
-    showSkybox: 1
+    showSkybox: 0
     showFlares: 1
     showImageEffects: 1
     showParticleSystems: 1
@@ -644,17 +599,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.20971945, y: 0.7315626, z: -0.25770992, w: -0.5953333}
+    m_Target: {x: -0.0447372, y: 0.83363223, z: -0.06814204, w: -0.5463708}
     speed: 2
-    m_Value: {x: -0.20971923, y: 0.73156184, z: -0.25770965, w: -0.5953326}
+    m_Value: {x: 0.21894756, y: 0.10310624, z: -0.02327327, w: 0.9699946}
   m_Size:
-    m_Target: 0.93468356
+    m_Target: 1.9281099
     speed: 2
-    m_Value: 0.93468356
+    m_Value: 1.8152742
   m_Ortho:
-    m_Target: 0
+    m_Target: 1
     speed: 2
-    m_Value: 0
+    m_Value: 1
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -690,18 +645,110 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 538.4
+    x: 822.4
     y: 0
-    width: 868.7999
+    width: 308
-    height: 439.2
+    height: 438.4
-  m_MinSize: {x: 200, y: 200}
+  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 2}
+  m_ActualView: {fileID: 11}
   m_Panes:
-  - {fileID: 2}
+  - {fileID: 11}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &11
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Game
+    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 822.4
+    y: 73.6
+    width: 306
+    height: 417.4
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+  m_SerializedViewNames: []
+  m_SerializedViewValues: []
+  m_PlayModeViewName: GameView
+  m_ShowGizmos: 0
+  m_TargetDisplay: 0
+  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
+  m_TargetSize: {x: 306, y: 396.4}
+  m_TextureFilterMode: 0
+  m_TextureHideFlags: 61
+  m_RenderIMGUI: 1
+  m_EnterPlayModeBehavior: 0
+  m_UseMipMap: 0
+  m_VSyncEnabled: 1
+  m_Gizmos: 0
+  m_Stats: 0
+  m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_ZoomArea:
+    m_HRangeLocked: 0
+    m_VRangeLocked: 0
+    hZoomLockedByDefault: 0
+    vZoomLockedByDefault: 0
+    m_HBaseRangeMin: -122.4
+    m_HBaseRangeMax: 122.4
+    m_VBaseRangeMin: -158.56
+    m_VBaseRangeMax: 158.56
+    m_HAllowExceedBaseRangeMin: 1
+    m_HAllowExceedBaseRangeMax: 1
+    m_VAllowExceedBaseRangeMin: 1
+    m_VAllowExceedBaseRangeMax: 1
+    m_ScaleWithWindow: 0
+    m_HSlider: 0
+    m_VSlider: 0
+    m_IgnoreScrollWheelUntilClicked: 0
+    m_EnableMouseInput: 1
+    m_EnableSliderZoomHorizontal: 0
+    m_EnableSliderZoomVertical: 0
+    m_UniformScale: 1
+    m_UpDirection: 1
+    m_DrawArea:
+      serializedVersion: 2
+      x: 0
+      y: 21
+      width: 306
+      height: 396.4
+    m_Scale: {x: 1, y: 1}
+    m_Translation: {x: 153, y: 198.2}
+    m_MarginLeft: 0
+    m_MarginRight: 0
+    m_MarginTop: 0
+    m_MarginBottom: 0
+    m_LastShownAreaInsideMargins:
+      serializedVersion: 2
+      x: -153
+      y: -198.2
+      width: 306
+      height: 396.4
+    m_MinimalGUI: 1
+  m_defaultScale: 1
+  m_LastWindowPixelSize: {x: 382.5, y: 521.75}
+  m_ClearInEditMode: 1
+  m_NoCameraWarning: 1
+  m_LowResolutionForAspectRatios: 01000000000000000000
+  m_XRRenderMode: 0
+  m_RenderTexture: {fileID: 0}
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -711,24 +758,24 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: ConsoleWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 439.2
+    y: 438.4
-    width: 1407.2
+    width: 1130.4
-    height: 291.8
+    height: 292.4
-  m_MinSize: {x: 231, y: 271}
+  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 10001, y: 10021}
+  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 12}
+  m_ActualView: {fileID: 2}
   m_Panes:
-  - {fileID: 12}
   - {fileID: 13}
-  m_Selected: 0
+  - {fileID: 2}
-  m_LastSelected: 1
+  m_Selected: 1
---- !u!114 &12
+  m_LastSelected: 0
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -749,9 +796,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 458.2
+    y: 512
-    width: 1406.2
+    width: 1129.4
-    height: 270.8
+    height: 271.4
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -773,34 +820,34 @@ MonoBehaviour:
     m_Globs: []
     m_OriginalText: 
   m_ViewMode: 1
-  m_StartGridSize: 64
+  m_StartGridSize: 91
   m_LastFolders:
   - Assets/Prefabs/Player
-  m_LastFoldersGridSize: -1
+  m_LastFoldersGridSize: 91
   m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 191}
+    scrollPos: {x: 0, y: 216.6}
-    m_SelectedIDs: 16650000
+    m_SelectedIDs: 24680000
-    m_LastClickedID: 25878
+    m_LastClickedID: 26660
-    m_ExpandedIDs: 00000000ce640000d0640000d2640000ea64000000ca9a3bffffff7f
+    m_ExpandedIDs: 00000000d4670000d6670000e2670000ec670000ee670000186900001c69000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
+      m_Name: Networing
-      m_OriginalName: 
+      m_OriginalName: Networing
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 26664
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 11}
+      m_ClientGUIView: {fileID: 12}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -812,7 +859,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000ce640000d0640000d2640000
+    m_ExpandedIDs: 00000000d4670000d6670000d8670000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -837,10 +884,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 
+    m_SelectedInstanceIDs: 9875ffff
-    m_LastClickedInstanceID: 0
+    m_LastClickedInstanceID: -35432
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000866c00009e60000036650000
+    m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000866c00009e60000036650000b469000014250000bc690000b869000028250000cc690000e0690000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -856,7 +903,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 11}
+      m_ClientGUIView: {fileID: 12}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -865,37 +912,9 @@ MonoBehaviour:
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
     m_ScrollPosition: {x: 0, y: 0}
-    m_GridSize: 64
+    m_GridSize: 91
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 207
---- !u!114 &13
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Console
-    m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 0
-    y: 512
-    width: 1129
-    height: 271
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
 --- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -906,17 +925,17 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: InspectorWindow
+  m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1407.2
+    x: 1130.4
     y: 0
-    width: 128.80005
+    width: 405.59998
-    height: 731
+    height: 730.8
-  m_MinSize: {x: 276, y: 71}
+  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -942,10 +961,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1407.2001
+    x: 1130.4
     y: 73.6
-    width: 127.80005
+    width: 404.59998
-    height: 710
+    height: 709.8
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -953,11 +972,11 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 151
+    m_CachedPref: -417
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 0
+  m_LastVerticalScrollValue: 2186.4001
   m_GlobalObjectId: 
   m_InspectorMode: 0
   m_LockTracker: