diff --git a/game/Assets/Prefabs/Artefacts/ArtefactPreview.prefab b/game/Assets/Prefabs/Artefacts/ArtefactPreview.prefab new file mode 100644 index 0000000..fd37698 --- /dev/null +++ b/game/Assets/Prefabs/Artefacts/ArtefactPreview.prefab @@ -0,0 +1,456 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6189151120382770278 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6189151120382770279} + - component: {fileID: 6189151120382770202} + - component: {fileID: 6189151120382770200} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6189151120382770279 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6189151120382770278} + m_LocalRotation: {x: 0.2164396, y: 0, z: 0, w: 0.97629607} + m_LocalPosition: {x: 0, y: 1.2, z: -2.75} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6189151121097661531} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 25, y: 0, z: 0} +--- !u!20 &6189151120382770202 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6189151120382770278} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 40 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: 0fc273c76f186624c8278e4fc863187c, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!114 &6189151120382770200 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6189151120382770278} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: 0 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!1 &6189151120632183869 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6189151120632183870} + - component: {fileID: 6189151120632183857} + - component: {fileID: 6189151120632183856} + - component: {fileID: 6189151120632183871} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &6189151120632183870 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6189151120632183869} + 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_Children: [] + m_Father: {fileID: 6189151121097661531} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6189151120632183857 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6189151120632183869} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6189151120632183856 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6189151120632183869} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &6189151120632183871 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6189151120632183869} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6189151121097661530 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6189151121097661531} + - component: {fileID: 6189151121097661532} + - component: {fileID: 6189151121097661533} + m_Layer: 0 + m_Name: Preview + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6189151121097661531 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6189151121097661530} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -1337, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6189151120382770279} + - {fileID: 6189151120632183870} + - {fileID: 6189151121150595526} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6189151121097661532 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6189151121097661530} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5d5a3b7abfa891b45a3fee95bb3f212d, type: 3} + m_Name: + m_EditorClassIdentifier: + _inputSettings: {fileID: 11400000, guid: 09b165d6ce14f86459be7213da9688a7, type: 2} + _playerInput: {fileID: 6189151121097661533} +--- !u!114 &6189151121097661533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6189151121097661530} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: d4d9eb5db7beac84ca3cb36cfc09cd0a, type: 3} + m_NotificationBehavior: 2 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6189151121097661532} + m_TargetAssemblyTypeName: ArtefactPreview, Assembly-CSharp + m_MethodName: ChangeInput + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionEvents: + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 5c440996-60ec-4084-9223-75d39638108a + m_ActionName: CoreMap/Move[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: d271942b-8516-4550-88ae-552350feb4b1 + m_ActionName: CoreMap/Look[/Mouse/delta] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: da936947-fcfa-4872-a4e3-15763afe56b6 + m_ActionName: CoreMap/Jump[/Keyboard/space] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 2bbc2e93-6016-4544-8399-0c4ee222850c + m_ActionName: CoreMap/Use[/Keyboard/e] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 0eb55067-1328-4b0a-9494-b427befe049a + m_ActionName: CoreMap/Blink[/Keyboard/shift] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6189151121097661532} + m_TargetAssemblyTypeName: ArtefactPreview, Assembly-CSharp + m_MethodName: PreviewEnable + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 5b0a923b-469a-4829-8f31-6fcd7cb49281 + m_ActionName: ArtefactPreview/StartLook[/Mouse/leftButton] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6189151121097661532} + m_TargetAssemblyTypeName: ArtefactPreview, Assembly-CSharp + m_MethodName: PreviewVelocity + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 0a5c2191-e93e-44ba-880e-189b8b33e10a + m_ActionName: ArtefactPreview/LookVelocity[/Mouse/delta] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6189151121097661532} + m_TargetAssemblyTypeName: ArtefactPreview, Assembly-CSharp + m_MethodName: PreviewDelta + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: b118302a-6162-4223-8a6c-38ff2d6b4133 + m_ActionName: ArtefactPreview/New action + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: ArtefactPreview + m_SplitScreenIndex: -1 + m_Camera: {fileID: 6189151120382770202} +--- !u!1 &6189151121150595525 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6189151121150595526} + - component: {fileID: 6189151121150595527} + m_Layer: 0 + m_Name: Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6189151121150595526 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6189151121150595525} + m_LocalRotation: {x: 0.2164396, y: 0, z: 0, w: 0.97629607} + m_LocalPosition: {x: 0, y: 1.2, z: -2.75} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6189151121097661531} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 25, y: 0, z: 0} +--- !u!108 &6189151121150595527 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6189151121150595525} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 0 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 10 + m_Range: 6.5 + m_SpotAngle: 140 + m_InnerSpotAngle: 35 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.02 + m_NormalBias: 0.1 + m_NearPlane: 0.1 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 0 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 diff --git a/game/Assets/Prefabs/Artefacts/ArtefactPreview.prefab.meta b/game/Assets/Prefabs/Artefacts/ArtefactPreview.prefab.meta new file mode 100644 index 0000000..e05401d --- /dev/null +++ b/game/Assets/Prefabs/Artefacts/ArtefactPreview.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1c743cd25da7f2e4991d052bf248b59d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/UI/ArtefactUI.prefab b/game/Assets/Prefabs/UI/ArtefactUI.prefab index 7a94d08..1f5c80d 100644 --- a/game/Assets/Prefabs/UI/ArtefactUI.prefab +++ b/game/Assets/Prefabs/UI/ArtefactUI.prefab @@ -169,8 +169,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 0, y: -100} + m_AnchoredPosition: {x: 0, y: 10} + m_SizeDelta: {x: 0, y: -180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1887929823615277126 CanvasRenderer: @@ -344,6 +344,81 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &1373549360560889263 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 225546873475114317} + - component: {fileID: 6076368130704930974} + - component: {fileID: 8858192759176779836} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &225546873475114317 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1373549360560889263} + 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_Children: [] + m_Father: {fileID: 7371638682713914365} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6076368130704930974 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1373549360560889263} + m_CullTransparentMesh: 1 +--- !u!114 &8858192759176779836 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1373549360560889263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7b8caa72a0c5023478180d21ccf728d0, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1847473709807652412 GameObject: m_ObjectHideFlags: 0 @@ -533,10 +608,10 @@ RectTransform: m_Father: {fileID: 6133269047523877030} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.7, y: 0} + m_AnchorMin: {x: 0.65, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -25, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 1, y: 0.5} --- !u!222 &8098588983769726825 CanvasRenderer: @@ -606,13 +681,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1804033037041769558} + - {fileID: 225546873475114317} m_Father: {fileID: 6133269047523877030} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.7, y: 1} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -25, y: 0} + m_SizeDelta: {x: 960, y: 600} m_Pivot: {x: 0, y: 0.5} --- !u!222 &850119816917587003 CanvasRenderer: @@ -635,14 +711,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7b8caa72a0c5023478180d21ccf728d0, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1030,9 +1106,9 @@ RectTransform: m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 150} - m_SizeDelta: {x: 0, y: -300} + m_SizeDelta: {x: -180, y: 600} m_Pivot: {x: 0.5, y: 0} --- !u!222 &267189355962816471 CanvasRenderer: @@ -1121,6 +1197,30 @@ PrefabInstance: propertyPath: m_text value: Continue objectReference: {fileID: 0} + - target: {fileID: 5361961963888605352, guid: e6408f5c817f33a41a28fec7a44e2120, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5361961963888605352, guid: e6408f5c817f33a41a28fec7a44e2120, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5361961963888605352, guid: e6408f5c817f33a41a28fec7a44e2120, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5361961963888605352, guid: e6408f5c817f33a41a28fec7a44e2120, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: PopUpOff + objectReference: {fileID: 0} + - target: {fileID: 5361961963888605352, guid: e6408f5c817f33a41a28fec7a44e2120, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: PickUpDisplay, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 5361961963888605352, guid: e6408f5c817f33a41a28fec7a44e2120, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 5361961963888605353, guid: e6408f5c817f33a41a28fec7a44e2120, type: 3} propertyPath: m_Pivot.x value: 0.5 diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index e55e30b..b89ee3e 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -2331,15 +2331,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: -0.000000014901161 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.040505264 + value: -0.040505253 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.022064105 + value: 0.0220641 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x @@ -2455,15 +2455,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: -0.000000029802322 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.040505264 + value: -0.040505223 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.022064105 + value: 0.022064082 objectReference: {fileID: 0} - target: {fileID: 4676633832858914730, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_XAxis.m_InvertInput @@ -3458,122 +3458,6 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ef7a51de2c5c5c5438ce6fea733533b2, type: 3} m_PrefabInstance: {fileID: 3060674078099949809} m_PrefabAsset: {fileID: 0} ---- !u!1 &1075378750 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1075378751} - - component: {fileID: 1075378754} - - component: {fileID: 1075378753} - - component: {fileID: 1075378752} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1075378751 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1075378750} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -2.261} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1971608067} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1075378752 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1075378750} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: 0 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 ---- !u!81 &1075378753 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1075378750} - m_Enabled: 1 ---- !u!20 &1075378754 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1075378750} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 8400000, guid: 0fc273c76f186624c8278e4fc863187c, type: 2} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &1083470527 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} @@ -6734,45 +6618,12 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} m_PrefabInstance: {fileID: 3060674079330468791} m_PrefabAsset: {fileID: 0} ---- !u!1 &1971608066 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1971608067} - - component: {fileID: 1971608068} - m_Layer: 0 - m_Name: Preview - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1971608067 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1971608066} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -1337, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1075378751} - m_Father: {fileID: 0} - m_RootOrder: 12 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1971608068 +--- !u!114 &1971608068 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 6189151121097661532, guid: 1c743cd25da7f2e4991d052bf248b59d, type: 3} + m_PrefabInstance: {fileID: 6189151121458120280} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1971608066} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5d5a3b7abfa891b45a3fee95bb3f212d, type: 3} @@ -58567,6 +58418,63 @@ Transform: m_Father: {fileID: 3060674078936265690} m_RootOrder: 538 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &6189151121458120280 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6189151121097661530, guid: 1c743cd25da7f2e4991d052bf248b59d, type: 3} + propertyPath: m_Name + value: Preview + objectReference: {fileID: 0} + - target: {fileID: 6189151121097661531, guid: 1c743cd25da7f2e4991d052bf248b59d, type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 6189151121097661531, guid: 1c743cd25da7f2e4991d052bf248b59d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6189151121097661531, guid: 1c743cd25da7f2e4991d052bf248b59d, type: 3} + propertyPath: m_LocalPosition.y + value: -1337 + objectReference: {fileID: 0} + - target: {fileID: 6189151121097661531, guid: 1c743cd25da7f2e4991d052bf248b59d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6189151121097661531, guid: 1c743cd25da7f2e4991d052bf248b59d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6189151121097661531, guid: 1c743cd25da7f2e4991d052bf248b59d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6189151121097661531, guid: 1c743cd25da7f2e4991d052bf248b59d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6189151121097661531, guid: 1c743cd25da7f2e4991d052bf248b59d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6189151121097661531, guid: 1c743cd25da7f2e4991d052bf248b59d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6189151121097661531, guid: 1c743cd25da7f2e4991d052bf248b59d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6189151121097661531, guid: 1c743cd25da7f2e4991d052bf248b59d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1c743cd25da7f2e4991d052bf248b59d, type: 3} --- !u!1001 &6729456937312671443 PrefabInstance: m_ObjectHideFlags: 0 @@ -58574,34 +58482,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2070784762} m_Modifications: - - target: {fileID: 3868137226220198582, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3868137226220198582, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - target: {fileID: 3868137226220198582, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 2070784758} - - target: {fileID: 3868137226220198582, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3868137226220198582, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: PopUpOff - objectReference: {fileID: 0} - - target: {fileID: 3868137226220198582, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: PickUpDisplay, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 3868137226220198582, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -58696,15 +58580,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7745116228229598630, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3} propertyPath: m_Color.b - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7745116228229598630, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3} propertyPath: m_Color.g - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7745116228229598630, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3} propertyPath: m_Color.r - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3} diff --git a/game/Assets/Scripts/Artefacts/ArtefactPreview.cs b/game/Assets/Scripts/Artefacts/ArtefactPreview.cs index 1ec9a1b..dc5d054 100644 --- a/game/Assets/Scripts/Artefacts/ArtefactPreview.cs +++ b/game/Assets/Scripts/Artefacts/ArtefactPreview.cs @@ -1,16 +1,97 @@ +using System; using System.Collections; using System.Collections.Generic; using System.Security.Cryptography; +using UnityEditorInternal; using UnityEngine; +using UnityEngine.InputSystem; public class ArtefactPreview : MonoBehaviour { + [SerializeField] + private PlayerInputSettings _inputSettings; + + [SerializeField] + private PlayerInput _playerInput; + private GameObject _artefactInstance; + private Quaternion _artefactRotation = Quaternion.identity; + + private bool _isPressed = false; + private bool _useVelocity = false; + private Vector2 _velocity = Vector2.zero; + + private bool Active => gameObject.activeSelf && ( _isPressed && !_useVelocity ); + + public const string PCMR = "PCMR"; + public const string GAMEPAD = "Gamepad"; + + private void OnEnable() + { + ChangeInput( _playerInput ); + } + public void Preview( GameObject artefact ) { if ( _artefactInstance ) Destroy( _artefactInstance ); _artefactInstance = Instantiate( artefact, transform ); + _playerInput.enabled = true; + } + + public void Dismiss() + { + _playerInput.enabled = false; + } + + public void PreviewEnable( InputAction.CallbackContext context ) + { + _isPressed = context.ReadValueAsButton(); + } + + public void PreviewVelocity(InputAction.CallbackContext context) + { + _velocity = context.ReadValue(); + } + + public void PreviewDelta(InputAction.CallbackContext context) + { + if ( _artefactInstance && Active ) + { + Rotate( context.ReadValue() * _inputSettings.MouseSensitivity ); + } + } + + private void Rotate( Vector2 delta ) + { + var axes = new Vector3( delta.y, -delta.x, 0f ); + _artefactInstance.transform.Rotate( axes, Space.World ); + } + + public void ChangeInput( PlayerInput playerInput ) + { + switch ( playerInput.currentControlScheme ) + { + case PCMR: + _useVelocity = false; + break; + + case GAMEPAD: + _useVelocity = true; + break; + + default: + _useVelocity = false; + break; + } + } + + void Update() + { + if ( gameObject.activeSelf && _useVelocity ) + { + Rotate( _velocity * ( Time.deltaTime * _inputSettings.JoypadSensitivity ) ); + } } } diff --git a/game/Assets/Scripts/Artefacts/PickUpDisplay.cs b/game/Assets/Scripts/Artefacts/PickUpDisplay.cs index 4242dbf..ba03b7e 100644 --- a/game/Assets/Scripts/Artefacts/PickUpDisplay.cs +++ b/game/Assets/Scripts/Artefacts/PickUpDisplay.cs @@ -53,6 +53,7 @@ public class PickUpDisplay : MonoBehaviour { _paused = false; artefactUI.SetActive( false ); + _preview.Dismiss(); // inputSettings.updateMode = (InputSettings.UpdateMode)2; chosenArtefact = null; diff --git a/game/Assets/Scripts/Player/PlayerInputSettings.cs b/game/Assets/Scripts/Player/PlayerInputSettings.cs index 68f8415..c5e0b5c 100644 --- a/game/Assets/Scripts/Player/PlayerInputSettings.cs +++ b/game/Assets/Scripts/Player/PlayerInputSettings.cs @@ -8,6 +8,9 @@ public class PlayerInputSettings : ScriptableObject public float JumpBufferTime => _jumpBufferTime; public float BlinkBufferTime => _blinkBufferTime; public float UseBufferTime => _useBufferTime; + + public float MouseSensitivity => _mouseSens; + public float JoypadSensitivity => _joypadSens; [SerializeField] private float _jumpBufferTime; @@ -17,4 +20,10 @@ public class PlayerInputSettings : ScriptableObject [SerializeField] private float _useBufferTime; + + [SerializeField] + private float _mouseSens; + + [SerializeField] + private float _joypadSens; } diff --git a/game/Assets/Settings/Input/PlayerControls.inputactions b/game/Assets/Settings/Input/PlayerControls.inputactions index ffae4f3..02f5510 100644 --- a/game/Assets/Settings/Input/PlayerControls.inputactions +++ b/game/Assets/Settings/Input/PlayerControls.inputactions @@ -202,6 +202,71 @@ "isPartOfComposite": false } ] + }, + { + "name": "ArtefactPreview", + "id": "409607a1-d519-4157-b903-1be98c88f97d", + "actions": [ + { + "name": "LookEnable", + "type": "Button", + "id": "5b0a923b-469a-4829-8f31-6fcd7cb49281", + "expectedControlType": "Button", + "processors": "", + "interactions": "" + }, + { + "name": "LookVelocity", + "type": "Value", + "id": "0a5c2191-e93e-44ba-880e-189b8b33e10a", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "" + }, + { + "name": "LookDelta", + "type": "Value", + "id": "b118302a-6162-4223-8a6c-38ff2d6b4133", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "" + } + ], + "bindings": [ + { + "name": "", + "id": "b83097ff-024e-4b65-be41-3ba7efba3860", + "path": "/leftStick", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "LookVelocity", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8f6aaeba-bba9-4d7f-b719-ed34d2b3c6ba", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": "PCMR", + "action": "LookEnable", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "5117809e-ac3c-4c2e-a974-33d5b2a98710", + "path": "/delta", + "interactions": "", + "processors": "", + "groups": "PCMR", + "action": "LookDelta", + "isComposite": false, + "isPartOfComposite": false + } + ] } ], "controlSchemes": [ diff --git a/game/Assets/Settings/Player/PlayerInputSettings.asset b/game/Assets/Settings/Player/PlayerInputSettings.asset index 6ae14f2..ef08d15 100644 --- a/game/Assets/Settings/Player/PlayerInputSettings.asset +++ b/game/Assets/Settings/Player/PlayerInputSettings.asset @@ -15,3 +15,5 @@ MonoBehaviour: _jumpBufferTime: 0.1 _blinkBufferTime: 0.1 _useBufferTime: 0.1 + _mouseSens: 0.15 + _joypadSens: 1 diff --git a/game/Assets/Textures/PreviewImage.renderTexture b/game/Assets/Textures/PreviewImage.renderTexture index 469b01d..d918de6 100644 --- a/game/Assets/Textures/PreviewImage.renderTexture +++ b/game/Assets/Textures/PreviewImage.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 3 - m_Width: 1280 - m_Height: 720 + m_Width: 960 + m_Height: 600 m_AntiAliasing: 2 m_MipCount: -1 m_DepthFormat: 2