From 2f530971c0719594a2525eac9f05781f69edfeb5 Mon Sep 17 00:00:00 2001 From: juliuse98 Date: Thu, 11 Nov 2021 09:08:18 +0100 Subject: [PATCH] Fuck nothing works --- Assets/Prefabs/Networing/GameManager.prefab | 4 +- .../Player/Player Animation Test.prefab | 95 +- Assets/Prefabs/Player/Player.prefab | 47 +- Assets/Prefabs/Player/Simple.prefab | 1501 +++++++++++++++++ Assets/Prefabs/Player/Simple.prefab.meta | 7 + Assets/Prefabs/Player/SimplePlayer.prefab | 834 +++++++++ .../Prefabs/Player/SimplePlayer.prefab.meta | 7 + Assets/Scenes/Animation Test.unity | 2 +- Assets/Scenes/TestScene.unity | 302 +++- Assets/Scripts/GunAnimation.cs | 8 + Assets/Scripts/GunAnimation.cs.meta | 11 + Assets/Scripts/Player/AimDownSights.cs | 3 +- Assets/Scripts/Player/Headbob.cs | 6 +- Assets/Scripts/Player/PlayerController.cs | 20 +- Assets/Scripts/Player/PlayerMouseLook.cs | 5 +- .../Scripts/ProcedualAnimationController.cs | 252 +++ .../ProcedualAnimationController.cs.meta | 11 + Assets/Scripts/Weapons/Shoot.cs | 7 +- Assets/Scripts/Weapons/ShootAnimation.cs | 6 +- Assets/Scripts/oneVsOneStateMashine.cs | 41 + Assets/Scripts/oneVsOneStateMashine.cs.meta | 11 + .../BurstAotSettings_StandaloneWindows.json | 17 + ProjectSettings/CommonBurstAotSettings.json | 6 + ProjectSettings/EditorBuildSettings.asset | 5 +- ProjectSettings/GraphicsSettings.asset | 29 +- UserSettings/EditorUserSettings.asset | 4 +- .../Layouts/CurrentMaximizeLayout.dwlt | 108 +- UserSettings/Layouts/default-2021.dwlt | 154 +- 28 files changed, 3198 insertions(+), 305 deletions(-) create mode 100644 Assets/Prefabs/Player/Simple.prefab create mode 100644 Assets/Prefabs/Player/Simple.prefab.meta create mode 100644 Assets/Prefabs/Player/SimplePlayer.prefab create mode 100644 Assets/Prefabs/Player/SimplePlayer.prefab.meta create mode 100644 Assets/Scripts/GunAnimation.cs create mode 100644 Assets/Scripts/GunAnimation.cs.meta create mode 100644 Assets/Scripts/ProcedualAnimationController.cs create mode 100644 Assets/Scripts/ProcedualAnimationController.cs.meta create mode 100644 Assets/Scripts/oneVsOneStateMashine.cs create mode 100644 Assets/Scripts/oneVsOneStateMashine.cs.meta create mode 100644 ProjectSettings/BurstAotSettings_StandaloneWindows.json create mode 100644 ProjectSettings/CommonBurstAotSettings.json diff --git a/Assets/Prefabs/Networing/GameManager.prefab b/Assets/Prefabs/Networing/GameManager.prefab index b680e5d..c7aed75 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/Animation Test.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/Player Animation Test.prefab b/Assets/Prefabs/Player/Player Animation Test.prefab index e02839c..b25205f 100644 --- a/Assets/Prefabs/Player/Player Animation Test.prefab +++ b/Assets/Prefabs/Player/Player Animation Test.prefab @@ -160,6 +160,37 @@ MonoBehaviour: m_EditorClassIdentifier: m_Weight: 1 m_Effectors: [] +--- !u!1 &262914557815200868 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3274256442936289830} + m_Layer: 0 + m_Name: Muzzle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3274256442936289830 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 262914557815200868} + 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: 6272346181657429396} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1122453500918594702 GameObject: m_ObjectHideFlags: 0 @@ -348,38 +379,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6272346181657429396} - m_RootOrder: 3 - 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_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2425026116520232903 MonoBehaviour: @@ -579,7 +579,6 @@ GameObject: - component: {fileID: 320375778840406984} - component: {fileID: -4574526707603160507} - component: {fileID: 7273209952621479910} - - component: {fileID: 4959463831902427506} - component: {fileID: 5630859218361338035} - component: {fileID: 8436279266335313624} - component: {fileID: 268368477457052331} @@ -725,22 +724,6 @@ MonoBehaviour: 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} --- !u!114 &5630859218361338035 MonoBehaviour: m_ObjectHideFlags: 0 @@ -790,7 +773,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: @@ -821,7 +804,7 @@ MonoBehaviour: m_EditorClassIdentifier: syncMode: 0 syncInterval: 0.1 - muzzle: {fileID: 3649358604728444914} + muzzle: {fileID: 262914557815200868} shootAnim: {fileID: 4276885029697240453} fireRate: 320 gunHoldPos: {fileID: 3682030003239559187} @@ -990,7 +973,7 @@ GameObject: - component: {fileID: 7087117678379852523} m_Layer: 0 m_Name: Camera - m_TagString: MainCamera + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1007,10 +990,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5021921342190399731} - {fileID: 4074665071222326704} - {fileID: 1979435770070801855} - {fileID: 1468248131875751636} + - {fileID: 3274256442936289830} m_Father: {fileID: 981273033772084037} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1021,7 +1004,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} @@ -1132,7 +1115,7 @@ Transform: - {fileID: 6035287771982183217} - {fileID: 3087782655464804516} m_Father: {fileID: 6272346181657429396} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &909517976577723968 MonoBehaviour: @@ -1330,7 +1313,7 @@ Transform: 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 PrefabInstance: diff --git a/Assets/Prefabs/Player/Player.prefab b/Assets/Prefabs/Player/Player.prefab index 4f25b88..ab61ca3 100644 --- a/Assets/Prefabs/Player/Player.prefab +++ b/Assets/Prefabs/Player/Player.prefab @@ -300,7 +300,6 @@ GameObject: - component: {fileID: 320375778840406984} - component: {fileID: -4574526707603160507} - component: {fileID: 7273209952621479910} - - component: {fileID: 4959463831902427506} - component: {fileID: 5630859218361338035} - component: {fileID: 8436279266335313624} - component: {fileID: 268368477457052331} @@ -342,7 +341,7 @@ CapsuleCollider: m_GameObject: {fileID: 6272346181302961293} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 m_Radius: 0.3 m_Height: 1.8 m_Direction: 1 @@ -356,7 +355,7 @@ CharacterController: m_GameObject: {fileID: 6272346181302961293} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 m_Height: 1.8 m_Radius: 0.3 @@ -389,18 +388,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 + procedualAnimationController: {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 @@ -409,6 +411,7 @@ MonoBehaviour: moveGroundAngle: 0 isGrounded: 0 isSprinting: 0 + velocity: {x: 0, y: 0, z: 0} --- !u!114 &7273209952621479910 MonoBehaviour: m_ObjectHideFlags: 0 @@ -438,22 +441,6 @@ MonoBehaviour: 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: 8824871639981994016} --- !u!114 &5630859218361338035 MonoBehaviour: m_ObjectHideFlags: 0 @@ -461,7 +448,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 +461,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 +471,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 +490,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 +498,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 +514,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 +522,9 @@ MonoBehaviour: syncMode: 0 syncInterval: 0.1 muzzle: {fileID: 3649358604728444914} + procedualAnimationController: {fileID: 0} + fireRate: 0 + gunHoldPos: {fileID: 0} --- !u!114 &6207632454083444980 MonoBehaviour: m_ObjectHideFlags: 0 @@ -539,7 +532,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: 734b48bea0b204338958ee3d885e11f0, type: 3} m_Name: @@ -569,7 +562,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: 734b48bea0b204338958ee3d885e11f0, type: 3} m_Name: diff --git a/Assets/Prefabs/Player/Simple.prefab b/Assets/Prefabs/Player/Simple.prefab new file mode 100644 index 0000000..18cd73e --- /dev/null +++ b/Assets/Prefabs/Player/Simple.prefab @@ -0,0 +1,1501 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &65959152 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 65959153} + - component: {fileID: 291279326086681984} + m_Layer: 0 + m_Name: LeftHand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &65959153 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 65959152} + 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: 1197111049} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &291279326086681984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 65959152} + 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: 8334588817950881727} + m_Mid: {fileID: 5739201115059209923} + m_Tip: {fileID: 1706812538552309319} + m_Target: {fileID: 2781132594439880980} + m_Hint: {fileID: 0} + m_TargetPositionWeight: 1 + m_TargetRotationWeight: 1 + m_HintWeight: 1 + m_MaintainTargetPositionOffset: 0 + m_MaintainTargetRotationOffset: 0 +--- !u!1 &357599823 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 357599824} + - component: {fileID: 357599825} + m_Layer: 0 + m_Name: RightHand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &357599824 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 357599823} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} + m_LocalPosition: {x: 0.023, y: -0.035, z: -0.066} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1197111049} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} +--- !u!114 &357599825 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 357599823} + 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: 9127245645273413481} + m_Mid: {fileID: 8862008152122197222} + m_Tip: {fileID: 8703533484509679896} + m_Target: {fileID: 9064841067161443684} + m_Hint: {fileID: 0} + m_TargetPositionWeight: 1 + m_TargetRotationWeight: 1 + m_HintWeight: 1 + m_MaintainTargetPositionOffset: 0 + m_MaintainTargetRotationOffset: 0 +--- !u!1 &1197111048 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1197111049} + - component: {fileID: 8865635171929772803} + m_Layer: 0 + m_Name: RigLayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1197111049 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1197111048} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.754, z: 0.4} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 357599824} + - {fileID: 65959153} + m_Father: {fileID: 6272346181302961296} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8865635171929772803 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1197111048} + 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 &262914557815200868 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3274256442936289830} + m_Layer: 0 + m_Name: Muzzle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3274256442936289830 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 262914557815200868} + 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: 6272346181657429396} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1122453500918594702 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6035287771982183217} + - component: {fileID: 562931964943938264} + - component: {fileID: 7322695044511352809} + - component: {fileID: 492736715721067422} + m_Layer: 0 + m_Name: Mid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &6035287771982183217 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1122453500918594702} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4074665071222326704} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &562931964943938264 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1122453500918594702} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &7322695044511352809 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1122453500918594702} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!135 &492736715721067422 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1122453500918594702} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + 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 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1468248131875751636} + m_Layer: 0 + m_Name: GunAimPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1468248131875751636 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 143130705316628039} + m_RootOrder: 1 + 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 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5844730607706440515} + - component: {fileID: 763023871062575730} + - component: {fileID: 3585047559268765858} + m_Layer: 0 + m_Name: PlayerNameText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5844730607706440515 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4824770690127859843} + 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: 6272346181302961296} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 2.8} + m_SizeDelta: {x: 20, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &763023871062575730 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4824770690127859843} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &3585047559268765858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4824770690127859843} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Username + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4293783039 + m_fontColor: {r: 1, g: 0.9283019, b: 0.9283019, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 763023871062575730} + m_maskType: 0 +--- !u!1 &6272346181302961293 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6272346181302961296} + - component: {fileID: 8191616764201741429} + - component: {fileID: 6272346181302961295} + - component: {fileID: -4574526707603160507} + - component: {fileID: 5630859218361338035} + - component: {fileID: 9092900273511842578} + - component: {fileID: 8436279266335313624} + - component: {fileID: 3781802212159559521} + - component: {fileID: 8957579265169979397} + - component: {fileID: 3965891812990671158} + - component: {fileID: 320375778840406984} + - component: {fileID: 7273209952621479910} + - component: {fileID: 6207632454083444980} + - component: {fileID: 1509131218531316230} + m_Layer: 0 + m_Name: Simple + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6272346181302961296 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + 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: 5844730607706440515} + - {fileID: 6272346182417644039} + - {fileID: 981273033772084037} + - {fileID: 1197111049} + - {fileID: 5767109144009335573} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &8191616764201741429 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + m_Radius: 0.3 + m_Height: 1.8 + m_Direction: 1 + m_Center: {x: 0, y: 1, z: 0} +--- !u!143 &6272346181302961295 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 2 + m_Height: 1.8 + m_Radius: 0.3 + m_SlopeLimit: 45 + m_StepOffset: 0.2 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: 1, z: 0} +--- !u!114 &-4574526707603160507 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 124e7dc536a7de8418284dc873cb1bb2, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + procedualAnimationController: {fileID: 9092900273511842578} + 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 + m_Bits: 64 + groundAngle: 0 + moveGroundAngle: 0 + isGrounded: 0 + isSprinting: 0 + velocity: {x: 0, y: 0, z: 0} +--- !u!114 &5630859218361338035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a8493f0e2b0d4bd4f98d3cd81c2db5ad, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + playerCamera: {fileID: 6272346181657429396} + playerNeck: {fileID: 981273033772084037} + mouseSensitivity: 4 + maxCameraAngle: 90 + neckStartAngle: 0 + minCameraAngle: -90 + mouseSmoothTime: 0.001 + lockCursor: 1 + fullPitch: 0 +--- !u!114 &9092900273511842578 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9bd09d0992070b049b461b56fd022956, type: 3} + m_Name: + m_EditorClassIdentifier: + stepAmplitudeWalking: 0.05 + stepAmplitudeSprinting: 0.07 + stepFrequency: 0.25 + playerController: {fileID: -4574526707603160507} + gun: {fileID: 3682030003239559187} + gunHolder: {fileID: 8085885192528747055} + positionRecoil: 1 + rotationRecoil: 1 + positionMultX: 25 + positionMultY: 25 + positionMultZ: 25 + playerMouseLook: {fileID: 5630859218361338035} + cameraRecoilX: 0.1 + cameraRecoilY: 0.1 + rotX: 0 + rotationMultX: 25 + rotationOffsetX: 0.1 + rotY: 0 + rotationMultY: 25 + rotZ: 0 + rotationMultZ: 15 + sideSwey: 1 + sweyMultX: 1.2 + sweyMultY: 0 + sweyMultZ: 0 + sweyWhileAim: 0.1 + returnForce: 0.006 + impulsForce: 0.025 + maxRecoil: 0.1 + aimSpeed: 0.09 + aimVal: 0 + AimPoint: {fileID: 2992488853448454767} + HoldPoint: {fileID: 8043317747957554736} + isAiming: 0 +--- !u!114 &8436279266335313624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3317f24e780855847830f5662153b41d, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + isAlive: 1 + clientId: 0 + username: + usernameTextObj: {fileID: 0} + health: 0 +--- !u!114 &3781802212159559521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bc5bc2b49bd326e4db460a6a3af59311, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + muzzle: {fileID: 262914557815200868} + procedualAnimationController: {fileID: 9092900273511842578} + fireRate: 320 + gunHoldPos: {fileID: 3682030003239559187} +--- !u!95 &8957579265169979397 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + m_Enabled: 0 + 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 &3965891812990671158 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fff0960ef4ea6e04eac66b4a7fd2189d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RigLayers: + - m_Rig: {fileID: 8865635171929772803} + m_Active: 1 + m_Effectors: [] +--- !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: 3f7cf7975c7f1fd4b85f83ef8ffb6df5 + 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 + 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: 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: 6272346181657429396} +--- !u!114 &1509131218531316230 +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: 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: 981273033772084037} +--- !u!1 &6272346181657429393 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6272346181657429396} + - component: {fileID: 6272346181657429395} + - component: {fileID: 7087117678379852523} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6272346181657429396 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181657429393} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.15, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4074665071222326704} + - {fileID: 3274256442936289830} + m_Father: {fileID: 981273033772084037} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &6272346181657429395 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181657429393} + m_Enabled: 0 + 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.1 + far clip plane: 1000 + field of view: 61.4 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + 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!114 &7087117678379852523 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181657429393} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &6272346182417644038 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6272346182417644039} + m_Layer: 0 + m_Name: GrounCheck + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6272346182417644039 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346182417644038} + 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: 6272346181302961296} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6522444664664986769 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4074665071222326704} + - component: {fileID: 909517976577723968} + m_Layer: 0 + m_Name: GunHolster + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4074665071222326704 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6522444664664986769} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.4} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6035287771982183217} + - {fileID: 143130705316628039} + m_Father: {fileID: 6272346181657429396} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &909517976577723968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6522444664664986769} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!95 &1978909962 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6576156620079053231} + 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 &7061967201775281134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 981273033772084037} + - component: {fileID: 1345655087433563259} + m_Layer: 0 + m_Name: neck + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &981273033772084037 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7061967201775281134} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.66, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6272346181657429396} + m_Father: {fileID: 6272346181302961296} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1345655087433563259 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7061967201775281134} + 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 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1979435770070801855} + m_Layer: 0 + m_Name: GunHoldPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1979435770070801855 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8043317747957554736} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.171, y: -0.11599997, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 143130705316628039} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8085885192528747055 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 143130705316628039} + - component: {fileID: 2080742862875905254} + m_Layer: 0 + m_Name: M92 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &143130705316628039 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8085885192528747055} + 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} + - {fileID: 1468248131875751636} + - {fileID: 1979435770070801855} + m_Father: {fileID: 4074665071222326704} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2080742862875905254 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8085885192528747055} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &4600527171543473474 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 143130705316628039} + 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.05399993 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + propertyPath: m_LocalPosition.z + value: -0.09 + 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 &3682030003239559187 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + m_PrefabInstance: {fileID: 4600527171543473474} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4058555163434875561 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + m_PrefabInstance: {fileID: 4600527171543473474} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6305701708507383038 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6272346181302961296} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_RootOrder + value: 4 + 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.1 + 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: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.w + value: 0.49762654 + objectReference: {fileID: 0} + - target: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.x + value: 0.38611406 + objectReference: {fileID: 0} + - target: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.y + value: 0.48171118 + objectReference: {fileID: 0} + - target: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.z + value: 0.6092931 + objectReference: {fileID: 0} + - target: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.w + value: 0.61689305 + objectReference: {fileID: 0} + - target: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7642766 + objectReference: {fileID: 0} + - target: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.y + value: 0.054038968 + objectReference: {fileID: 0} + - target: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.z + value: -0.18001123 + objectReference: {fileID: 0} + - target: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.w + value: 0.6961632 + objectReference: {fileID: 0} + - target: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.x + value: -0.65890896 + objectReference: {fileID: 0} + - target: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.y + value: 0.012771013 + objectReference: {fileID: 0} + - target: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.z + value: 0.28466272 + objectReference: {fileID: 0} + - target: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.w + value: 0.70013154 + objectReference: {fileID: 0} + - target: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.x + value: -0.65287465 + objectReference: {fileID: 0} + - target: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.y + value: -0.017168809 + objectReference: {fileID: 0} + - target: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.z + value: -0.28857565 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_Name + value: Human without head + objectReference: {fileID: 0} + - target: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.w + value: 0.60796833 + objectReference: {fileID: 0} + - target: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.x + value: 0.77107567 + objectReference: {fileID: 0} + - target: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.y + value: -0.053257264 + objectReference: {fileID: 0} + - target: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.z + value: 0.18160523 + objectReference: {fileID: 0} + - target: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.w + value: 0.4907069 + objectReference: {fileID: 0} + - target: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.x + value: 0.3937783 + objectReference: {fileID: 0} + - target: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.y + value: -0.49410808 + objectReference: {fileID: 0} + - target: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3} + propertyPath: m_LocalRotation.z + value: -0.6000021 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 01316cb596562384da845bc519fb90de, type: 3} +--- !u!1 &6576156620079053231 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, 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} + m_PrefabInstance: {fileID: 6305701708507383038} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5739201115059209923 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 6305701708507383038} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1706812538552309319 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 6305701708507383038} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9127245645273413481 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 6305701708507383038} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8862008152122197222 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 6305701708507383038} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8703533484509679896 stripped +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/Simple.prefab.meta b/Assets/Prefabs/Player/Simple.prefab.meta new file mode 100644 index 0000000..a2e65d5 --- /dev/null +++ b/Assets/Prefabs/Player/Simple.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3f7cf7975c7f1fd4b85f83ef8ffb6df5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player/SimplePlayer.prefab b/Assets/Prefabs/Player/SimplePlayer.prefab new file mode 100644 index 0000000..cd764c6 --- /dev/null +++ b/Assets/Prefabs/Player/SimplePlayer.prefab @@ -0,0 +1,834 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &681358948229890261 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4399039561386292163} + - component: {fileID: 2732428023354893519} + - component: {fileID: 3713494182464178449} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4399039561386292163 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 681358948229890261} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.5799999, z: 0.27} + m_LocalScale: {x: 0.8, y: 0.2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 981273033772084037} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2732428023354893519 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 681358948229890261} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3713494182464178449 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 681358948229890261} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 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!1 &4824770690127859843 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5844730607706440515} + - component: {fileID: 763023871062575730} + - component: {fileID: 3585047559268765858} + m_Layer: 0 + m_Name: PlayerNameText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5844730607706440515 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4824770690127859843} + 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: 6272346181302961296} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 2.8} + m_SizeDelta: {x: 20, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &763023871062575730 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4824770690127859843} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &3585047559268765858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4824770690127859843} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Username + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4293783039 + m_fontColor: {r: 1, g: 0.9283019, b: 0.9283019, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 763023871062575730} + m_maskType: 0 +--- !u!1 &6272346181302961293 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6272346181302961296} + - component: {fileID: 8191616764201741429} + - component: {fileID: 6272346181302961295} + - component: {fileID: 320375778840406984} + - component: {fileID: 7273209952621479910} + - component: {fileID: 6207632454083444980} + - component: {fileID: 1509131218531316230} + - component: {fileID: -4574526707603160507} + - component: {fileID: 5630859218361338035} + - component: {fileID: 8436279266335313624} + - component: {fileID: 3781802212159559521} + - component: {fileID: 1237930917963415626} + m_Layer: 0 + m_Name: SimplePlayer + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6272346181302961296 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + 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: 5844730607706440515} + - {fileID: 2458562619286483438} + - {fileID: 6272346182417644039} + - {fileID: 981273033772084037} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &8191616764201741429 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + 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: 1, z: 0} +--- !u!143 &6272346181302961295 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + 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.2 + 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: 3541b5a33e1ce8741a2565aee576726f + 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 + 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: 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: 6272346181657429396} +--- !u!114 &1509131218531316230 +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: 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: 981273033772084037} +--- !u!114 &-4574526707603160507 +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: 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 + m_Bits: 64 + groundAngle: 0 + moveGroundAngle: 0 + isGrounded: 0 + isSprinting: 0 + velocity: {x: 0, y: 0, z: 0} +--- !u!114 &5630859218361338035 +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: a8493f0e2b0d4bd4f98d3cd81c2db5ad, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + playerCamera: {fileID: 6272346181657429396} + playerNeck: {fileID: 981273033772084037} + mouseSensitivity: 4 + maxCameraAngle: 90 + neckStartAngle: 0 + minCameraAngle: -90 + mouseSmoothTime: 0.001 + lockCursor: 1 + fullPitch: 0 +--- !u!114 &8436279266335313624 +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: 3317f24e780855847830f5662153b41d, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + isAlive: 1 + clientId: 0 + username: + usernameTextObj: {fileID: 0} + health: 0 +--- !u!114 &3781802212159559521 +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: bc5bc2b49bd326e4db460a6a3af59311, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + muzzle: {fileID: 3649358604728444914} + shootAnim: {fileID: 0} + fireRate: 0 + gunHoldPos: {fileID: 0} +--- !u!114 &1237930917963415626 +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: 9bd09d0992070b049b461b56fd022956, type: 3} + m_Name: + m_EditorClassIdentifier: + stepAmplitude: 0.1 + stepFrequency: 0.1 + playerController: {fileID: -4574526707603160507} + gun: {fileID: 0} + gunHolder: {fileID: 0} + gunPositionObj: {fileID: 0} + gunRotationObj: {fileID: 0} + positionRecoil: 1 + rotationRecoil: 1 + positionMultX: 25 + positionMultY: 25 + positionMultZ: 25 + playerMouseLook: {fileID: 0} + cameraRecoilX: 0.1 + cameraRecoilY: 0.1 + rotX: 1 + rotationMultX: 25 + rotationOffsetX: 0.1 + rotY: 1 + rotationMultY: 25 + rotZ: 1 + rotationMultZ: 15 + ADSController: {fileID: 0} + 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: 0} + HoldPoint: {fileID: 0} + isAiming: 0 +--- !u!1 &6272346181657429393 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6272346181657429396} + - component: {fileID: 6272346181657429395} + m_Layer: 0 + m_Name: Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &6272346181657429396 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181657429393} + 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: 5021921342190399731} + m_Father: {fileID: 981273033772084037} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &6272346181657429395 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181657429393} + 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.1 + far clip plane: 1000 + field of view: 61.4 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + 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!1 &6272346182417644038 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6272346182417644039} + m_Layer: 0 + m_Name: GrounCheck + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6272346182417644039 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346182417644038} + 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: 6272346181302961296} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7061967201775281134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 981273033772084037} + m_Layer: 0 + m_Name: neck + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &981273033772084037 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7061967201775281134} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 2.01, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4399039561386292163} + - {fileID: 6272346181657429396} + m_Father: {fileID: 6272346181302961296} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8690889598169456425 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2458562619286483438} + - component: {fileID: 390397068222218691} + - component: {fileID: 8824871639981994016} + m_Layer: 0 + m_Name: Capsule + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2458562619286483438 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8690889598169456425} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6272346181302961296} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &390397068222218691 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8690889598169456425} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8824871639981994016 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8690889598169456425} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Prefabs/Player/SimplePlayer.prefab.meta b/Assets/Prefabs/Player/SimplePlayer.prefab.meta new file mode 100644 index 0000000..e0380fb --- /dev/null +++ b/Assets/Prefabs/Player/SimplePlayer.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3541b5a33e1ce8741a2565aee576726f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Animation Test.unity b/Assets/Scenes/Animation Test.unity index 466d1a5..52e5569 100644 --- a/Assets/Scenes/Animation Test.unity +++ b/Assets/Scenes/Animation Test.unity @@ -509,7 +509,7 @@ PrefabInstance: - target: {fileID: 3094132477016057847, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} propertyPath: playerPrefab value: - objectReference: {fileID: 6272346181302961293, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} + objectReference: {fileID: 6272346181302961293, guid: 2935eead9a075fd489d6a6dc273a5999, type: 3} - target: {fileID: 3422988367618467032, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} propertyPath: m_Name value: GameManager diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity index 763a98d..efb57b7 100644 --- a/Assets/Scenes/TestScene.unity +++ b/Assets/Scenes/TestScene.unity @@ -296,63 +296,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -5053925668127403250, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3} ---- !u!1001 &419161482 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3422988367618467032, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} - propertyPath: m_Name - value: GameManager - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} --- !u!1 &450235891 stripped GameObject: m_CorrespondingSourceObject: {fileID: -466329591000292508, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3} @@ -809,6 +752,106 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -1550514412580984892, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3} +--- !u!1 &1522709780 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1522709783} + - component: {fileID: 1522709782} + - component: {fileID: 1522709781} + - component: {fileID: 1522709784} + m_Layer: 0 + m_Name: GAmeMAnager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1522709781 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1522709780} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b0fecffa3f624585964b0d0eb21b18e, type: 3} + m_Name: + m_EditorClassIdentifier: + Port: 7777 + DualMode: 1 + NoDelay: 1 + Interval: 10 + Timeout: 10000 + FastResend: 2 + CongestionWindow: 0 + SendWindowSize: 4096 + ReceiveWindowSize: 4096 + NonAlloc: 1 + debugLog: 0 + statisticsGUI: 0 + statisticsLog: 0 +--- !u!114 &1522709782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1522709780} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8aab4c8111b7c411b9b92cf3dbc5bd4e, type: 3} + m_Name: + m_EditorClassIdentifier: + dontDestroyOnLoad: 1 + PersistNetworkManagerToOfflineScene: 0 + runInBackground: 1 + autoStartServerBuild: 1 + serverTickRate: 30 + offlineScene: Assets/Scenes/TestScene.unity + onlineScene: Assets/Scenes/TestScene.unity + transport: {fileID: 1522709781} + networkAddress: localhost + maxConnections: 100 + authenticator: {fileID: 0} + playerPrefab: {fileID: 6272346181302961293, guid: 2935eead9a075fd489d6a6dc273a5999, type: 3} + autoCreatePlayer: 1 + playerSpawnMethod: 0 + spawnPrefabs: [] +--- !u!4 &1522709783 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1522709780} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.829927, y: 3.087294, z: -2.2434301} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1522709784 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1522709780} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6442dc8070ceb41f094e44de0bf87274, type: 3} + m_Name: + m_EditorClassIdentifier: + offsetX: 0 + offsetY: 0 --- !u!1 &1683546023 stripped GameObject: m_CorrespondingSourceObject: {fileID: -7146521406498821007, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3} @@ -847,6 +890,151 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 8552134717624371188, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3} +--- !u!1 &1897169340 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1897169346} + - component: {fileID: 1897169345} + - component: {fileID: 1897169344} + - component: {fileID: 1897169343} + - component: {fileID: 1897169342} + - component: {fileID: 1897169341} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1897169341 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897169340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2f74aedd71d9a4f55b3ce499326d45fb, 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} +--- !u!114 &1897169342 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897169340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} + m_Name: + m_EditorClassIdentifier: + sceneId: 399861529 + serverOnly: 0 + visible: 0 + m_AssetId: + hasSpawned: 0 +--- !u!65 &1897169343 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897169340} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1897169344 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897169340} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1897169345 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897169340} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1897169346 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897169340} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.829927, y: 3.087294, z: -2.2434301} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2119583729 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GunAnimation.cs b/Assets/Scripts/GunAnimation.cs new file mode 100644 index 0000000..f4d2f06 --- /dev/null +++ b/Assets/Scripts/GunAnimation.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class GunAnimation : MonoBehaviour +{ + +} diff --git a/Assets/Scripts/GunAnimation.cs.meta b/Assets/Scripts/GunAnimation.cs.meta new file mode 100644 index 0000000..7c82b5b --- /dev/null +++ b/Assets/Scripts/GunAnimation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 82030fec4af8e374d9557a5aa0885d96 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/AimDownSights.cs b/Assets/Scripts/Player/AimDownSights.cs index 6a5da19..5df310c 100644 --- a/Assets/Scripts/Player/AimDownSights.cs +++ b/Assets/Scripts/Player/AimDownSights.cs @@ -10,10 +10,9 @@ public class AimDownSights : MonoBehaviour [SerializeField] GameObject AimPoint; [SerializeField] GameObject HoldPoint; public bool isAiming = false; - bool ADS() + private void Update() { - return true; } private void FixedUpdate() { diff --git a/Assets/Scripts/Player/Headbob.cs b/Assets/Scripts/Player/Headbob.cs index 49cd66c..ec1862b 100644 --- a/Assets/Scripts/Player/Headbob.cs +++ b/Assets/Scripts/Player/Headbob.cs @@ -69,10 +69,10 @@ public class Headbob : NetworkBehaviour } } - - private float getSin(float multiplier, float devisor,float x) + //check + private float getSin(float amplitude, float frequency,float x) { - return multiplier * Mathf.Sin((x/3.14f) * 10 * devisor); + return amplitude * Mathf.Sin((x/3.14f) * 10 * frequency); } } diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index 48ab828..7ccffe4 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; @@ -33,10 +33,11 @@ public class PlayerController : NetworkBehaviour private float movementSpeed; private float velocityY = 0.0f; private CharacterController controller; - + Vector3 currentPos = Vector3.zero; private Vector3 currentDir = Vector3.zero; private Vector3 currentDirVelocity = Vector3.zero; - private Vector3 velocity = Vector3.zero; + public Vector3 velocity = Vector3.zero; + Vector3 refVelocity = Vector3.zero; private void Start() @@ -53,7 +54,6 @@ public class PlayerController : NetworkBehaviour Grounded(); CheckGoundAngle(); UpdateMovement(); - } } @@ -65,8 +65,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,14 +101,14 @@ 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; } @@ -145,9 +145,7 @@ 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.1f); controller.Move(velocity * Time.deltaTime); } diff --git a/Assets/Scripts/Player/PlayerMouseLook.cs b/Assets/Scripts/Player/PlayerMouseLook.cs index 55dc01a..ba6d7f6 100644 --- a/Assets/Scripts/Player/PlayerMouseLook.cs +++ b/Assets/Scripts/Player/PlayerMouseLook.cs @@ -27,15 +27,13 @@ public class PlayerMouseLook : NetworkBehaviour private Vector2 currentMouseDelta = Vector2.zero; private Vector2 currentMouseDeltaVelocity = Vector2.zero; - - private void Start() { if (isLocalPlayer) { controller = GetComponent(); + playerCamera.gameObject.GetComponent().enabled = true; - playerCamera.gameObject.SetActive(true); neckLength = Vector3.Distance(playerNeck.position,playerCamera.position); if (lockCursor) @@ -74,6 +72,7 @@ public class PlayerMouseLook : NetworkBehaviour } + playerCamera.position = playerNeck.position; playerCamera.position += playerNeck.up * neckLength; diff --git a/Assets/Scripts/ProcedualAnimationController.cs b/Assets/Scripts/ProcedualAnimationController.cs new file mode 100644 index 0000000..3f0836f --- /dev/null +++ b/Assets/Scripts/ProcedualAnimationController.cs @@ -0,0 +1,252 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ProcedualAnimationController : MonoBehaviour +{ + + [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; + + [SerializeField] private PlayerController playerController; + [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; + + + public void OnSwitchWeapon(float fireRate) + { + //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) + { + //Play the animation + gunAnimator.Play("Shoot"); + //Add force for the recoil + recoilCounter++; + Debug.Log("shoots"); + //playerMouseLook.fullPitch -= cameraRecoilX * Mathf.PerlinNoise(Time.time * 3f + 10f, 1f); //WORK IN PROGRESS + //transform.Rotate(Vector3.up * ((Mathf.PerlinNoise(Time.time * 1f + 10f, 1f) - 0.5f) * 2f) * cameraRecoilY); //WORK IN PROGRESS + + } + + void Update() + { + /*-----Aiming-----*/ + if (Input.GetButton("Aim")) isAiming = true; + else isAiming = false; + } + private void FixedUpdate() + { + /*-----Recoil-----*/ + 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); + Vector3[] positionMod = new Vector3[3]; + Quaternion[] rotationMod = new Quaternion[3]; + + + /*-----Position Recoil-----*/ + if (positionRecoil) + { + float deltaX = positionMultX * weightedPerlinNoise(recoilOffset, 1f, Time.time, 1f, 0.5f); + float deltaY = positionMultY * weightedPerlinNoise(recoilOffset, 1f, Time.time, 2f, 0.5f); + float deltaZ = positionMultZ * weightedPerlinNoise(recoilOffset, 1f, Time.time, 3f, 0.5f); + //Debug.Log(" X: " + deltaX + " Y: " + deltaY + " Z: " + deltaZ); + positionMod[0] = new Vector3(deltaX, deltaY, deltaZ); + } + + /*-----Rotation Recoil-----*/ + if (rotationRecoil) + { + float deltaX = rotationMultX * weightedPerlinNoise(recoilOffset, 1f, Time.time, 1f, 0.5f); + float deltaY = rotationMultY * weightedPerlinNoise(recoilOffset, 1f, Time.time, 1f, 0.5f); + float deltaZ = rotationMultZ * weightedPerlinNoise(recoilOffset, 1f, Time.time, 1f, 0.5f); + + rotationMod[0] = Quaternion.Euler(deltaX, deltaY, deltaZ); + } + + /*-----Step Swey-----*/ + 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; + } + /*-----Steps-----*/ + stepDistance += Vector3.Magnitude(playerController.velocity); + stepSin = ezSin(stepAmplitudeWalking, stepFrequency, currentDist); + + if (stepDistance > 10f) stepDistance = 0f; + + 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); + } + } + + /*-----Aiming-----*/ + aimVal = gravityValue(aimVal, aimSpeed,1,0,isAiming); + positionMod[2] = Vector3.Lerp(HoldPoint.transform.localPosition, AimPoint.transform.localPosition, Mathf.Pow(aimVal, 1.3f)); + + + + /*-----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; + } + + + + /*-----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/ProcedualAnimationController.cs.meta b/Assets/Scripts/ProcedualAnimationController.cs.meta new file mode 100644 index 0000000..934344d --- /dev/null +++ b/Assets/Scripts/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..8fd6b51 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 procedualAnimationController; [SerializeField] float fireRate; [SerializeField] GameObject gunHoldPos; @@ -14,7 +14,7 @@ public class Shoot : NetworkBehaviour { if (isLocalPlayer) { - shootAnim.OnSwitchWeapon(fireRate); + procedualAnimationController.OnSwitchWeapon(fireRate); } } private void Update() @@ -53,6 +53,7 @@ public class Shoot : NetworkBehaviour // This code will be executed on the Client. void shootAnimation() { - shootAnim.recoil(gunHoldPos,0.1f); + Debug.Log("Shooot animation in shoot script"); + procedualAnimationController.Recoil(0.1f); } } diff --git a/Assets/Scripts/Weapons/ShootAnimation.cs b/Assets/Scripts/Weapons/ShootAnimation.cs index 22cb377..f13b834 100644 --- a/Assets/Scripts/Weapons/ShootAnimation.cs +++ b/Assets/Scripts/Weapons/ShootAnimation.cs @@ -4,6 +4,10 @@ using UnityEngine; public class ShootAnimation : MonoBehaviour { + [Header("Step Settings")] + [SerializeField] private float stepAmplitude; + [SerializeField] private float stepFrequency; + private float stepSin; [Header("GameObjects")] [SerializeField] private GameObject gun; @@ -68,7 +72,7 @@ public class ShootAnimation : MonoBehaviour } - public void recoil(GameObject gun, float force) + public void recoil(float force) { //Play the animation anim.Play("Shoot"); diff --git a/Assets/Scripts/oneVsOneStateMashine.cs b/Assets/Scripts/oneVsOneStateMashine.cs new file mode 100644 index 0000000..4e7437f --- /dev/null +++ b/Assets/Scripts/oneVsOneStateMashine.cs @@ -0,0 +1,41 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class oneVsOneStateMashine : MonoBehaviour +{ + public int state = 0; + public const int TOTALSTATES = 4; + void StateMashineRound() + { + switch (state) + { + case 0: + //respawn players + break; + case 1: + //Let the players walk and kill each other + //if one team gets killed go to next state + break; + case 2: + //stop player movement + break; + case 3: + //show score board + break; + default: + break; + + } + } + + void switchState() + { + state++; + if (state >= TOTALSTATES) + { + state = 0; + } + + } +} diff --git a/Assets/Scripts/oneVsOneStateMashine.cs.meta b/Assets/Scripts/oneVsOneStateMashine.cs.meta new file mode 100644 index 0000000..9a65fb3 --- /dev/null +++ b/Assets/Scripts/oneVsOneStateMashine.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 158123b91f5327f48b23b9d537a644e7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: 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..fed5919 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,10 +5,13 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 + - enabled: 0 path: Assets/Scenes/TestOfflineScene.unity guid: 20dba395f2cd9824288c340124ce9d6f - enabled: 1 path: Assets/Scenes/TestScene.unity guid: 9fc0d4010bbf28b4594072e72b8655ab + - enabled: 0 + path: Assets/Scenes/Animation Test.unity + guid: 02c13534ac288954c9a8339782de67f0 m_configObjects: {} diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 43369e3..81b2954 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 13 + serializedVersion: 14 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -28,6 +28,7 @@ GraphicsSettings: m_LensFlare: m_Mode: 1 m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} + m_VideoShadersIncludeMode: 2 m_AlwaysIncludedShaders: - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} @@ -36,14 +37,31 @@ GraphicsSettings: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] - m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, - type: 0} + m_PreloadShadersBatchTimeLimit: -1 + m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_CustomRenderPipeline: {fileID: 0} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_DefaultRenderingPath: 1 m_DefaultMobileRenderingPath: 1 - m_TierSettings: [] + m_TierSettings: + - serializedVersion: 5 + m_BuildTarget: 1 + m_Tier: 0 + m_Settings: + standardShaderQuality: 1 + renderingPath: 1 + hdrMode: 1 + realtimeGICPUUsage: 25 + useReflectionProbeBoxProjection: 1 + useReflectionProbeBlending: 1 + useHDR: 1 + useDetailNormalMap: 1 + useCascadedShadowMaps: 1 + prefer32BitShadowMaps: 0 + enableLPPV: 1 + useDitherMaskForAlphaBlendedShadows: 1 + m_Automatic: 0 m_LightmapStripping: 0 m_FogStripping: 0 m_InstancingStripping: 0 @@ -59,5 +77,6 @@ GraphicsSettings: m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 0 m_LightsUseColorTemperature: 0 + m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 - m_AllowEnlightenSupportForUpgradedProject: 0 + m_SRPDefaultSettings: {} diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 1c728b9..75d543c 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,10 +9,10 @@ EditorUserSettings: value: 510150040406500e0b5c0f26497b0d44444f40297f7c76617f7d1e36bbe4623e flags: 0 RecentlyUsedSceneGuid-1: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 5303575756005a0f0c0d5e7a487a0a44154e19727f7b7f67757b1936b4b73268 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..27ee898 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -20,7 +20,7 @@ MonoBehaviour: x: 0 y: 30 width: 1536 - height: 731 + height: 730.8 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 @@ -45,9 +45,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 713.60004 + x: 711.2 y: 73.6 - width: 455.59998 + width: 458.8 height: 450.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -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: 458.8, y: 429.2} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -74,8 +74,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -182.23999 - m_HBaseRangeMax: 182.23999 + m_HBaseRangeMin: -183.52 + m_HBaseRangeMax: 183.52 m_VBaseRangeMin: -171.68001 m_VBaseRangeMax: 171.68001 m_HAllowExceedBaseRangeMin: 1 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 455.59998 + width: 458.8 height: 429.2 m_Scale: {x: 1.1592739, y: 1.1592739} - m_Translation: {x: 227.79999, y: 214.6} + m_Translation: {x: 229.4, y: 214.6} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -196.5023 + x: -197.88249 y: -185.11589 - width: 393.0046 + width: 395.76498 height: 370.23178 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 569.5, y: 562.75} + m_LastWindowPixelSize: {x: 573.5, y: 562.75} 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: 1172 + height: 730.8 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 @@ -162,7 +162,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1171.2 + width: 1172 height: 471.2 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} @@ -185,7 +185,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 297.6 + width: 295.2 height: 471.2 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -216,7 +216,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 296.6 + width: 294.2 height: 450.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -227,7 +227,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 4e34fdfff434fdff5255fdffe496fdffb2b0fdff62d4fdff08d5fdffc6f5fdff6cf6fdff6251feff0852feff4658feff4859feffe695feff849ffeff34a0feff02cbfeff740affffa018ffff5019ffffdc1efffffe55ffff0456ffff1456ffff2056ffff2656ffff5656ffff0657ffff9265ffff9865ffffa865ffffb465ffffba65ffffea65ffff9a66ffff7e88ffff8488ffffb488ffff6489ffffa48dffff548effff3af4ffff40f4ffff50f4ffff5cf4ffff62f4ffff90f4ffff40f5ffffa6f7fffff4ffffff + m_ExpandedIDs: aecffcff54d0fcff50defcfff6defcff5415fdff6415fdff6c15fdff7215fdff9c15fdff4216fdffa699fdffae99fdffb499fdffde99fdff749afdff849afdfff4fbfdfffcfbfdff02fcfdff2cfcfdffd2fcfdffc009feffea09feff900afeff560efeff7617feffe421feff8a22feff4458feff34e7feff00fdfeffec54ffff2afbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -266,12 +266,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 297.6 + x: 295.2 y: 0 - width: 415.99997 + width: 416 height: 471.2 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 9} m_Panes: - {fileID: 8} @@ -362,9 +362,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 297.6 + x: 295.2 y: 73.6 - width: 413.99997 + width: 414 height: 450.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -430,9 +430,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: 86} + snapOffset: {x: -171.7, y: 86} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 + snapCorner: 1 id: Orientation index: 0 layout: 4 @@ -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.00014543533, y: 2.1534262, z: -0.0002617836} speed: 2 - m_Value: {x: -0.56465197, y: 2.0329852, z: -0.022925854} + m_Value: {x: 0.00014543533, y: 2.1534262, z: -0.0002617836} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -627,13 +627,13 @@ 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.07313226, y: 0.9243572, z: -0.22679888, w: -0.29812995} speed: 2 - m_Value: {x: 0.035056416, y: 0.9544865, z: -0.12439282, w: 0.2687994} + m_Value: {x: -0.07312847, y: 0.92430925, z: -0.22678712, w: -0.29811448} m_Size: - m_Target: 1.0003884 + m_Target: 1.6704689 speed: 2 - m_Value: 1.0003884 + m_Value: 1.6704689 m_Ortho: m_Target: 1 speed: 2 @@ -673,12 +673,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 713.6 + x: 711.2 y: 0 - width: 457.59998 + width: 460.8 height: 471.2 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} @@ -701,8 +701,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 471.2 - width: 1171.2 - height: 259.8 + width: 1172 + height: 259.59998 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 12} @@ -733,8 +733,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 544.8 - width: 1170.2 - height: 238.79999 + width: 1171 + height: 238.59998 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: 165.40002} + m_SelectedIDs: c4640000 + m_LastClickedID: 25796 + m_ExpandedIDs: 000000000463000006630000086300002063000000ca9a3bffffff7f 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: 0000000004630000066300000863000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -873,8 +873,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 544.8 - width: 1170.2 - height: 238.79999 + width: 1171 + height: 238.59998 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -894,12 +894,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1171.2 + x: 1172 y: 0 - width: 364.80005 - height: 731 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + width: 364 + height: 730.8 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -925,10 +925,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1171.2001 + x: 1172 y: 73.6 - width: 363.80005 - height: 710 + width: 363 + height: 709.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 3f8bd50..9b032d0 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1536 height: 780.8 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} @@ -45,7 +45,7 @@ MonoBehaviour: x: 0 y: 0 width: 1536 - height: 781 + height: 780.8 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -90,7 +90,7 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 761 + y: 760.8 width: 1536 height: 20 m_MinSize: {x: 0, y: 0} @@ -115,11 +115,11 @@ MonoBehaviour: x: 0 y: 30 width: 1536 - height: 731 + height: 730.8 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 24963 + controlID: 26449 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1171.2 - height: 731 + width: 1172 + height: 730.8 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 24964 + controlID: 26450 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,12 +165,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1171.2 + width: 1172 height: 471.2 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 24965 + controlID: 26451 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -188,7 +188,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 297.6 + width: 295.2 height: 471.2 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -212,12 +212,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 297.6 + x: 295.2 y: 0 - width: 415.99997 + width: 416 height: 471.2 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 16} m_Panes: - {fileID: 15} @@ -239,12 +239,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 713.6 + x: 711.2 y: 0 - width: 457.59998 + width: 460.8 height: 471.2 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -267,8 +267,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 471.2 - width: 1171.2 - height: 259.8 + width: 1172 + height: 259.59998 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 17} @@ -292,12 +292,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1171.2 + x: 1172 y: 0 - width: 364.80005 - height: 731 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + width: 364 + height: 730.8 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} @@ -323,9 +323,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 713.60004 + x: 711.2 y: 73.6 - width: 455.59998 + width: 458.8 height: 450.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -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: 458.8, y: 429.2} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -352,8 +352,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -182.23999 - m_HBaseRangeMax: 182.23999 + m_HBaseRangeMin: -183.52 + m_HBaseRangeMax: 183.52 m_VBaseRangeMin: -171.68001 m_VBaseRangeMax: 171.68001 m_HAllowExceedBaseRangeMin: 1 @@ -373,23 +373,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 455.59998 + width: 458.8 height: 429.2 m_Scale: {x: 1.1592739, y: 1.1592739} - m_Translation: {x: 227.79999, y: 214.6} + m_Translation: {x: 229.4, y: 214.6} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -196.5023 + x: -197.88249 y: -185.11589 - width: 393.0046 + width: 395.76498 height: 370.23178 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 569.5, y: 562.75} + m_LastWindowPixelSize: {x: 573.5, y: 562.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -417,7 +417,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 296.6 + width: 294.2 height: 450.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -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: e2e7fbff28a2fcff24b0fcff72b0fcff10b3fcffaecffcff54d0fcff50defcfff6defcff5415fdff6415fdff6c15fdff7215fdff9c15fdff4216fdffa699fdffae99fdffb499fdffde99fdff749afdff849afdfff4fbfdfffcfbfdff02fcfdff2cfcfdffd2fcfdffc009feffea09feff900afeff560efeff7617feffe421feff8a22feff4458feff34e7feff00fdfeffec54ffff2afbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -536,9 +536,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 297.6 + x: 295.2 y: 73.6 - width: 413.99997 + width: 414 height: 450.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -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 @@ -604,9 +604,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: 86} + snapOffset: {x: -171.7, y: 86} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 + snapCorner: 1 id: Orientation index: 0 layout: 4 @@ -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 @@ -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,7 +735,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 1 + displayed: 0 snapOffset: {x: 0, y: 24.8} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -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.55357003, y: 2.1534474, z: 0.30603352} speed: 2 - m_Value: {x: -0.56465197, y: 2.0329852, z: -0.022925854} + m_Value: {x: -0.55357003, y: 2.1534474, z: 0.30603352} 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,13 +801,13 @@ 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.06892574, y: 0.9309871, z: -0.26127514, w: -0.24566421} speed: 2 - m_Value: {x: 0.035056416, y: 0.9544865, z: -0.12439282, w: 0.2687994} + m_Value: {x: -0.068922184, y: 0.9309391, z: -0.26126164, w: -0.24565153} m_Size: - m_Target: 0.3056236 + m_Target: 1.6704689 speed: 2 - m_Value: 1.0003884 + m_Value: 1.6704689 m_Ortho: m_Target: 1 speed: 2 @@ -854,8 +854,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 544.8 - width: 1170.2 - height: 238.79999 + width: 1171 + height: 238.59998 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -885,10 +885,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: 165.40002} + m_SelectedIDs: c4640000 + m_LastClickedID: 25796 + m_ExpandedIDs: 000000000463000006630000086300002063000000ca9a3bffffff7f 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: 0000000004630000066300000863000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -994,8 +994,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 544.8 - width: 1170.2 - height: 238.79999 + width: 1171 + height: 238.59998 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1020,10 +1020,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1171.2001 + x: 1172 y: 73.6 - width: 363.80005 - height: 710 + width: 363 + height: 709.8 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: