From 1a0559addb4756483072f08c8131f7541ddb7e4c Mon Sep 17 00:00:00 2001 From: brausjonas Date: Sun, 12 Mar 2023 00:32:14 +0100 Subject: [PATCH] Fixed Delta Time --- .../.idea.FlufflParty/.idea/workspace.xml | 2 +- FlufflParty/Assets/Scripts/Client.cs | 9 +- .../ProjectSettings/ProjectSettings.asset | 8 +- .../UserSettings/Layouts/default-2021.dwlt | 300 +++++------------- 4 files changed, 99 insertions(+), 220 deletions(-) diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index 1be1972..c56b77d 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -136,7 +136,7 @@ - + diff --git a/FlufflParty/Assets/Scripts/Client.cs b/FlufflParty/Assets/Scripts/Client.cs index 90824c4..3153dab 100644 --- a/FlufflParty/Assets/Scripts/Client.cs +++ b/FlufflParty/Assets/Scripts/Client.cs @@ -42,7 +42,12 @@ public class Client : MonoBehaviour { return thisClient; } - + + private void Awake() + { + Time.fixedDeltaTime = 0.01f; + } + private void Start() { Application.targetFrameRate = 100; @@ -127,7 +132,7 @@ public class Client : MonoBehaviour } } - private void Update() + private void FixedUpdate() { fpsText.text = "" + Time.frameCount / Time.time + ""; diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset index d43a9cf..abeb2d3 100644 --- a/FlufflParty/ProjectSettings/ProjectSettings.asset +++ b/FlufflParty/ProjectSettings/ProjectSettings.asset @@ -136,10 +136,8 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.1 - preloadedAssets: - - {fileID: -6390619424234631034, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2} - - {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2} + bundleVersion: 0.12 + preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -166,7 +164,7 @@ PlayerSettings: iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 - AndroidBundleVersionCode: 1 + AndroidBundleVersionCode: 2 AndroidMinSdkVersion: 26 AndroidTargetSdkVersion: 31 AndroidPreferredInstallLocation: 2 diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt index 954d6b7..dcb6ad3 100644 --- a/FlufflParty/UserSettings/Layouts/default-2021.dwlt +++ b/FlufflParty/UserSettings/Layouts/default-2021.dwlt @@ -1,30 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 670 - y: 329 - width: 641 - height: 662 - m_ShowMode: 0 - m_Title: Build Settings - m_RootView: {fileID: 4} - m_MinSize: {x: 640, y: 601} - m_MaxSize: {x: 4000, y: 4021} - m_Maximized: 0 ---- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -44,37 +20,11 @@ MonoBehaviour: height: 1117 m_ShowMode: 4 m_Title: Scene - m_RootView: {fileID: 10} + m_RootView: {fileID: 7} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: BuildPlayerWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 641 - height: 662 - m_MinSize: {x: 640, y: 601} - m_MaxSize: {x: 4000, y: 4021} - m_ActualView: {fileID: 16} - m_Panes: - - {fileID: 16} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -88,30 +38,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 641 - height: 662 - m_MinSize: {x: 640, y: 601} - m_MaxSize: {x: 4000, y: 4021} - vertical: 0 - controlID: 432 ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 6} m_Position: serializedVersion: 2 x: 0 @@ -121,8 +47,8 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 102 ---- !u!114 &6 + controlID: 24 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -135,8 +61,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 13} - - {fileID: 7} + - {fileID: 10} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 @@ -146,8 +72,8 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 103 ---- !u!114 &7 + controlID: 25 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -166,15 +92,15 @@ MonoBehaviour: y: 0 width: 546 height: 1067 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 22} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 22} - - {fileID: 19} + - {fileID: 18} + - {fileID: 15} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &8 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -192,15 +118,15 @@ MonoBehaviour: x: 0 y: 0 width: 281 - height: 644 + height: 701 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 23} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 23} + - {fileID: 19} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &9 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -216,18 +142,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 644 + y: 701 width: 1374 - height: 423 + height: 366 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 21} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 21} - - {fileID: 24} + - {fileID: 17} + - {fileID: 20} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &10 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -240,9 +166,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 11} - - {fileID: 5} - - {fileID: 12} + - {fileID: 8} + - {fileID: 2} + - {fileID: 9} m_Position: serializedVersion: 2 x: 0 @@ -255,7 +181,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &11 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -277,7 +203,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &12 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -298,7 +224,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &13 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -311,8 +237,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 14} - - {fileID: 9} + - {fileID: 11} + - {fileID: 6} m_Position: serializedVersion: 2 x: 0 @@ -322,8 +248,8 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 104 ---- !u!114 &14 + controlID: 26 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -336,19 +262,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 8} - - {fileID: 15} + - {fileID: 5} + - {fileID: 12} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1374 - height: 644 + height: 701 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 105 ---- !u!114 &15 + controlID: 112 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -366,67 +292,17 @@ MonoBehaviour: x: 281 y: 0 width: 1093 - height: 644 + height: 701 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 18} - - {fileID: 20} - - {fileID: 17} + - {fileID: 14} + - {fileID: 16} + - {fileID: 13} m_Selected: 0 m_LastSelected: 2 ---- !u!114 &16 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12043, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 640, y: 580} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Build Settings - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 670 - y: 329 - width: 641 - height: 641 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: ---- !u!114 &17 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -449,7 +325,7 @@ MonoBehaviour: x: 281 y: 73 width: 1091 - height: 623 + height: 680 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -460,7 +336,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1091, y: 602} + m_TargetSize: {x: 1091, y: 659} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -477,8 +353,8 @@ MonoBehaviour: vZoomLockedByDefault: 0 m_HBaseRangeMin: -545.5 m_HBaseRangeMax: 545.5 - m_VBaseRangeMin: -301 - m_VBaseRangeMax: 301 + m_VBaseRangeMin: -329.5 + m_VBaseRangeMax: 329.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -487,7 +363,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -497,9 +373,9 @@ MonoBehaviour: x: 0 y: 21 width: 1091 - height: 602 + height: 659 m_Scale: {x: 1, y: 1} - m_Translation: {x: 545.5, y: 301} + m_Translation: {x: 545.5, y: 329.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -507,18 +383,18 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -545.5 - y: -301 + y: -329.5 width: 1091 - height: 602 + height: 659 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1091, y: 623} + m_LastWindowPixelSize: {x: 1091, y: 680} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &18 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -541,7 +417,7 @@ MonoBehaviour: x: 281 y: 73 width: 1091 - height: 623 + height: 680 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -771,14 +647,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: 487.30527, y: 253.95038, z: -195.20622} + m_Target: {x: 94.7357, y: 7.567647, z: 124.6432} speed: 2 - m_Value: {x: 487.30527, y: 253.95038, z: -195.20622} + m_Value: {x: 94.7357, y: 7.567647, z: 124.6432} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -825,17 +701,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0, y: 0, z: 0, w: 1} + m_Target: {x: -0.017479911, y: 0.9293452, z: -0.3661485, w: -0.044362627} speed: 2 - m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Value: {x: -0.017413171, y: 0.9298837, z: -0.3647503, w: -0.044388335} m_Size: - m_Target: 358.37234 + m_Target: 1.1898067 speed: 2 - m_Value: 358.37234 + m_Value: 1.1898067 m_Ortho: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_CameraSettings: m_Speed: 1.005 m_SpeedNormalized: 0.5 @@ -856,7 +732,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &19 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -884,7 +760,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &20 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -999,7 +875,7 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &21 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1020,9 +896,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 717 + y: 774 width: 1373 - height: 402 + height: 345 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1040,21 +916,21 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Prefabs/Items + - Assets/Scripts m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Prefabs/Items + - Assets/Scripts m_LastFoldersGridSize: -1 m_LastProjectPath: D:\Unity\flufflparty\FlufflParty m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: a8660000 - m_LastClickedID: 26280 + scrollPos: {x: 0, y: 107} + m_SelectedIDs: 3c660000 + m_LastClickedID: 26172 m_ExpandedIDs: 0000000036660000386600003a6600003c6600003e660000406600004266000044660000466600004866000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1071,7 +947,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 6} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1110,7 +986,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000906400007e6d0000485d00002c610000fa0b0200 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1127,7 +1003,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 6} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1139,7 +1015,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &22 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1180,7 +1056,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &23 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1203,7 +1079,7 @@ MonoBehaviour: x: 0 y: 73 width: 280 - height: 623 + height: 680 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1211,9 +1087,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 000f0000 m_LastClickedID: 0 - m_ExpandedIDs: 18efffff6aefffff2cf3ffff34f5ffff04fbffffd85d0000 + m_ExpandedIDs: 06fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1229,7 +1105,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 5} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -1237,7 +1113,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &24 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1258,9 +1134,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 752 + y: 774 width: 1373 - height: 367 + height: 345 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default