diff --git a/Assets/Objects/Weapons/M9/M92.prefab b/Assets/Objects/Weapons/M9/M92.prefab new file mode 100644 index 0000000..eb3f835 --- /dev/null +++ b/Assets/Objects/Weapons/M9/M92.prefab @@ -0,0 +1,226 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &867143322194457524 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2213212323547960416} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &2236875552107647873 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7502619830433694848} + m_Layer: 0 + m_Name: Muzzle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7502619830433694848 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2236875552107647873} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.0004, y: -0.01487, z: -0.143} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 732033708985862910} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3709710254213546924 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 808197646603973991} + m_Layer: 0 + m_Name: Left_Hand_REF + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &808197646603973991 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3709710254213546924} + m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} + m_LocalPosition: {x: -0.03000002, y: -0.11399987, z: -0.42400002} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 732033708985862910} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} +--- !u!1 &3884320679152247161 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5792494204646893847} + m_Layer: 0 + m_Name: Right_Hand_REF + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5792494204646893847 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3884320679152247161} + m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} + m_LocalPosition: {x: 0.030000005, y: -0.10400012, z: -0.42400002} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 732033708985862910} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} +--- !u!1 &5071598280516985511 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 732033708985862910} + - component: {fileID: 6352645931139448055} + m_Layer: 0 + m_Name: M92 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &732033708985862910 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5071598280516985511} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.03999999} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1584484548595912410} + - {fileID: 7502619830433694848} + - {fileID: 808197646603973991} + - {fileID: 5792494204646893847} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6352645931139448055 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5071598280516985511} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1330674258901920049 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 732033708985862910} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalPosition.y + value: -0.054000046 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalPosition.z + value: -0.334 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_Name + value: M92 + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} +--- !u!1 &2213212323547960416 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + m_PrefabInstance: {fileID: 1330674258901920049} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1584484548595912410 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + m_PrefabInstance: {fileID: 1330674258901920049} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Objects/Weapons/M9/M92.prefab.meta b/Assets/Objects/Weapons/M9/M92.prefab.meta new file mode 100644 index 0000000..85859a7 --- /dev/null +++ b/Assets/Objects/Weapons/M9/M92.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bd217f9f85ce78e46a925776562625e8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Networing/GameManager.prefab b/Assets/Prefabs/Networing/GameManager.prefab index b680e5d..de8d833 100644 --- a/Assets/Prefabs/Networing/GameManager.prefab +++ b/Assets/Prefabs/Networing/GameManager.prefab @@ -119,13 +119,13 @@ MonoBehaviour: runInBackground: 1 autoStartServerBuild: 1 serverTickRate: 30 - offlineScene: Assets/Scenes/TestOfflineScene.unity + offlineScene: Assets/Scenes/TestScene.unity onlineScene: Assets/Scenes/TestScene.unity transport: {fileID: 3422988367618467037} networkAddress: localhost maxConnections: 100 authenticator: {fileID: 0} - playerPrefab: {fileID: 6272346181302961293, guid: 2935eead9a075fd489d6a6dc273a5999, type: 3} + playerPrefab: {fileID: 6272346181302961293, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} autoCreatePlayer: 1 playerSpawnMethod: 0 spawnPrefabs: [] diff --git a/Assets/Prefabs/Player/NewSimplePlayer.prefab b/Assets/Prefabs/Player/NewSimplePlayer.prefab new file mode 100644 index 0000000..dcbe037 --- /dev/null +++ b/Assets/Prefabs/Player/NewSimplePlayer.prefab @@ -0,0 +1,1098 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &300813007731020233 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5191607119462058208} + m_Layer: 0 + m_Name: GroundCheck + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5191607119462058208 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 300813007731020233} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7892476190645606650} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &585329409502184844 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 776793648151369487} + - component: {fileID: 7245755644096124598} + m_Layer: 0 + m_Name: Hand_R + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &776793648151369487 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 585329409502184844} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5467604861465628576} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7245755644096124598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 585329409502184844} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aeda7bfbf984f2a4da5ab4b8967b115d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Weight: 1 + m_Data: + m_Root: {fileID: 6997909822401172269} + m_Mid: {fileID: 7299139896922136738} + m_Tip: {fileID: 7457615672065537372} + m_Target: {fileID: 1060527204896377410} + m_Hint: {fileID: 0} + m_TargetPositionWeight: 1 + m_TargetRotationWeight: 1 + m_HintWeight: 1 + m_MaintainTargetPositionOffset: 0 + m_MaintainTargetRotationOffset: 0 +--- !u!1 &1097032350312847602 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6015333731871376138} + - component: {fileID: 7318780089932687953} + m_Layer: 0 + m_Name: Neck + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6015333731871376138 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1097032350312847602} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.55, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8564586131070473447} + m_Father: {fileID: 7892476190645606650} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7318780089932687953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1097032350312847602} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1692083327495444072 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1060527204896377410} + m_Layer: 0 + m_Name: RightHandTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1060527204896377410 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1692083327495444072} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3607022168303080447} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3070858583906796943 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5829801265506215456} + - component: {fileID: 1123030696078365606} + m_Layer: 0 + m_Name: GunHoldPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5829801265506215456 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3070858583906796943} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8564586131070473447} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1123030696078365606 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3070858583906796943} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &3622079392566443252 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3607022168303080447} + - component: {fileID: 3736540540442105683} + m_Layer: 0 + m_Name: GunHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3607022168303080447 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3622079392566443252} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.411} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2158179615951399604} + - {fileID: 1060527204896377410} + - {fileID: 3976259822441707333} + m_Father: {fileID: 8564586131070473447} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3736540540442105683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3622079392566443252} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &3989676981064065079 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1918908638248928225} + - component: {fileID: 4591585765001166857} + m_Layer: 0 + m_Name: Hand_L + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1918908638248928225 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3989676981064065079} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5467604861465628576} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4591585765001166857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3989676981064065079} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aeda7bfbf984f2a4da5ab4b8967b115d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Weight: 1 + m_Data: + m_Root: {fileID: 7790528312326444027} + m_Mid: {fileID: 5769763579256480391} + m_Tip: {fileID: 583282756967412227} + m_Target: {fileID: 3976259822441707333} + m_Hint: {fileID: 0} + m_TargetPositionWeight: 1 + m_TargetRotationWeight: 1 + m_HintWeight: 1 + m_MaintainTargetPositionOffset: 0 + m_MaintainTargetRotationOffset: 0 +--- !u!1 &4287428739751476621 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5042813205062036953} + m_Layer: 0 + m_Name: GunAimPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5042813205062036953 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4287428739751476621} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8564586131070473447} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1125420767424292607 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4968842565829123563} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &5144990160210934047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7892476190645606650} + - component: {fileID: 5131213269621120124} + - component: {fileID: 8854465887600141315} + - component: {fileID: 1105113605466226252} + - component: {fileID: 4773354696929325947} + - component: {fileID: 2436449023549777624} + - component: {fileID: 1154132969613801269} + - component: {fileID: 8314147766964771399} + - component: {fileID: 5696941391044838383} + - component: {fileID: 87123955921393019} + - component: {fileID: 4950896805200574183} + - component: {fileID: 1021855166031633481} + - component: {fileID: -7829741333890166564} + m_Layer: 0 + m_Name: NewSimplePlayer + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7892476190645606650 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144990160210934047} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 2.15, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5191607119462058208} + - {fileID: 6015333731871376138} + - {fileID: 5467604861465628576} + - {fileID: 5746328487088981841} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!143 &5131213269621120124 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144990160210934047} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Height: 1.8 + m_Radius: 0.3 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: 0, z: 0} +--- !u!136 &8854465887600141315 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144990160210934047} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.3 + m_Height: 1.8 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1105113605466226252 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144990160210934047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} + m_Name: + m_EditorClassIdentifier: + sceneId: 0 + serverOnly: 0 + visible: 0 + m_AssetId: 815ba91b9da92294f8041b56643e5e15 + hasSpawned: 0 +--- !u!114 &4773354696929325947 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144990160210934047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2f74aedd71d9a4f55b3ce499326d45fb, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + clientAuthority: 1 + sendInterval: 0.05 + syncPosition: 1 + syncRotation: 1 + syncScale: 0 + interpolatePosition: 1 + interpolateRotation: 1 + interpolateScale: 0 + bufferTimeMultiplier: 1 + bufferSizeLimit: 64 + catchupThreshold: 4 + catchupMultiplier: 0.1 + showGizmos: 0 + showOverlay: 0 + overlayColor: {r: 0, g: 0, b: 0, a: 0.5} +--- !u!114 &2436449023549777624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144990160210934047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 124e7dc536a7de8418284dc873cb1bb2, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + procedualAnimationController: {fileID: 8314147766964771399} + walkSpeed: 6 + sprintSpeed: 10 + aimWalkSpeed: 3 + moveSmoothTime: 0.001 + gravity: -10 + jumpHeight: 1 + inputDirection: {x: 0, y: 0, z: 0} + groundCheck: {fileID: 5191607119462058208} + groundMask: + serializedVersion: 2 + m_Bits: 0 + groundAngle: 0 + moveGroundAngle: 0 + isGrounded: 0 + isSprinting: 0 + velocity: {x: 0, y: 0, z: 0} +--- !u!114 &1154132969613801269 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144990160210934047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a8493f0e2b0d4bd4f98d3cd81c2db5ad, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + playerCamera: {fileID: 8564586131070473447} + playerNeck: {fileID: 6015333731871376138} + mouseSensitivity: 4 + maxCameraAngle: 90 + neckStartAngle: 0 + minCameraAngle: -90 + mouseSmoothTime: 0.001 + lockCursor: 1 + fullPitch: 0 +--- !u!114 &8314147766964771399 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144990160210934047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9bd09d0992070b049b461b56fd022956, type: 3} + m_Name: + m_EditorClassIdentifier: + stepAmplitudeWalking: 0 + stepAmplitudeSprinting: 0 + stepFrequency: 0 + playerController: {fileID: 2436449023549777624} + gun: {fileID: 5342212377032755079} + gunHolder: {fileID: 3622079392566443252} + positionRecoil: 1 + rotationRecoil: 1 + positionMultX: 25 + positionMultY: 25 + positionMultZ: 25 + playerMouseLook: {fileID: 1154132969613801269} + cameraRecoilX: 0.1 + cameraRecoilY: 0.1 + rotX: 1 + rotationMultX: 25 + rotationOffsetX: 0.1 + rotY: 1 + rotationMultY: 25 + rotZ: 1 + rotationMultZ: 15 + sideSwey: 1 + sweyMultX: 15 + sweyMultY: 15 + sweyMultZ: 15 + sweyWhileAim: 0.1 + returnForce: 0.006 + impulsForce: 0.025 + maxRecoil: 0.1 + aimSpeed: 0.01 + aimVal: 0 + AimPoint: {fileID: 4287428739751476621} + HoldPoint: {fileID: 5387421940067778059} + isAiming: 0 +--- !u!95 &5696941391044838383 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144990160210934047} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &87123955921393019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144990160210934047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fff0960ef4ea6e04eac66b4a7fd2189d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RigLayers: + - m_Rig: {fileID: 0} + m_Active: 1 + m_Effectors: [] +--- !u!114 &4950896805200574183 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144990160210934047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 734b48bea0b204338958ee3d885e11f0, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + clientAuthority: 1 + sendInterval: 0.05 + syncPosition: 1 + syncRotation: 1 + syncScale: 0 + interpolatePosition: 1 + interpolateRotation: 1 + interpolateScale: 0 + bufferTimeMultiplier: 1 + bufferSizeLimit: 64 + catchupThreshold: 4 + catchupMultiplier: 0.1 + showGizmos: 0 + showOverlay: 0 + overlayColor: {r: 0, g: 0, b: 0, a: 0.5} + target: {fileID: 6015333731871376138} +--- !u!114 &1021855166031633481 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144990160210934047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 734b48bea0b204338958ee3d885e11f0, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + clientAuthority: 1 + sendInterval: 0.05 + syncPosition: 1 + syncRotation: 1 + syncScale: 0 + interpolatePosition: 1 + interpolateRotation: 1 + interpolateScale: 0 + bufferTimeMultiplier: 1 + bufferSizeLimit: 64 + catchupThreshold: 4 + catchupMultiplier: 0.1 + showGizmos: 0 + showOverlay: 0 + overlayColor: {r: 0, g: 0, b: 0, a: 0.5} + target: {fileID: 8564586131070473447} +--- !u!114 &-7829741333890166564 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144990160210934047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bc5bc2b49bd326e4db460a6a3af59311, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + muzzle: {fileID: 0} + shootAnim: {fileID: 0} + fireRate: 0 + gunHoldPos: {fileID: 0} +--- !u!1 &5332363608417678239 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3976259822441707333} + m_Layer: 0 + m_Name: LeftHandTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3976259822441707333 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5332363608417678239} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3607022168303080447} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5387421940067778059 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2158179615951399604} + - component: {fileID: 5489867621871564304} + m_Layer: 0 + m_Name: M92 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2158179615951399604 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5387421940067778059} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4713168153650912573} + m_Father: {fileID: 3607022168303080447} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5489867621871564304 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5387421940067778059} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &5979409722367386217 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5467604861465628576} + - component: {fileID: 106695735786765444} + m_Layer: 0 + m_Name: RigLayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5467604861465628576 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5979409722367386217} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 776793648151369487} + - {fileID: 1918908638248928225} + m_Father: {fileID: 7892476190645606650} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &106695735786765444 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5979409722367386217} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70b342d8ce5c2fd48b8fa3147d48d1d1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Weight: 1 + m_Effectors: [] +--- !u!1 &7007815850545342758 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8564586131070473447} + - component: {fileID: 7029490686841050055} + - component: {fileID: 562683858921027471} + - component: {fileID: 7918214137350276302} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8564586131070473447 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7007815850545342758} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.156, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3607022168303080447} + - {fileID: 5829801265506215456} + - {fileID: 5042813205062036953} + m_Father: {fileID: 6015333731871376138} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &7029490686841050055 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7007815850545342758} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!81 &562683858921027471 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7007815850545342758} + m_Enabled: 1 +--- !u!114 &7918214137350276302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7007815850545342758} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &5107697753940998870 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2158179615951399604} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_Name + value: M92 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} +--- !u!1 &5342212377032755079 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + m_PrefabInstance: {fileID: 5107697753940998870} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4713168153650912573 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + m_PrefabInstance: {fileID: 5107697753940998870} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5203265249777082554 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7892476190645606650} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalPosition.y + value: 0.045 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_Name + value: Human without head + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 01316cb596562384da845bc519fb90de, type: 3} +--- !u!1 &4968842565829123563 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 5203265249777082554} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5746328487088981841 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 5203265249777082554} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5769763579256480391 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 5203265249777082554} + m_PrefabAsset: {fileID: 0} +--- !u!4 &583282756967412227 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 5203265249777082554} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6997909822401172269 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 5203265249777082554} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7299139896922136738 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 5203265249777082554} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7457615672065537372 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 5203265249777082554} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7790528312326444027 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 5203265249777082554} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Player/NewSimplePlayer.prefab.meta b/Assets/Prefabs/Player/NewSimplePlayer.prefab.meta new file mode 100644 index 0000000..48211a7 --- /dev/null +++ b/Assets/Prefabs/Player/NewSimplePlayer.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 815ba91b9da92294f8041b56643e5e15 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player/Player Animation Test.prefab b/Assets/Prefabs/Player/Player Animation Test.prefab index e02839c..bbe0aaf 100644 --- a/Assets/Prefabs/Player/Player Animation Test.prefab +++ b/Assets/Prefabs/Player/Player Animation Test.prefab @@ -257,68 +257,6 @@ SphereCollider: serializedVersion: 2 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &1749713556945343754 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9064841067161443684} - m_Layer: 0 - m_Name: Right_Hand_REF - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &9064841067161443684 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1749713556945343754} - m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} - m_LocalPosition: {x: 0.09, y: -0.05, z: 0.03} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4058555163434875561} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} ---- !u!1 &2221492823855642591 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2781132594439880980} - m_Layer: 0 - m_Name: Left_Hand_REF - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2781132594439880980 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2221492823855642591} - m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} - m_LocalPosition: {x: 0.09, y: -0.06, z: -0.03} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4058555163434875561} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} --- !u!1 &2992488853448454767 GameObject: m_ObjectHideFlags: 0 @@ -343,56 +281,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2992488853448454767} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.35} + m_LocalPosition: {x: 0, y: 0, z: 0.266} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6272346181657429396} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3649358604728444914 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5021921342190399731} - m_Layer: 0 - m_Name: Muzzle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5021921342190399731 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3649358604728444914} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.274, z: 0.7} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6272346181657429396} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2425026116520232903 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3682030003239559187} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &4824770690127859843 GameObject: m_ObjectHideFlags: 0 @@ -576,20 +471,18 @@ GameObject: - component: {fileID: 6272346181302961296} - component: {fileID: 8191616764201741429} - component: {fileID: 6272346181302961295} - - component: {fileID: 320375778840406984} - component: {fileID: -4574526707603160507} - - component: {fileID: 7273209952621479910} - - component: {fileID: 4959463831902427506} + - component: {fileID: 3387435154213398635} - component: {fileID: 5630859218361338035} - component: {fileID: 8436279266335313624} - - component: {fileID: 268368477457052331} - component: {fileID: 3781802212159559521} + - component: {fileID: 320375778840406984} + - component: {fileID: 7273209952621479910} - component: {fileID: 6207632454083444980} - component: {fileID: 1509131218531316230} + - component: {fileID: -7261721819113345487} - component: {fileID: 8957579265169979397} - component: {fileID: 3965891812990671158} - - component: {fileID: 4276885029697240453} - - component: {fileID: 7198056240135858432} m_Layer: 0 m_Name: Player Animation Test m_TagString: Player @@ -649,23 +542,6 @@ CharacterController: m_SkinWidth: 0.08 m_MinMoveDistance: 0.001 m_Center: {x: 0, y: 1, z: 0} ---- !u!114 &320375778840406984 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6272346181302961293} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} - m_Name: - m_EditorClassIdentifier: - sceneId: 0 - serverOnly: 0 - visible: 0 - m_AssetId: a14d876ac00bdf6498e30b3e58b68fdf - hasSpawned: 0 --- !u!114 &-4574526707603160507 MonoBehaviour: m_ObjectHideFlags: 0 @@ -680,13 +556,13 @@ MonoBehaviour: m_EditorClassIdentifier: syncMode: 0 syncInterval: 0.1 - ADSContoller: {fileID: 7198056240135858432} - walkSpeed: 6 - sprintSpeed: 8 + procedualAnimationController: {fileID: 3387435154213398635} + walkSpeed: 5 + sprintSpeed: 7 aimWalkSpeed: 3 moveSmoothTime: 0.05 gravity: -10 - jumpHeight: 1.2 + jumpHeight: 1 inputDirection: {x: 0, y: 0, z: 0} groundCheck: {fileID: 6272346182417644039} groundMask: @@ -696,7 +572,8 @@ MonoBehaviour: moveGroundAngle: 0 isGrounded: 0 isSprinting: 0 ---- !u!114 &7273209952621479910 + velocity: {x: 0, y: 0, z: 0} +--- !u!114 &3387435154213398635 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -705,42 +582,47 @@ MonoBehaviour: m_GameObject: {fileID: 6272346181302961293} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2f74aedd71d9a4f55b3ce499326d45fb, type: 3} + m_Script: {fileID: 11500000, guid: 9bd09d0992070b049b461b56fd022956, type: 3} m_Name: m_EditorClassIdentifier: syncMode: 0 syncInterval: 0.1 - clientAuthority: 1 - sendInterval: 0.05 - syncPosition: 1 - syncRotation: 1 - syncScale: 0 - interpolatePosition: 1 - interpolateRotation: 1 - interpolateScale: 0 - bufferTimeMultiplier: 1 - bufferSizeLimit: 64 - catchupThreshold: 4 - catchupMultiplier: 0.1 - showGizmos: 1 - showOverlay: 1 - overlayColor: {r: 0, g: 0, b: 0, a: 0.5} ---- !u!114 &4959463831902427506 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6272346181302961293} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 00dc60b61b501f2419e2abd7158be5f8, type: 3} - m_Name: - m_EditorClassIdentifier: - syncMode: 0 - syncInterval: 0.1 - color: {r: 1, g: 0, b: 0, a: 0} - renderer: {fileID: 0} + stepAmplitudeWalking: 0.02 + stepAmplitudeSprinting: 0.07 + stepFrequency: 0.3 + playerController: {fileID: -4574526707603160507} + currentCameraRecoilX: 0 + currentCameraRecoilY: 0 + gun: {fileID: 3682030003239559187} + gunHolder: {fileID: 7768205653369755348} + positionRecoil: 1 + rotationRecoil: 1 + positionMultX: 2 + positionMultY: 5 + positionMultZ: 1 + playerMouseLook: {fileID: 5630859218361338035} + cameraRecoilX: 10 + cameraRecoilY: 10 + rotX: 1 + rotationMultX: 5 + rotationOffsetX: 0.1 + rotY: 1 + rotationMultY: 0 + rotZ: 0 + rotationMultZ: 0 + sideSwey: 1 + sweyMultX: 1 + sweyMultY: 0 + sweyMultZ: 0 + sweyWhileAim: 0.1 + returnForce: 0.001 + impulsForce: 0.01 + maxRecoil: 0.1 + aimSpeed: 0.06 + aimVal: 0 + AimPoint: {fileID: 2992488853448454767} + HoldPoint: {fileID: 8043317747957554736} + isAiming: 0 --- !u!114 &5630859218361338035 MonoBehaviour: m_ObjectHideFlags: 0 @@ -783,30 +665,6 @@ MonoBehaviour: username: usernameTextObj: {fileID: 0} health: 0 ---- !u!114 &268368477457052331 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6272346181302961293} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4db7caf602ce379408a59c8722e06e46, type: 3} - m_Name: - m_EditorClassIdentifier: - syncMode: 0 - syncInterval: 0.1 - playerController: {fileID: -4574526707603160507} - gunAnimation: {fileID: 4276885029697240453} - posCheckDistance: 1 - checkDist: 0 - stepAmplitudeWalking: 0.05 - stepAmplitudeSprinting: 0.07 - stepFrequency: 0.8 - Neck: {fileID: 6272346181657429396} - gunRotation: {fileID: 0} - rotationMultiplier: 0.1 --- !u!114 &3781802212159559521 MonoBehaviour: m_ObjectHideFlags: 0 @@ -822,9 +680,55 @@ MonoBehaviour: syncMode: 0 syncInterval: 0.1 muzzle: {fileID: 3649358604728444914} - shootAnim: {fileID: 4276885029697240453} + shootAnim: {fileID: 3387435154213398635} fireRate: 320 gunHoldPos: {fileID: 3682030003239559187} +--- !u!114 &320375778840406984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} + m_Name: + m_EditorClassIdentifier: + sceneId: 0 + serverOnly: 0 + visible: 0 + m_AssetId: a14d876ac00bdf6498e30b3e58b68fdf + hasSpawned: 0 +--- !u!114 &7273209952621479910 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2f74aedd71d9a4f55b3ce499326d45fb, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + clientAuthority: 1 + sendInterval: 0.05 + syncPosition: 1 + syncRotation: 1 + syncScale: 0 + interpolatePosition: 1 + interpolateRotation: 1 + interpolateScale: 0 + bufferTimeMultiplier: 1 + bufferSizeLimit: 64 + catchupThreshold: 4 + catchupMultiplier: 0.1 + showGizmos: 1 + showOverlay: 1 + overlayColor: {r: 0, g: 0, b: 0, a: 0.5} --- !u!114 &6207632454083444980 MonoBehaviour: m_ObjectHideFlags: 0 @@ -885,6 +789,36 @@ MonoBehaviour: showOverlay: 0 overlayColor: {r: 0, g: 0, b: 0, a: 0.5} target: {fileID: 981273033772084037} +--- !u!114 &-7261721819113345487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 734b48bea0b204338958ee3d885e11f0, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + clientAuthority: 0 + sendInterval: 0.05 + syncPosition: 1 + syncRotation: 1 + syncScale: 0 + interpolatePosition: 1 + interpolateRotation: 1 + interpolateScale: 0 + bufferTimeMultiplier: 1 + bufferSizeLimit: 64 + catchupThreshold: 4 + catchupMultiplier: 0.1 + showGizmos: 0 + showOverlay: 0 + overlayColor: {r: 0, g: 0, b: 0, a: 0.5} + target: {fileID: 2848367205963120269} --- !u!95 &8957579265169979397 Animator: serializedVersion: 4 @@ -921,62 +855,6 @@ MonoBehaviour: - m_Rig: {fileID: 8865635171929772803} m_Active: 1 m_Effectors: [] ---- !u!114 &4276885029697240453 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6272346181302961293} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b366149a1bdd3ad4884ac2afe0fe11a1, type: 3} - m_Name: - m_EditorClassIdentifier: - gun: {fileID: 3682030003239559187} - gunHolder: {fileID: 6522444664664986769} - gunPositionObj: {fileID: 7263663517583319679} - gunRotationObj: {fileID: 7768205653369755348} - positionRecoil: 1 - rotationRecoil: 1 - positionMultX: 0.2 - positionMultY: 0.5 - positionMultZ: 1 - playerMouseLook: {fileID: 5630859218361338035} - cameraRecoilX: 8 - cameraRecoilY: 4 - rotX: 1 - rotationMultX: 60 - rotationOffsetX: 0.1 - rotY: 1 - rotationMultY: 50 - rotZ: 1 - rotationMultZ: 100 - ADSController: {fileID: 7198056240135858432} - sideSwey: 1 - sweyMult: 1.2 - sweyWhileAim: 0.05 - returnForce: 0.006 - impulsForce: 0.025 - maxRecoil: 0.25 ---- !u!114 &7198056240135858432 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6272346181302961293} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 916f2d37f60a91149bbca3280a1b69ec, type: 3} - m_Name: - m_EditorClassIdentifier: - aimSpeed: 0.09 - aimVal: 1 - gun: {fileID: 6522444664664986769} - AimPoint: {fileID: 2992488853448454767} - HoldPoint: {fileID: 8043317747957554736} - isAiming: 0 --- !u!1 &6272346181657429393 GameObject: m_ObjectHideFlags: 0 @@ -1007,7 +885,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5021921342190399731} - {fileID: 4074665071222326704} - {fileID: 1979435770070801855} - {fileID: 1468248131875751636} @@ -1021,7 +898,7 @@ Camera: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6272346181657429393} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} @@ -1130,9 +1007,9 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6035287771982183217} - - {fileID: 3087782655464804516} + - {fileID: 2848367205963120269} m_Father: {fileID: 6272346181657429396} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &909517976577723968 MonoBehaviour: @@ -1211,96 +1088,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &7263663517583319679 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3087782655464804516} - - component: {fileID: 3590891737052679150} - m_Layer: 0 - m_Name: GunPosition - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3087782655464804516 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7263663517583319679} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.04} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2848367205963120269} - m_Father: {fileID: 4074665071222326704} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3590891737052679150 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7263663517583319679} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &7768205653369755348 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2848367205963120269} - - component: {fileID: 8468733188726769796} - m_Layer: 0 - m_Name: GunRotation - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2848367205963120269 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7768205653369755348} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4058555163434875561} - m_Father: {fileID: 3087782655464804516} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8468733188726769796 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7768205653369755348} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &8043317747957554736 GameObject: m_ObjectHideFlags: 0 @@ -1325,83 +1112,99 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8043317747957554736} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.108, y: -0.084, z: 0.35} + m_LocalPosition: {x: 0.108, y: -0.084, z: 0.266} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6272346181657429396} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &4600527171543473474 +--- !u!1001 &3292089710699836531 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 2848367205963120269} + m_TransformParent: {fileID: 4074665071222326704} m_Modifications: - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_LocalPosition.y - value: -0.054000046 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_LocalPosition.z - value: -0.13 + value: 0.03999999 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_LocalRotation.y - value: 0.7071068 + value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + - target: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_Name value: M92 objectReference: {fileID: 0} - - target: {fileID: 5866666021909216657, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} - propertyPath: m_Controller - value: - objectReference: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: bd217f9f85ce78e46a925776562625e8, type: 3} +--- !u!1 &7768205653369755348 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + m_PrefabInstance: {fileID: 3292089710699836531} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2848367205963120269 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + m_PrefabInstance: {fileID: 3292089710699836531} + m_PrefabAsset: {fileID: 0} --- !u!1 &3682030003239559187 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} - m_PrefabInstance: {fileID: 4600527171543473474} + m_CorrespondingSourceObject: {fileID: 2213212323547960416, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + m_PrefabInstance: {fileID: 3292089710699836531} m_PrefabAsset: {fileID: 0} ---- !u!4 &4058555163434875561 stripped +--- !u!1 &3649358604728444914 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2236875552107647873, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + m_PrefabInstance: {fileID: 3292089710699836531} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2781132594439880980 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} - m_PrefabInstance: {fileID: 4600527171543473474} + m_CorrespondingSourceObject: {fileID: 808197646603973991, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + m_PrefabInstance: {fileID: 3292089710699836531} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9064841067161443684 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5792494204646893847, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + m_PrefabInstance: {fileID: 3292089710699836531} m_PrefabAsset: {fileID: 0} --- !u!1001 &6305701708507383038 PrefabInstance: @@ -1561,6 +1364,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3} m_PrefabInstance: {fileID: 6305701708507383038} m_PrefabAsset: {fileID: 0} +--- !u!4 &5767109144009335573 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 6305701708507383038} + m_PrefabAsset: {fileID: 0} --- !u!4 &8334588817950881727 stripped Transform: m_CorrespondingSourceObject: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3} @@ -1591,8 +1399,3 @@ Transform: m_CorrespondingSourceObject: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3} m_PrefabInstance: {fileID: 6305701708507383038} m_PrefabAsset: {fileID: 0} ---- !u!4 &5767109144009335573 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} - m_PrefabInstance: {fileID: 6305701708507383038} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Player/Player.prefab b/Assets/Prefabs/Player/Player.prefab index 4f25b88..65fbdbf 100644 --- a/Assets/Prefabs/Player/Player.prefab +++ b/Assets/Prefabs/Player/Player.prefab @@ -389,18 +389,21 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6272346181302961293} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 124e7dc536a7de8418284dc873cb1bb2, type: 3} m_Name: m_EditorClassIdentifier: syncMode: 0 syncInterval: 0.1 + ADSContoller: {fileID: 0} walkSpeed: 6 sprintSpeed: 8 + aimWalkSpeed: 3 moveSmoothTime: 0.05 gravity: -10 jumpHeight: 1.2 + inputDirection: {x: 0, y: 0, z: 0} groundCheck: {fileID: 6272346182417644039} groundMask: serializedVersion: 2 @@ -461,7 +464,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6272346181302961293} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a8493f0e2b0d4bd4f98d3cd81c2db5ad, type: 3} m_Name: @@ -474,9 +477,9 @@ MonoBehaviour: maxCameraAngle: 90 neckStartAngle: 0 minCameraAngle: -90 - neckLength: 0.2 mouseSmoothTime: 0.001 lockCursor: 1 + fullPitch: 0 --- !u!114 &8436279266335313624 MonoBehaviour: m_ObjectHideFlags: 0 @@ -484,7 +487,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6272346181302961293} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3317f24e780855847830f5662153b41d, type: 3} m_Name: @@ -503,7 +506,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6272346181302961293} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4db7caf602ce379408a59c8722e06e46, type: 3} m_Name: @@ -511,12 +514,15 @@ MonoBehaviour: syncMode: 0 syncInterval: 0.1 playerController: {fileID: -4574526707603160507} + gunAnimation: {fileID: 0} posCheckDistance: 1 checkDist: 0 stepAmplitudeWalking: 0.05 stepAmplitudeSprinting: 0.07 stepFrequency: 0.8 Neck: {fileID: 6272346181657429396} + gunRotation: {fileID: 0} + rotationMultiplier: 0.1 --- !u!114 &3781802212159559521 MonoBehaviour: m_ObjectHideFlags: 0 @@ -524,7 +530,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6272346181302961293} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bc5bc2b49bd326e4db460a6a3af59311, type: 3} m_Name: @@ -532,6 +538,9 @@ MonoBehaviour: syncMode: 0 syncInterval: 0.1 muzzle: {fileID: 3649358604728444914} + shootAnim: {fileID: 0} + fireRate: 0 + gunHoldPos: {fileID: 0} --- !u!114 &6207632454083444980 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index 48ab828..2d0cad9 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -8,7 +8,7 @@ using Mirror; public class PlayerController : NetworkBehaviour { - [SerializeField] private AimDownSights ADSContoller; + [SerializeField] private ProcedualAnimationController procedualAnimationController; [Header("Movement")] [SerializeField] private float walkSpeed = 6.0f; [SerializeField] private float sprintSpeed = 10.0f; @@ -36,7 +36,8 @@ public class PlayerController : NetworkBehaviour private Vector3 currentDir = Vector3.zero; private Vector3 currentDirVelocity = Vector3.zero; - private Vector3 velocity = Vector3.zero; + public Vector3 velocity = Vector3.zero; + private Vector3 refVelocity = Vector3.zero; private void Start() @@ -65,8 +66,8 @@ public class PlayerController : NetworkBehaviour public bool isMoving() { - if (velocity.x == 0 && velocity.y == 0 && velocity.z == 0) return true; - else return false; + if (velocity.x == 0 && velocity.y == 0 && velocity.z == 0) return false; + else return true; } private void CheckGoundAngle() @@ -101,16 +102,18 @@ public class PlayerController : NetworkBehaviour { - if (Input.GetAxisRaw("Sprint") > 0 && isGrounded && !ADSContoller.isAiming) - { + if (Input.GetAxisRaw("Sprint") > 0 && isGrounded && !procedualAnimationController.isAiming) + { movementSpeed = sprintSpeed; isSprinting = true; } else { - if(ADSContoller.isAiming) movementSpeed = aimWalkSpeed; + + if(procedualAnimationController.isAiming) movementSpeed = aimWalkSpeed; else movementSpeed = walkSpeed; isSprinting = false; + } //Grounded @@ -133,6 +136,7 @@ public class PlayerController : NetworkBehaviour } inputDirection = new Vector3(Input.GetAxisRaw("Horizontal"),0, Input.GetAxisRaw("Vertical")); //Get Inputs + inputDirection.Normalize(); //Damit schräg laufen nicht schneller ist if (isGrounded) @@ -145,11 +149,8 @@ public class PlayerController : NetworkBehaviour currentDir = moveDirection; } - velocity = currentDir * movementSpeed + new Vector3(0, velocityY, 0); - - + velocity = Vector3.SmoothDamp(velocity, currentDir * movementSpeed + new Vector3(0, velocityY, 0),ref refVelocity,0.01f); controller.Move(velocity * Time.deltaTime); - } } diff --git a/Assets/Scripts/Player/PlayerMouseLook.cs b/Assets/Scripts/Player/PlayerMouseLook.cs index 55dc01a..2ff5af7 100644 --- a/Assets/Scripts/Player/PlayerMouseLook.cs +++ b/Assets/Scripts/Player/PlayerMouseLook.cs @@ -35,7 +35,7 @@ public class PlayerMouseLook : NetworkBehaviour { controller = GetComponent(); - playerCamera.gameObject.SetActive(true); + playerCamera.GetComponent().enabled = true; neckLength = Vector3.Distance(playerNeck.position,playerCamera.position); if (lockCursor) @@ -52,7 +52,7 @@ public class PlayerMouseLook : NetworkBehaviour { UpdateMouseLook(); } - + } private void UpdateMouseLook() diff --git a/Assets/Scripts/Player/ProcedualAnimationController.cs b/Assets/Scripts/Player/ProcedualAnimationController.cs new file mode 100644 index 0000000..8c625aa --- /dev/null +++ b/Assets/Scripts/Player/ProcedualAnimationController.cs @@ -0,0 +1,306 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Mirror; + +public class ProcedualAnimationController : NetworkBehaviour +{ + + [Header("Step Settings")] + [SerializeField] private float stepAmplitudeWalking; + [SerializeField] private float stepAmplitudeSprinting; + [SerializeField] private float stepFrequency; + private float checkDist = 0f; + private float stepDistance = 1; + private float stepSin; + float moveSoftStart = 0; + Vector3 lastPos = Vector3.zero; + float posCheckDistance = 0.01f; + float currentDist = 0; + + + float f = 0f; + + [SerializeField] private PlayerController playerController; + + + + + [Header("GameObjects")] + [SerializeField] private float currentCameraRecoilX = 0f; + [SerializeField] private float currentCameraRecoilY = 0f; + [Header("GameObjects")] + [SerializeField] private GameObject gun; // The gun object with the animator on it. + [SerializeField] private GameObject gunHolder; + + + [Header("General 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] bool sideSwey = true; + [SerializeField] float sweyMultX = 15f; + [SerializeField] float sweyMultY = 15f; + [SerializeField] float sweyMultZ = 15f; + [SerializeField] float sweyWhileAim = 0.1f; + float swey = 0f; + + [Header("External Settings")] + [SerializeField] const int externalPositionVectorsNum = 1; + private Vector3[] externalPositionVectors = new Vector3[externalPositionVectorsNum]; + + + [SerializeField] float returnForce = 0.006f; + [SerializeField] float impulsForce = 0.025f; + [SerializeField] float maxRecoil = 0.1f; + + private Animator gunAnimator; + + Vector3 startPos, startRot; + float recoilOffset = 0f; + float zOffset = 0f; + float zVelocity = 0f; + + int recoilCounter = 0; + + [Header("Aiming Settings")] + [SerializeField] float aimSpeed = 0.01f; + [Range(0, 1)] public float aimVal = 0; + [SerializeField] GameObject AimPoint; + [SerializeField] GameObject HoldPoint; + public bool isAiming = false; + + Vector3[] positionMod = new Vector3[3]; + Quaternion[] rotationMod = new Quaternion[3]; + + + public void OnSwitchWeapon(float fireRate) + { + if (isLocalPlayer) + { + //gun = newGun; + gunAnimator = gun.GetComponent(); + gunAnimator.SetFloat("ShootSpeed", 1f / (60f / fireRate)); + //startPos = gunPositionObj.transform.localPosition; + //startRot = gunRotationObj.transform.localRotation.eulerAngles; + } + } + + public void Recoil(float force) + { + if (isLocalPlayer) + { + //Play the animation + gunAnimator.Play("Shoot"); + //Add force for the recoil + //currentCameraRecoilX -= weightedPerlinNoise(cameraRecoilX, 1f, Time.time, 1); + //playerMouseLook = Mathf.SmoothDamp(playerMouseLook.fullPitch, playerMouseLook.fullPitch - weightedPerlinNoise(cameraRecoilX, 1f, Time.time, 1),ref f,0.01f); + CmdRecoil(); + } + } + [Command] + private void CmdRecoil() + { + recoilCounter++; + playerMouseLook.fullPitch -= weightedPerlinNoise(cameraRecoilX, 1f, Time.time, 1); + transform.Rotate(Vector3.up * weightedPerlinNoise(cameraRecoilY, 1f, Time.time, 1f, -0.5f)); + } + [Command] + private void CmdAim(bool input) + { + if (input) isAiming = true; + else isAiming = false; + } + + void Update() + { + if (isLocalPlayer) + { + CmdAim(Input.GetButton("Aim")); + } + /*-----Aiming-----*/ + + } + + private void FixedUpdate() + { + if (isServer) + { + positionMod = new Vector3[3]; + rotationMod = new Quaternion[3]; + /*-----Recoil-----*/ + calcRecoilOffset(); + /*-----Position Recoil-----*/ + PositionRecoil(); + /*-----Rotation Recoil-----*/ + RotationRecoil(); + /*-----Step Swey-----*/ + calcStepSin(); + SideStep(); + /*-----Aiming-----*/ + AimDownSights(); + /*-----Apply Gun Position-----*/ + Vector3 totalPosition = Vector3.zero; + for (int i = 0; i < positionMod.Length; i++) + { + if (positionMod[i] != null) + totalPosition += positionMod[i]; + } + + /*-----Apply Gun Rotation-----*/ + Quaternion totalRotation = Quaternion.identity; + for (int i = 0; i < rotationMod.Length; i++) + { + totalRotation *= rotationMod[i]; + } + //gunHolder.transform.localPosition = positionMod[2]; + gunHolder.transform.localPosition = totalPosition; + //gunHolder.transform.localRotation = totalRotation; + gunHolder.transform.localRotation = rotationMod[0]; + } + } + + void RotationRecoil() + { + /*-----Rotation Recoil-----*/ + if (rotationRecoil) + { + float deltaX = 100f * rotationMultX * weightedPerlinNoise(recoilOffset, 0.5f, Time.time, 1f); + float deltaY = 100f * rotationMultY * weightedPerlinNoise(recoilOffset, 0.5f, Time.time, 1f, -0.5f); + float deltaZ = 100f * rotationMultZ * weightedPerlinNoise(recoilOffset, 0.5f, Time.time, 1f, -0.5f); + + rotationMod[0] = Quaternion.Euler(deltaX, deltaY, deltaZ); + } + } + void PositionRecoil() + { + if (positionRecoil) + { + float deltaX = -positionMultX * weightedPerlinNoise(recoilOffset, 0.7f, Time.time, 1f, -0.5f); + float deltaY = -positionMultY * weightedPerlinNoise(recoilOffset, 0.5f, Time.time, 2f); + float deltaZ = positionMultZ * weightedPerlinNoise(recoilOffset, 0.5f, Time.time, 3f); + + positionMod[0] = new Vector3(deltaX, deltaY, deltaZ); + } + } + void AimDownSights() + { + aimVal = gravityValue(aimVal, aimSpeed, 1, 0, isAiming); + positionMod[2] = Vector3.Lerp(HoldPoint.transform.localPosition, AimPoint.transform.localPosition, Mathf.Pow(aimVal, 1.3f)); + } + void calcRecoilOffset() + { + for (int i = 0; i < recoilCounter; i++) + { + zVelocity -= weightedPerlinNoise(impulsForce, 0.1f, i, 1f); + } + recoilCounter = 0; + + recoilOffset += zVelocity; + + zVelocity = 0; + + if (recoilOffset > 0) + recoilOffset = 0f; + else if (recoilOffset < 0) + zVelocity += weightedPerlinNoise(returnForce, 0.1f, Time.time, 1f); + + recoilOffset = Mathf.Clamp(recoilOffset, -weightedPerlinNoise(maxRecoil, 0.5f, Time.time * 1000, 1f), 0); + + } + void calcStepSin() + { + float amplitude; + + 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; + } + stepSin = ezSin(stepAmplitudeWalking, stepFrequency, currentDist); + } + void SideStep() + { + if (sideSwey) + { + //To start and end the sweying motion softly + + moveSoftStart = gravityValue(moveSoftStart, 0.1f, 0.03f, 1f, 0f, playerController.isMoving() && playerController.isGrounded); + + if (playerController.isMoving()) + { + float deltaX = sweyMultX * moveSoftStart * Mathf.Clamp(Vector3.Magnitude(playerController.velocity), 0, 1) * weightedPerlinNoise(stepSin, 0.3f, Time.time, 10f, 0.5f) * Mathf.Clamp((1 - aimVal) * (1 - aimVal), sweyWhileAim, 1f); + float deltaY = sweyMultY * moveSoftStart * Mathf.Clamp(Vector3.Magnitude(playerController.velocity), 0, 1) * weightedPerlinNoise(stepSin, 0.7f, Time.time, 20f, -0.5f) * Mathf.Clamp((1 - aimVal) * (1 - aimVal), sweyWhileAim, 1f); + float deltaZ = sweyMultZ * moveSoftStart * Mathf.Clamp(Vector3.Magnitude(playerController.velocity), 0, 1) * weightedPerlinNoise(stepSin, 0.3f, Time.time, 30f, 0.5f) * Mathf.Clamp((1 - aimVal) * (1 - aimVal), sweyWhileAim, 1f); + + positionMod[1] = new Vector3(deltaX, deltaY, deltaZ); + } + } + } + + + + + /*-----Helper Methods-----*/ + float gravityValue(float curretnValue, float rateOfChange, float maxValue, float minValue, bool add) + { + // The currentValue will be advanced or reduced by the rateOfChange depending on the add boolean. But only in the specified range. + // Usage: val = gravityValue(val, 0.01f, 1, 0, true); + float value = curretnValue; + if (add) value += rateOfChange; + else value -= rateOfChange; + + return Mathf.Clamp(value, minValue, maxValue); + } + float weightedPerlinNoise(float value, float weight, float pX, float pY, float offset = 0f) + { + return value * (1f - weight) + value * weight * (Mathf.PerlinNoise(pX, pY) + offset); + } + + float gravityValue(float curretnValue, float rateOfChangePos, float rateOfChangeNeg, float maxValue, float minValue, bool add) + { + // The currentValue will be advanced by the rateOfChangePos and reduced by the rateOfChangeNeg depending on the add boolean. But only in the specified range. + // Usage: val = gravityValue(val, 0.01f, 0.05f, 1, 0, true); + float value = curretnValue; + if (add) value += rateOfChangePos; + else value -= rateOfChangeNeg; + + return Mathf.Clamp(value, minValue, maxValue); + } + + private float ezSin(float amplitude, float frequency, float x) + { + // Simplification of the sin function. + return amplitude * Mathf.Sin((x / 3.1831f) * 10 * frequency); + } +} diff --git a/Assets/Scripts/Player/ProcedualAnimationController.cs.meta b/Assets/Scripts/Player/ProcedualAnimationController.cs.meta new file mode 100644 index 0000000..934344d --- /dev/null +++ b/Assets/Scripts/Player/ProcedualAnimationController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9bd09d0992070b049b461b56fd022956 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Weapons/Shoot.cs b/Assets/Scripts/Weapons/Shoot.cs index 6be8522..59a6124 100644 --- a/Assets/Scripts/Weapons/Shoot.cs +++ b/Assets/Scripts/Weapons/Shoot.cs @@ -6,7 +6,7 @@ using Mirror; public class Shoot : NetworkBehaviour { [SerializeField] GameObject muzzle; - [SerializeField] ShootAnimation shootAnim; + [SerializeField] ProcedualAnimationController shootAnim; [SerializeField] float fireRate; [SerializeField] GameObject gunHoldPos; @@ -40,6 +40,9 @@ public class Shoot : NetworkBehaviour if (Physics.Raycast(muzzle.transform.position, muzzle.transform.forward, out hit)) { + GameObject g = GameObject.CreatePrimitive(PrimitiveType.Sphere); + g.transform.position = hit.point; + g.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f); if (hit.transform.gameObject.GetComponent() != null) { dedplayer = hit.transform.gameObject; @@ -53,6 +56,6 @@ public class Shoot : NetworkBehaviour // This code will be executed on the Client. void shootAnimation() { - shootAnim.recoil(gunHoldPos,0.1f); + shootAnim.Recoil(0.1f); } } diff --git a/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/ProjectSettings/BurstAotSettings_StandaloneWindows.json new file mode 100644 index 0000000..e02ae33 --- /dev/null +++ b/ProjectSettings/BurstAotSettings_StandaloneWindows.json @@ -0,0 +1,17 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "UsePlatformSDKLinker": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsX32": 6, + "CpuTargetsX64": 72, + "OptimizeFor": 0 + } +} diff --git a/ProjectSettings/CommonBurstAotSettings.json b/ProjectSettings/CommonBurstAotSettings.json new file mode 100644 index 0000000..0293daf --- /dev/null +++ b/ProjectSettings/CommonBurstAotSettings.json @@ -0,0 +1,6 @@ +{ + "MonoBehaviour": { + "Version": 4, + "DisabledWarnings": "" + } +} diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index e1d5e82..6655d79 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,7 +5,7 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 + - enabled: 0 path: Assets/Scenes/TestOfflineScene.unity guid: 20dba395f2cd9824288c340124ce9d6f - enabled: 1 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 1c728b9..c598b6d 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,13 +6,13 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 510150040406500e0b5c0f26497b0d44444f40297f7c76617f7d1e36bbe4623e + value: 5303575756005a0f0c0d5e7a487a0a44154e19727f7b7f67757b1936b4b73268 flags: 0 RecentlyUsedSceneGuid-1: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 510150040406500e0b5c0f26497b0d44444f40297f7c76617f7d1e36bbe4623e flags: 0 RecentlyUsedSceneGuid-2: - value: 5303575756005a0f0c0d5e7a487a0a44154e19727f7b7f67757b1936b4b73268 + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index c9104e3..13d33be 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -19,8 +19,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1536 - height: 731 + width: 1920 + height: 947 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 @@ -41,14 +41,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 713.60004 - y: 73.6 - width: 455.59998 - height: 450.2 + x: 2425 + y: 73 + width: 573 + height: 590 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -59,7 +59,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 455.59998, y: 429.2} + m_TargetSize: {x: 573, y: 569} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -74,10 +74,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -182.23999 - m_HBaseRangeMax: 182.23999 - m_VBaseRangeMin: -171.68001 - m_VBaseRangeMax: 171.68001 + m_HBaseRangeMin: -286.5 + m_HBaseRangeMax: 286.5 + m_VBaseRangeMin: -284.5 + m_VBaseRangeMax: 284.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 455.59998 - height: 429.2 - m_Scale: {x: 1.1592739, y: 1.1592739} - m_Translation: {x: 227.79999, y: 214.6} + width: 573 + height: 569 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 286.5, y: 284.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -196.5023 - y: -185.11589 - width: 393.0046 - height: 370.23178 + x: -286.5 + y: -284.5 + width: 573 + height: 569 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 569.5, y: 562.75} + m_LastWindowPixelSize: {x: 573, y: 590} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -136,8 +136,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1171.2 - height: 731 + width: 1464 + height: 947 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 @@ -162,8 +162,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1171.2 - height: 471.2 + width: 1464 + height: 611 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 @@ -185,10 +185,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 297.6 - height: 471.2 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + width: 370 + height: 611 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 6} m_Panes: - {fileID: 6} @@ -210,14 +210,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 73.6 - width: 296.6 - height: 450.2 + x: 1536 + y: 73 + width: 369 + height: 590 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -227,7 +227,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 4e34fdfff434fdff5255fdffe496fdffb2b0fdff62d4fdff08d5fdffc6f5fdff6cf6fdff6251feff0852feff4658feff4859feffe695feff849ffeff34a0feff02cbfeff740affffa018ffff5019ffffdc1efffffe55ffff0456ffff1456ffff2056ffff2656ffff5656ffff0657ffff9265ffff9865ffffa865ffffb465ffffba65ffffea65ffff9a66ffff7e88ffff8488ffffb488ffff6489ffffa48dffff548effff3af4ffff40f4ffff50f4ffff5cf4ffff62f4ffff90f4ffff40f5ffffa6f7fffff4ffffff + m_ExpandedIDs: 2afbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -266,10 +266,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 297.6 + x: 370 y: 0 - width: 415.99997 - height: 471.2 + width: 519 + height: 611 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 9} @@ -294,7 +294,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Animator - m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 @@ -358,14 +358,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 297.6 - y: 73.6 - width: 413.99997 - height: 450.2 + x: 1906 + y: 73 + width: 517 + height: 590 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -562,7 +562,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 0 - snapOffset: {x: 0, y: 24.8} + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Animation Rigging @@ -578,9 +578,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.56465197, y: 2.0329852, z: -0.022925854} + m_Target: {x: -0.36444837, y: 8.662055, z: 6.1208687} speed: 2 - m_Value: {x: -0.56465197, y: 2.0329852, z: -0.022925854} + m_Value: {x: -0.36444837, y: 8.662055, z: 6.1208687} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -627,17 +627,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.035058174, y: 0.9545344, z: -0.124399066, w: 0.2688129} + m_Target: {x: -0.14265797, y: -0.8023181, z: 0.212259, w: -0.53944343} speed: 2 - m_Value: {x: 0.035056416, y: 0.9544865, z: -0.12439282, w: 0.2687994} + m_Value: {x: -0.1426495, y: -0.8022705, z: 0.21224639, w: -0.5394114} m_Size: - m_Target: 1.0003884 + m_Target: 1.993038 speed: 2 - m_Value: 1.0003884 + m_Value: 1.993038 m_Ortho: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -673,12 +673,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 713.6 + x: 889 y: 0 - width: 457.59998 - height: 471.2 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 575 + height: 611 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} @@ -700,9 +700,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 471.2 - width: 1171.2 - height: 259.8 + y: 611 + width: 1464 + height: 336 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 12} @@ -727,14 +727,14 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 544.8 - width: 1170.2 - height: 238.79999 + x: 1536 + y: 684 + width: 1463 + height: 315 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -764,10 +764,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 165.20001} - m_SelectedIDs: 2a690000 - m_LastClickedID: 26922 - m_ExpandedIDs: 00000000c4640000c6640000c8640000de64000000ca9a3bffffff7f + scrollPos: {x: 0, y: 180} + m_SelectedIDs: 02650000 + m_LastClickedID: 25858 + m_ExpandedIDs: 00000000406300004263000044630000d664000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -795,7 +795,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000c4640000c6640000c864000000ca9a3bffffff7f + m_ExpandedIDs: 00000000406300004263000044630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -867,14 +867,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 544.8 - width: 1170.2 - height: 238.79999 + x: 1536 + y: 684 + width: 1463 + height: 315 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -894,10 +894,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1171.2 + x: 1464 y: 0 - width: 364.80005 - height: 731 + width: 456 + height: 947 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 15} @@ -921,14 +921,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1171.2001 - y: 73.6 - width: 363.80005 - height: 710 + x: 3000 + y: 73 + width: 455 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -940,7 +940,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 756 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 3f8bd50..a573417 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,12 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 - y: 43.2 - width: 1536 - height: 780.8 + x: 1536 + y: 43 + width: 1920 + height: 997 m_ShowMode: 4 - m_Title: Inspector + m_Title: Game m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1536 - height: 781 + width: 1920 + height: 997 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1536 + width: 1920 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 761 - width: 1536 + y: 977 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -114,12 +114,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1536 - height: 731 + width: 1920 + height: 947 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 24963 + controlID: 754 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1171.2 - height: 731 + width: 1464 + height: 947 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 24964 + controlID: 755 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,12 +165,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1171.2 - height: 471.2 + width: 1464 + height: 611 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 24965 + controlID: 756 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -188,10 +188,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 297.6 - height: 471.2 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + width: 370 + height: 611 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -212,10 +212,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 297.6 + x: 370 y: 0 - width: 415.99997 - height: 471.2 + width: 519 + height: 611 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} @@ -239,10 +239,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 713.6 + x: 889 y: 0 - width: 457.59998 - height: 471.2 + width: 575 + height: 611 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} @@ -260,23 +260,23 @@ 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: 471.2 - width: 1171.2 - height: 259.8 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 17} + y: 611 + width: 1464 + height: 336 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 18} m_Panes: - {fileID: 17} - {fileID: 18} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -292,10 +292,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1171.2 + x: 1464 y: 0 - width: 364.80005 - height: 731 + width: 456 + height: 947 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 19} @@ -319,14 +319,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 713.60004 - y: 73.6 - width: 455.59998 - height: 450.2 + x: 2425 + y: 73 + width: 573 + height: 590 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -337,7 +337,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 455.59998, y: 429.2} + m_TargetSize: {x: 573, y: 569} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -352,10 +352,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -182.23999 - m_HBaseRangeMax: 182.23999 - m_VBaseRangeMin: -171.68001 - m_VBaseRangeMax: 171.68001 + m_HBaseRangeMin: -286.5 + m_HBaseRangeMax: 286.5 + m_VBaseRangeMin: -284.5 + m_VBaseRangeMax: 284.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -373,23 +373,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 455.59998 - height: 429.2 - m_Scale: {x: 1.1592739, y: 1.1592739} - m_Translation: {x: 227.79999, y: 214.6} + width: 573 + height: 569 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 286.5, y: 284.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -196.5023 - y: -185.11589 - width: 393.0046 - height: 370.23178 + x: -286.5 + y: -284.5 + width: 573 + height: 569 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 569.5, y: 562.75} + m_LastWindowPixelSize: {x: 573, y: 590} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -411,14 +411,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 73.6 - width: 296.6 - height: 450.2 + x: 1536 + y: 73 + width: 369 + height: 590 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -426,9 +426,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 0ee80000 - m_LastClickedID: 59406 - m_ExpandedIDs: f8c1fcff2ec2fcff32c2fcff36c2fcff56c2fcffd8c2fcfff8e700002ee800004ee8000054e8000060e8000062e8000064e800006ae8000070e80000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: e6d2fdff38d3fdffced5fdff80dcfdffd2dcfdff68dffdff44e7fdff96e7fdff2ceafdffc0f5fdff14f6fdffd0f6fdffc2f7fdffd8f9fdffd0fafdff22fbfdffaafdfdffd4fdfdff8636feffd836feff9437feffb037feff8438feffd638feff5e3bfeff883bfeffc647feff1848feffa04afeffca4afeff9a61feffee61feff7664feffa064feffb66cfeff0a6dfeff926ffeffbc6ffeff2afbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -468,7 +468,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Animator - m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 @@ -532,14 +532,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 297.6 - y: 73.6 - width: 413.99997 - height: 450.2 + x: 1906 + y: 73 + width: 517 + height: 590 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -583,7 +583,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: unity-search-toolbar index: 1 @@ -616,7 +616,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Light Settings index: 0 @@ -626,7 +626,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 0 - snapOffset: {x: 0, y: 24.8} + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Camera @@ -638,7 +638,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Cloth Constraints index: 2 @@ -649,7 +649,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Cloth Collisions index: 3 @@ -660,7 +660,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Navmesh Display index: 4 @@ -671,7 +671,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Agent Display index: 5 @@ -682,7 +682,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Obstacle Display index: 6 @@ -693,7 +693,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Occlusion Culling index: 7 @@ -704,7 +704,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Physics Debugger index: 8 @@ -715,7 +715,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Scene Visibility index: 9 @@ -726,7 +726,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Particles index: 10 @@ -735,8 +735,8 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 24.8} + displayed: 0 + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Animation Rigging @@ -744,7 +744,7 @@ MonoBehaviour: layout: 4 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 0 - m_OverrideSceneCullingMask: 0 + m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 0 m_SceneLighting: 1 m_2DMode: 0 @@ -752,9 +752,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.076223016, y: 3.9235106, z: 0.32627058} + m_Target: {x: -0.36444837, y: 8.662055, z: 6.1208687} speed: 2 - m_Value: {x: -0.56465197, y: 2.0329852, z: -0.022925854} + m_Value: {x: -0.36444837, y: 8.662055, z: 6.1208687} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -766,7 +766,7 @@ MonoBehaviour: m_SceneViewState: m_AlwaysRefresh: 0 showFog: 1 - showSkybox: 0 + showSkybox: 1 showFlares: 1 showImageEffects: 1 showParticleSystems: 1 @@ -801,17 +801,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.06845912, y: -0.65953904, z: 0.06051697, w: 0.74609524} + m_Target: {x: -0.14265797, y: -0.8023181, z: 0.212259, w: -0.53944343} speed: 2 - m_Value: {x: 0.035056416, y: 0.9544865, z: -0.12439282, w: 0.2687994} + m_Value: {x: -0.1426495, y: -0.8022705, z: 0.21224639, w: -0.5394114} m_Size: - m_Target: 0.3056236 + m_Target: 3.234408 speed: 2 - m_Value: 1.0003884 + m_Value: 3.234408 m_Ortho: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -848,14 +848,14 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 544.8 - width: 1170.2 - height: 238.79999 + x: 1536 + y: 684 + width: 1463 + height: 315 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -873,22 +873,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Prefabs/Player + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Prefabs/Player + - Assets/Scenes m_LastFoldersGridSize: -1 m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 165.20001} - m_SelectedIDs: 2a690000 - m_LastClickedID: 26922 - m_ExpandedIDs: 00000000c4640000c6640000c8640000de64000000ca9a3bffffff7f + scrollPos: {x: 0, y: 120} + m_SelectedIDs: d8640000 + m_LastClickedID: 25816 + m_ExpandedIDs: 00000000406300004263000044630000d4640000d664000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -916,7 +916,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000c4640000c6640000c864000000ca9a3bffffff7f + m_ExpandedIDs: 0000000040630000426300004463000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -988,14 +988,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 544.8 - width: 1170.2 - height: 238.79999 + x: 1536 + y: 684 + width: 1463 + height: 315 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1016,14 +1016,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1171.2001 - y: 73.6 - width: 363.80005 - height: 710 + x: 3000 + y: 73 + width: 455 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1035,7 +1035,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 987.6001 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: