diff --git a/Assets/Resources.meta b/Assets/Resources.meta new file mode 100644 index 0000000..a8515f3 --- /dev/null +++ b/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 723c7ecb1f81a8c47a6c3853e476b507 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/PerformanceTestRunInfo.json b/Assets/Resources/PerformanceTestRunInfo.json new file mode 100644 index 0000000..8148b3f --- /dev/null +++ b/Assets/Resources/PerformanceTestRunInfo.json @@ -0,0 +1 @@ +{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"GraphicsJobs","GpuSkinning":true,"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.0.29f1","Branch":"6000.0/release","Changeset":"9fafe5c9db65","Date":1732549923},"Dependencies":["com.unity.ai.navigation@2.0.5","com.unity.animation.rigging@1.3.0","com.unity.cinemachine@2.10.3","com.unity.collab-proxy@2.5.2","com.unity.ext.nunit@2.0.5","com.unity.feature.development@1.0.2","com.unity.ide.rider@3.0.31","com.unity.ide.visualstudio@2.0.22","com.unity.ide.vscode@1.2.5","com.unity.multiplayer.center@1.0.0","com.unity.postprocessing@3.4.0","com.unity.recorder@5.1.1","com.unity.test-framework@1.4.5","com.unity.timeline@1.8.7","com.unity.ugui@2.0.0","com.unity.visualscripting@1.9.5","com.unity.modules.accessibility@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.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.collections@2.5.1","com.unity.bindings.openimageio@1.0.0","com.unity.editorcoroutines@1.0.0","com.unity.performance.profile-analyzer@1.2.2","com.unity.testtools.codecoverage@1.2.6","com.unity.burst@1.8.18","com.unity.nuget.mono-cecil@1.11.4","com.unity.test-framework.performance@3.0.3","com.unity.settings-manager@2.0.1","com.unity.mathematics@1.3.2"],"Results":[]} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunInfo.json.meta b/Assets/Resources/PerformanceTestRunInfo.json.meta new file mode 100644 index 0000000..74dbcab --- /dev/null +++ b/Assets/Resources/PerformanceTestRunInfo.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 42ae56fc580eb76438e9237df300cf83 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/PerformanceTestRunSettings.json b/Assets/Resources/PerformanceTestRunSettings.json new file mode 100644 index 0000000..49438ae --- /dev/null +++ b/Assets/Resources/PerformanceTestRunSettings.json @@ -0,0 +1 @@ +{"MeasurementCount":-1} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunSettings.json.meta b/Assets/Resources/PerformanceTestRunSettings.json.meta new file mode 100644 index 0000000..5e3d879 --- /dev/null +++ b/Assets/Resources/PerformanceTestRunSettings.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6dfd787c7c2be824594e8b99cc723e49 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SoloGameScene.unity b/Assets/Scenes/SoloGameScene.unity index 9baa281..b2510be 100644 --- a/Assets/Scenes/SoloGameScene.unity +++ b/Assets/Scenes/SoloGameScene.unity @@ -746,25 +746,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 179367326} m_CullTransparentMesh: 1 ---- !u!224 &139585262 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 139585261} - 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: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000050159586, y: -0.00026127105} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} --- !u!1 &214096428 GameObject: m_ObjectHideFlags: 0 @@ -1841,7 +1822,6 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 868437928} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} @@ -1875,8 +1855,6 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 1237272502} - m_HandleRect: {fileID: 1237272501} m_Direction: 2 m_Value: 1 m_Size: 1 diff --git a/Assets/ScriptableObjects/PlayerData.cs b/Assets/ScriptableObjects/PlayerData.cs index f339949..868c251 100644 --- a/Assets/ScriptableObjects/PlayerData.cs +++ b/Assets/ScriptableObjects/PlayerData.cs @@ -6,7 +6,7 @@ using UnityEngine; public sealed class PlayerData : ScriptableObject { // Serialize Fields - [field: SerializeField] public int InvincibilityTime { get; protected set; } + [field: SerializeField] public int InvincibilityTime { get; private set; } [field: SerializeField] public float JumpHeight { get; private set; } [field: SerializeField] public float LaneSwitchSpeed { get; private set; } [field: SerializeField] public float InitialSpeed { get; private set; } diff --git a/Assets/Scripts/GameSession/GameSession.cs b/Assets/Scripts/GameSession/GameSession.cs index 6af4eaf..8a4b644 100644 --- a/Assets/Scripts/GameSession/GameSession.cs +++ b/Assets/Scripts/GameSession/GameSession.cs @@ -58,13 +58,9 @@ public class GameSession : MonoBehaviour,IResettable var player1Holder = new KeyBindingHolder(); player1Holder.Init(false); _player1InputTranslator = new InputTranslator(player1Holder, false); - - if (isDuoMode) - { - var player2Holder = new KeyBindingHolder(); - player2Holder.Init(true); - _player2InputTranslator = new InputTranslator(player2Holder, true); - } + var player2Holder = new KeyBindingHolder(); + player2Holder.Init(true); + _player2InputTranslator = new InputTranslator(player2Holder, true); playerData.Reset(); }