diff --git a/Assets/Scenes/GameScene 3.unity b/Assets/Scenes/GameScene 3.unity index e2fd5ee..2bd92f3 100644 --- a/Assets/Scenes/GameScene 3.unity +++ b/Assets/Scenes/GameScene 3.unity @@ -1158,11 +1158,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 320690117028550720, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} propertyPath: m_LocalPosition.x - value: -20.81614 + value: -18.64 objectReference: {fileID: 0} - target: {fileID: 320690117028550720, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} propertyPath: m_LocalPosition.y - value: -19.089561 + value: -20.68 objectReference: {fileID: 0} - target: {fileID: 320690117028550720, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} propertyPath: m_LocalPosition.z @@ -1196,6 +1196,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 647933724824315688, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 651446758998956252, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} propertyPath: moveSpeed value: 30 @@ -1304,6 +1308,10 @@ PrefabInstance: propertyPath: MaxVibration value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 5467488512035376674, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 1842047609192968100, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} m_RemovedGameObjects: [] @@ -1330,7 +1338,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 1232208432} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1254139629} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4aabce12c1341ff488ee4dc806fd80e8, type: 3} m_Name: @@ -20935,6 +20943,10 @@ PrefabInstance: propertyPath: m_Name value: Rope objectReference: {fileID: 0} + - target: {fileID: 5991265243222894942, guid: 0248db69242a3dd47898c6742b6c9f60, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6056950010778645813, guid: 0248db69242a3dd47898c6742b6c9f60, type: 3} propertyPath: GlobalObjectIdHash value: 2706225682 @@ -23865,19 +23877,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 2849751201525768572, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} propertyPath: m_LocalPosition.x - value: -20.81614 + value: -18.64 objectReference: {fileID: 0} - target: {fileID: 2849751201525768572, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} propertyPath: m_LocalPosition.y - value: -19.089561 + value: -20.68 objectReference: {fileID: 0} - target: {fileID: 3197454023887695364, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} propertyPath: m_LocalPosition.x - value: -20.81614 + value: -18.64 objectReference: {fileID: 0} - target: {fileID: 3197454023887695364, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} propertyPath: m_LocalPosition.y - value: -19.089561 + value: -20.68 objectReference: {fileID: 0} - target: {fileID: 3401975006071930001, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} propertyPath: m_Targets.Array.data[0].target @@ -23945,11 +23957,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8946450710138871461, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} propertyPath: m_LocalPosition.x - value: -20.81614 + value: -18.64 objectReference: {fileID: 0} - target: {fileID: 8946450710138871461, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} propertyPath: m_LocalPosition.y - value: -19.089561 + value: -20.68 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/Scripts/Player/Input/PlayerInput.cs b/Assets/Scripts/Player/Input/PlayerInput.cs index af19334..02b568e 100644 --- a/Assets/Scripts/Player/Input/PlayerInput.cs +++ b/Assets/Scripts/Player/Input/PlayerInput.cs @@ -32,8 +32,8 @@ public class PlayerInput : MonoBehaviour, IMoveData private void Update() { - moveData.Movement.x = Input.GetAxisRaw("bruh"); - moveData.Movement.y = Input.GetAxisRaw("bruh_v"); + moveData.Movement.x = Input.GetAxisRaw("Horizontal"); + moveData.Movement.y = Input.GetAxisRaw("Vertical"); whipAttack = Input.GetKey(KeyCode.R); diff --git a/Assets/Settings/Renderer2D.asset b/Assets/Settings/Renderer2D.asset index aca5e70..69d2802 100644 --- a/Assets/Settings/Renderer2D.asset +++ b/Assets/Settings/Renderer2D.asset @@ -26,7 +26,7 @@ MonoBehaviour: m_RendererFeatures: [] m_RendererFeatureMap: m_UseNativeRenderPass: 0 - m_TransparencySortMode: 0 + m_TransparencySortMode: 3 m_TransparencySortAxis: {x: 0, y: 1, z: 0} m_HDREmulationScale: 1 m_LightRenderTextureScale: 0.5 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index be851a4..2f7b232 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 15 + serializedVersion: 16 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -39,7 +39,7 @@ GraphicsSettings: m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_CustomRenderPipeline: {fileID: 11400000, guid: 681886c5eb7344803b6206f758bf0b1c, type: 2} m_TransparencySortMode: 0 - m_TransparencySortAxis: {x: 0, y: 0, z: 1} + m_TransparencySortAxis: {x: 0, y: 1, z: 0} m_DefaultRenderingPath: 1 m_DefaultMobileRenderingPath: 1 m_TierSettings: [] @@ -57,12 +57,12 @@ GraphicsSettings: m_FogKeepExp: 1 m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] + m_RenderPipelineGlobalSettingsMap: + UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 93b439a37f63240aca3dd4e01d978a9f, type: 2} m_LightsUseLinearIntensity: 1 m_LightsUseColorTemperature: 1 m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 - m_SRPDefaultSettings: - UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 93b439a37f63240aca3dd4e01d978a9f, type: 2} m_LightProbeOutsideHullStrategy: 0 m_CameraRelativeLightCulling: 0 - m_CameraRelativeShadowCulling: 0 + m_CameraRelativeShadowCulling: 1