diff --git a/Assets/DebugCanvas.prefab b/Assets/Prefabs/DebugCanvas.prefab similarity index 100% rename from Assets/DebugCanvas.prefab rename to Assets/Prefabs/DebugCanvas.prefab diff --git a/Assets/DebugCanvas.prefab.meta b/Assets/Prefabs/DebugCanvas.prefab.meta similarity index 100% rename from Assets/DebugCanvas.prefab.meta rename to Assets/Prefabs/DebugCanvas.prefab.meta diff --git a/Assets/GameManager.prefab b/Assets/Prefabs/GameManager.prefab similarity index 100% rename from Assets/GameManager.prefab rename to Assets/Prefabs/GameManager.prefab diff --git a/Assets/GameManager.prefab.meta b/Assets/Prefabs/GameManager.prefab.meta similarity index 100% rename from Assets/GameManager.prefab.meta rename to Assets/Prefabs/GameManager.prefab.meta diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index d289f33..e89b478 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -1,36 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &659942595732761248 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7283872597117707309} - m_Layer: 0 - m_Name: CameraPos - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7283872597117707309 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 659942595732761248} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.28639913, y: -0.44462323, z: 0.48100734} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 6272346181657429396} - m_Father: {fileID: 981273033772084037} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &681358948229890261 GameObject: m_ObjectHideFlags: 0 @@ -59,9 +28,10 @@ Transform: 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: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2732428023354893519 MeshFilter: @@ -139,6 +109,7 @@ Transform: 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 @@ -171,6 +142,7 @@ RectTransform: 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 @@ -352,6 +324,7 @@ Transform: 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} @@ -424,6 +397,7 @@ MonoBehaviour: syncMode: 0 syncInterval: 0.1 walkSpeed: 6 + sprintSpeed: 10 moveSmoothTime: 0.05 gravity: -10 jumpHeight: 0.5 @@ -493,7 +467,7 @@ MonoBehaviour: m_EditorClassIdentifier: syncMode: 0 syncInterval: 0.1 - playerCamera: {fileID: 7283872597117707309} + playerCamera: {fileID: 6272346181657429396} playerNeck: {fileID: 981273033772084037} mouseSensitivity: 4 maxCameraAngle: 90 @@ -631,7 +605,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &6272346181657429396 Transform: m_ObjectHideFlags: 0 @@ -640,12 +614,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6272346181657429393} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.28639913, y: 0.444623, z: -0.48100734} + 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: 7283872597117707309} - m_RootOrder: 0 + m_Father: {fileID: 981273033772084037} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &6272346181657429395 Camera: @@ -716,6 +691,7 @@ Transform: 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 @@ -746,9 +722,10 @@ Transform: 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: 7283872597117707309} - {fileID: 4399039561386292163} + - {fileID: 6272346181657429396} m_Father: {fileID: 6272346181302961296} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -780,6 +757,7 @@ Transform: 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 diff --git a/Assets/Scenes/Map1.unity b/Assets/Scenes/Map1.unity index fea2191..ac2d5a4 100644 --- a/Assets/Scenes/Map1.unity +++ b/Assets/Scenes/Map1.unity @@ -212,6 +212,7 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -273,6 +274,160 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 603e80b4be26af147a6fde1eea042c4b, type: 3} +--- !u!1001 &1360248916 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728898, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4636852677861728911, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} + propertyPath: m_Name + value: DebugCanvas + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3} +--- !u!1001 &1963145242 +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!1001 &1119390847028409689 PrefabInstance: m_ObjectHideFlags: 0 @@ -403,60 +558,3 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a810025b9aabaa64e958a9fab4504d93, type: 3} ---- !u!1001 &8254144844387359949 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8254144844365660484, guid: 2e0b09b5d2317e945be571bf04f89521, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 8254144844365660484, guid: 2e0b09b5d2317e945be571bf04f89521, type: 3} - propertyPath: m_LocalPosition.x - value: 10.781815 - objectReference: {fileID: 0} - - target: {fileID: 8254144844365660484, guid: 2e0b09b5d2317e945be571bf04f89521, type: 3} - propertyPath: m_LocalPosition.y - value: -12.906637 - objectReference: {fileID: 0} - - target: {fileID: 8254144844365660484, guid: 2e0b09b5d2317e945be571bf04f89521, type: 3} - propertyPath: m_LocalPosition.z - value: 7.690632 - objectReference: {fileID: 0} - - target: {fileID: 8254144844365660484, guid: 2e0b09b5d2317e945be571bf04f89521, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8254144844365660484, guid: 2e0b09b5d2317e945be571bf04f89521, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8254144844365660484, guid: 2e0b09b5d2317e945be571bf04f89521, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8254144844365660484, guid: 2e0b09b5d2317e945be571bf04f89521, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8254144844365660484, guid: 2e0b09b5d2317e945be571bf04f89521, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8254144844365660484, guid: 2e0b09b5d2317e945be571bf04f89521, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8254144844365660484, guid: 2e0b09b5d2317e945be571bf04f89521, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8254144844365660489, guid: 2e0b09b5d2317e945be571bf04f89521, type: 3} - propertyPath: m_Name - value: Network Manager - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2e0b09b5d2317e945be571bf04f89521, type: 3} diff --git a/Assets/Scenes/TestOfflineScene.unity b/Assets/Scenes/TestOfflineScene.unity index d815731..d3a72d4 100644 --- a/Assets/Scenes/TestOfflineScene.unity +++ b/Assets/Scenes/TestOfflineScene.unity @@ -1058,7 +1058,6 @@ MonoBehaviour: m_EditorClassIdentifier: inputIp: {fileID: 1921366629} inputUsername: {fileID: 1139664930} - localPlayer: {fileID: 0} --- !u!1 &977378652 GameObject: m_ObjectHideFlags: 0 @@ -1221,7 +1220,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1139664928 GameObject: @@ -1620,7 +1619,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1456496500 GameObject: @@ -1782,7 +1781,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3422988367618467043, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} propertyPath: m_RootOrder - value: 4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3422988367618467043, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} propertyPath: m_LocalPosition.x @@ -2239,64 +2238,3 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1921366627} m_CullTransparentMesh: 1 ---- !u!1001 &3422988367319810179 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -4742972085864279645, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3} - propertyPath: sceneId - value: 4166410280 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467032, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3} - propertyPath: m_Name - value: GameManager - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3422988367618467043, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 67e17f044d3a54a458b4f2d76ed9e442, type: 3} diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index f9b14f0..1c9413b 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -51,7 +51,9 @@ public class PlayerController : NetworkBehaviour Grounded(); CheckGoundAngle(); UpdateMovement(); + } + } private void Grounded() { @@ -86,18 +88,7 @@ public class PlayerController : NetworkBehaviour groundAngle = Vector3.Angle(hit.normal,transform.up); } } - private void Sprint() - { - if (Input.GetAxisRaw("Sprint") > 0 && isGrounded) - { - //Debug.Log("Sprint"); - movementSpeed = sprintSpeed; - } - else - { - movementSpeed = walkSpeed; - } - } + private void OnDrawGizmos() { Gizmos.color = Color.red; @@ -106,8 +97,19 @@ public class PlayerController : NetworkBehaviour private void UpdateMovement() { - - + + + if (Input.GetAxisRaw("Sprint") > 0 && isGrounded) + { + Debug.Log("Sprint"); + movementSpeed = sprintSpeed; + } + else + { + movementSpeed = walkSpeed; + } + + Debug.Log("ggg"); //Grounded velocityY += gravity * Time.deltaTime; if (isGrounded && velocityY < 0) diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 4dc44a4..f90b377 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,16 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 - y: 43.2 - width: 1536 + x: 0.8 + y: 50.4 + width: 889.60004 height: 772.8 m_ShowMode: 4 - m_Title: Scene + m_Title: Game m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 1 + m_Maximized: 0 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -43,12 +43,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1536 + width: 889.60004 height: 722.8 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 23 + controlID: 98 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -64,9 +64,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1172 + x: 678.4 y: 0 - width: 364 + width: 211.20001 height: 722.8 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} @@ -92,7 +92,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 290.4 + width: 168 height: 429.6 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} @@ -111,23 +111,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 429.6 - width: 1172 + width: 678.4 height: 293.19998 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 12} + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 17} m_Panes: - {fileID: 12} - {fileID: 17} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -148,7 +148,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1536 + width: 889.60004 height: 772.8 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -173,7 +173,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1536 + width: 889.60004 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -195,7 +195,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 752.8 - width: 1536 + width: 889.60004 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -218,12 +218,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1172 + width: 678.4 height: 722.8 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 71 + controlID: 99 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -243,12 +243,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1172 + width: 678.4 height: 429.6 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 72 + controlID: 100 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -264,9 +264,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 290.4 + x: 168 y: 0 - width: 881.6 + width: 510.40002 height: 429.6 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -297,9 +297,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 503.2 - width: 1171 - height: 272.19998 + y: 508 + width: 1170.2 + height: 275.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -317,22 +317,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scenes + - Assets/Prefabs m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scenes + - Assets/Prefabs m_LastFoldersGridSize: -1 - m_LastProjectPath: C:\Users\Janis\Unity Projects\defrain + m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 67.80002} - m_SelectedIDs: ae5b0000 - m_LastClickedID: 23470 - m_ExpandedIDs: 000000009a5b0000a85b0000b05b000000ca9a3bffffff7f + scrollPos: {x: 0, y: 21} + m_SelectedIDs: ae920000 + m_LastClickedID: 37550 + m_ExpandedIDs: 000000009e920000a0920000b292000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -360,7 +360,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000009a5b0000 + m_ExpandedIDs: 000000009e920000a0920000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -436,9 +436,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1172 - y: 73.6 - width: 363 + x: 679.2 + y: 80.8 + width: 210.20001 height: 701.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -477,9 +477,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 73.6 - width: 289.4 + x: 0.8 + y: 80.8 + width: 167 height: 408.6 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -488,9 +488,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: ce9a0000 - m_LastClickedID: 39630 - m_ExpandedIDs: ea74ffff9875ffffd875ffff2278ffff4a78fffff082ffff5883ffff3086ffff7c86ffff3e87ffff5887fffff88cffffb88effff58aaffffa4aaffff84acffff9eacffff4ab3ffff46b5ffff92b5ffffd6b7fffff0b7ffff66bbffff90c0ffffdedeffff1ae3ffff82e3ffffb4e5ffff06fbffff8a5a0000065b0000ba6b0000386c0000947a0000207b0000bc7f000048800000e686000072870000cc8a0000588b0000f28d0000708e0000509a0000ce9a0000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 2e85ffff7e85ffffd487fffff087ffffe293ffff3694ffff8c96ffffa896ffff3ea0ffff98a8ffffb8c3ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -534,9 +534,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 290.4 - y: 73.6 - width: 879.6 + x: 168.8 + y: 80.8 + width: 508.40002 height: 408.6 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -591,7 +591,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 24.8} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-transform-toolbar @@ -624,7 +624,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 0 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 24.8} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Camera @@ -734,14 +734,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 1 + m_2DMode: 0 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 418.23352, y: 172.2487, z: 3.0638342} + m_Target: {x: -6.850004, y: -2.4662097, z: 34.642265} speed: 2 - m_Value: {x: 418.86877, y: 170.9868, z: 2.981596} + m_Value: {x: -6.850004, y: -2.4662097, z: 34.642265} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -770,17 +770,17 @@ MonoBehaviour: m_Size: {x: 0, y: 0} yGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -788,13 +788,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0, y: 0, z: 0, w: 1} + m_Target: {x: 0.03279638, y: -0.9367419, z: 0.091338895, w: 0.33631974} speed: 2 - m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Value: {x: 0.032796137, y: -0.936735, z: 0.09133822, w: 0.33631727} m_Size: - m_Target: 174.52747 + m_Target: 4.925797 speed: 2 - m_Value: 182.75127 + m_Value: 4.925797 m_Ortho: m_Target: 1 speed: 2 @@ -839,9 +839,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 290.4 - y: 73.6 - width: 879.6 + x: 168.8 + y: 80.8 + width: 508.40002 height: 408.6 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -853,7 +853,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 879.6, y: 387.6} + m_TargetSize: {x: 508.40002, y: 387.6} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -868,8 +868,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -351.84 - m_HBaseRangeMax: 351.84 + m_HBaseRangeMin: -203.36002 + m_HBaseRangeMax: 203.36002 m_VBaseRangeMin: -155.04001 m_VBaseRangeMax: 155.04001 m_HAllowExceedBaseRangeMin: 1 @@ -880,7 +880,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -889,23 +889,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 879.6 + width: 508.40002 height: 387.6 m_Scale: {x: 1, y: 1} - m_Translation: {x: 439.8, y: 193.8} + m_Translation: {x: 254.20001, y: 193.8} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -439.8 + x: -254.20001 y: -193.8 - width: 879.6 + width: 508.40002 height: 387.6 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1099.5, y: 510.75} + m_LastWindowPixelSize: {x: 635.5, y: 510.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -931,9 +931,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 503.2 - width: 1171 + x: 0.8 + y: 510.4 + width: 677.4 height: 272.19998 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: