diff --git a/Assets/Resources/Images/Animation/PlayerAnimator.controller b/Assets/Resources/Images/Animation/PlayerAnimator.controller index 089afce..41b60d3 100644 --- a/Assets/Resources/Images/Animation/PlayerAnimator.controller +++ b/Assets/Resources/Images/Animation/PlayerAnimator.controller @@ -304,7 +304,7 @@ AnimatorController: m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 - m_DefaultBool: 1 + m_DefaultBool: 0 m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 diff --git a/Assets/Resources/PerformanceTestRunInfo.json b/Assets/Resources/PerformanceTestRunInfo.json deleted file mode 100644 index f49d474..0000000 --- a/Assets/Resources/PerformanceTestRunInfo.json +++ /dev/null @@ -1 +0,0 @@ -{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"Split","MtRendering":false,"GraphicsJobs":false,"GpuSkinning":false,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"Mono2x","AndroidTargetSdkVersion":"AndroidApiLevelAuto","AndroidBuildSystem":"Gradle","BuildTarget":"StandaloneWindows64","StereoRenderingPath":"MultiPass"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.3.4f1","Branch":"6000.3/staging","Changeset":"fdd3b8998ec4","Date":1767737168},"Dependencies":["com.unity.2d.animation@13.0.2","com.unity.2d.aseprite@3.0.1","com.unity.2d.psdimporter@12.0.1","com.unity.2d.sprite@1.0.0","com.unity.2d.spriteshape@13.0.0","com.unity.2d.tilemap@1.0.0","com.unity.2d.tilemap.extras@6.0.1","com.unity.2d.tooling@1.0.0","com.unity.collab-proxy@2.11.2","com.unity.ide.rider@3.0.38","com.unity.ide.visualstudio@2.0.26","com.unity.inputsystem@1.17.0","com.unity.multiplayer.center@1.0.1","com.unity.render-pipelines.universal@17.3.0","com.unity.test-framework@1.6.0","com.unity.timeline@1.8.10","com.unity.ugui@2.0.0","com.unity.visualscripting@1.9.9","com.unity.modules.accessibility@1.0.0","com.unity.modules.adaptiveperformance@1.0.0","com.unity.modules.ai@1.0.0","com.unity.modules.androidjni@1.0.0","com.unity.modules.animation@1.0.0","com.unity.modules.assetbundle@1.0.0","com.unity.modules.audio@1.0.0","com.unity.modules.cloth@1.0.0","com.unity.modules.director@1.0.0","com.unity.modules.imageconversion@1.0.0","com.unity.modules.imgui@1.0.0","com.unity.modules.jsonserialize@1.0.0","com.unity.modules.particlesystem@1.0.0","com.unity.modules.physics@1.0.0","com.unity.modules.physics2d@1.0.0","com.unity.modules.screencapture@1.0.0","com.unity.modules.terrain@1.0.0","com.unity.modules.terrainphysics@1.0.0","com.unity.modules.tilemap@1.0.0","com.unity.modules.ui@1.0.0","com.unity.modules.uielements@1.0.0","com.unity.modules.umbra@1.0.0","com.unity.modules.unityanalytics@1.0.0","com.unity.modules.unitywebrequest@1.0.0","com.unity.modules.unitywebrequestassetbundle@1.0.0","com.unity.modules.unitywebrequestaudio@1.0.0","com.unity.modules.unitywebrequesttexture@1.0.0","com.unity.modules.unitywebrequestwww@1.0.0","com.unity.modules.vectorgraphics@1.0.0","com.unity.modules.vehicles@1.0.0","com.unity.modules.video@1.0.0","com.unity.modules.vr@1.0.0","com.unity.modules.wind@1.0.0","com.unity.modules.xr@1.0.0","com.unity.modules.subsystems@1.0.0","com.unity.modules.hierarchycore@1.0.0","com.unity.ext.nunit@2.0.5","com.unity.render-pipelines.core@17.3.0","com.unity.shadergraph@17.3.0","com.unity.render-pipelines.universal-config@17.0.3","com.unity.2d.common@12.0.1","com.unity.mathematics@1.3.3","com.unity.collections@2.6.2","com.unity.searcher@4.9.4","com.unity.burst@1.8.27","com.unity.nuget.mono-cecil@1.11.6","com.unity.test-framework.performance@3.2.0"],"Results":[]} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunInfo.json.meta b/Assets/Resources/PerformanceTestRunInfo.json.meta deleted file mode 100644 index 3a8ddc9..0000000 --- a/Assets/Resources/PerformanceTestRunInfo.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 030fe6f7f706f2f4582cd54d99c12bd5 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/PerformanceTestRunSettings.json b/Assets/Resources/PerformanceTestRunSettings.json deleted file mode 100644 index 49438ae..0000000 --- a/Assets/Resources/PerformanceTestRunSettings.json +++ /dev/null @@ -1 +0,0 @@ -{"MeasurementCount":-1} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunSettings.json.meta b/Assets/Resources/PerformanceTestRunSettings.json.meta deleted file mode 100644 index 3e118e0..0000000 --- a/Assets/Resources/PerformanceTestRunSettings.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e73dc46a8bc771343ac63a40ad4e785c -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Player/PlayerMovement.cs b/Assets/Scripts/Player/PlayerMovement.cs index ade84c3..8fd93b6 100644 --- a/Assets/Scripts/Player/PlayerMovement.cs +++ b/Assets/Scripts/Player/PlayerMovement.cs @@ -43,7 +43,7 @@ public class PlayerMovement : MonoBehaviour private void FixedUpdate() { - if (GameManager.instance.currentState == GameState.Die) + if (GameManager.instance.currentState == GameState.GameOver) { if (!isDead) { diff --git a/Assets/Scripts/Utility/UpdateFpsUI.cs b/Assets/Scripts/Utility/UpdateFpsUI.cs index 74de09f..39741ee 100644 --- a/Assets/Scripts/Utility/UpdateFpsUI.cs +++ b/Assets/Scripts/Utility/UpdateFpsUI.cs @@ -11,7 +11,7 @@ public class UpdateFpsUI : MonoBehaviour void Start() { - Application.targetFrameRate = 120; + Application.targetFrameRate = 60; fpsText = transform.GetComponent(); }