diff --git a/Assets/Controls.cs b/Assets/Controls.cs index 0750a7e..61d9857 100644 --- a/Assets/Controls.cs +++ b/Assets/Controls.cs @@ -50,7 +50,7 @@ public partial class @Controls: IInputActionCollection2, IDisposable { ""name"": """", ""id"": ""7c6f7cf5-4b29-491b-90bc-31f490c3e106"", - ""path"": ""{LeftHand}/{PrimaryButton}"", + ""path"": ""{LeftHand}/primaryButton"", ""interactions"": """", ""processors"": """", ""groups"": """", @@ -109,7 +109,7 @@ public partial class @Controls: IInputActionCollection2, IDisposable { ""name"": """", ""id"": ""b8d8da3f-a26a-4eed-877b-d83e037604b2"", - ""path"": ""{RightHand}/{PrimaryButton}"", + ""path"": ""{RightHand}/primaryButton"", ""interactions"": """", ""processors"": """", ""groups"": """", diff --git a/Assets/Controls.inputactions b/Assets/Controls.inputactions index 2e12530..6140a07 100644 --- a/Assets/Controls.inputactions +++ b/Assets/Controls.inputactions @@ -28,7 +28,7 @@ { "name": "", "id": "7c6f7cf5-4b29-491b-90bc-31f490c3e106", - "path": "{LeftHand}/{PrimaryButton}", + "path": "{LeftHand}/primaryButton", "interactions": "", "processors": "", "groups": "", @@ -87,7 +87,7 @@ { "name": "", "id": "b8d8da3f-a26a-4eed-877b-d83e037604b2", - "path": "{RightHand}/{PrimaryButton}", + "path": "{RightHand}/primaryButton", "interactions": "", "processors": "", "groups": "", diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 99e57ac..956c030 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -122,6 +122,111 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &3039833 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3039834} + - component: {fileID: 3039837} + - component: {fileID: 3039836} + - component: {fileID: 3039835} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3039834 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3039833} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.03, y: 0.03, z: 0.03} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2119851487} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3039835 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3039833} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &3039836 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3039833} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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!33 &3039837 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3039833} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &127360593 GameObject: m_ObjectHideFlags: 0 @@ -212,20 +317,20 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 127360593} - m_LocalRotation: {x: 0.76604444, y: -0, z: -0, w: 0.64278764} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.002, y: 0.002, z: 0.002} + m_LocalScale: {x: 0.002, y: 0.0020000003, z: 0.0020000003} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 906212567} - {fileID: 1062382946} - {fileID: 993587081} - {fileID: 1330552223} - m_Father: {fileID: 2119851487} - m_LocalEulerAnglesHint: {x: 100, y: 0, z: 0} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 1} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &127360598 @@ -240,130 +345,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 66332865853ccdb4d8fa6e9b551c50fc, type: 3} m_Name: m_EditorClassIdentifier: - MenuOpenAction: {fileID: 5711962253243221266, guid: 77f3ce3dc744cf84f8cfde2d4c7a5b99, - type: 3} - OpenTime: 10 ---- !u!1 &250523947 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 250523948} - - component: {fileID: 250523951} - - component: {fileID: 250523950} - - component: {fileID: 250523949} - - component: {fileID: 250523952} - m_Layer: 5 - m_Name: WeaponSelectorCanvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &250523948 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 250523947} - m_LocalRotation: {x: 0.76604444, y: -0, z: -0, w: 0.64278764} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.002, y: 0.002, z: 0.002} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 700975608} - - {fileID: 1940118162} - - {fileID: 1153115432} - - {fileID: 941876298} - m_Father: {fileID: 817740333} - m_LocalEulerAnglesHint: {x: 100, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &250523949 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 250523947} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &250523950 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 250523947} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!223 &250523951 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 250523947} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 330585545} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &250523952 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 250523947} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 66332865853ccdb4d8fa6e9b551c50fc, type: 3} - m_Name: - m_EditorClassIdentifier: - MenuOpenAction: {fileID: 4765465911677436734, guid: 77f3ce3dc744cf84f8cfde2d4c7a5b99, - type: 3} - OpenTime: 10 + headTransform: {fileID: 330585546} + imageTransform: {fileID: 906212567} --- !u!1 &330585543 GameObject: m_ObjectHideFlags: 0 @@ -744,81 +727,6 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 1 ---- !u!1 &700975607 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 700975608} - - component: {fileID: 700975610} - - component: {fileID: 700975609} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &700975608 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 700975607} - 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: 250523948} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &700975609 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 700975607} - 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: 1c9e077f1c3ee8e4b99b323c9cfb35e0, type: 3} - m_Type: 0 - 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!222 &700975610 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 700975607} - m_CullTransparentMesh: 1 --- !u!1 &817740332 GameObject: m_ObjectHideFlags: 0 @@ -849,7 +757,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 250523948} + - {fileID: 1200143048} m_Father: {fileID: 1440101455} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &817740334 @@ -994,141 +902,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 906212566} m_CullTransparentMesh: 1 ---- !u!1 &941876297 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 941876298} - - component: {fileID: 941876300} - - component: {fileID: 941876299} - m_Layer: 5 - m_Name: SHOTGUN (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &941876298 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 941876297} - m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 250523948} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 32, y: -32} - m_SizeDelta: {x: 60, y: 10} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &941876299 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 941876297} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: SHOTGUN - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 486ee658982eb7942baf2f4be1cd42e6, type: 2} - m_sharedMaterial: {fileID: 9121442033925837271, guid: 486ee658982eb7942baf2f4be1cd42e6, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190335 - m_fontColor: {r: 1, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 10 - m_fontSizeBase: 10 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &941876300 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 941876297} - m_CullTransparentMesh: 1 --- !u!1 &993587080 GameObject: m_ObjectHideFlags: 0 @@ -1154,16 +927,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 993587080} - m_LocalRotation: {x: 0, y: 0, z: -0.38268343, w: 0.92387956} + 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: 127360597} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -45} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -32, y: -32} + m_AnchoredPosition: {x: -60, y: 0} m_SizeDelta: {x: 60, y: 10} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &993587082 @@ -1221,7 +994,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 4 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1399,7 +1172,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1062382945} m_CullTransparentMesh: 1 ---- !u!1 &1153115431 +--- !u!1 &1200143047 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1407,133 +1180,103 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1153115432} - - component: {fileID: 1153115434} - - component: {fileID: 1153115433} - m_Layer: 5 - m_Name: SMG(TMP) + - component: {fileID: 1200143048} + - component: {fileID: 1200143051} + - component: {fileID: 1200143050} + - component: {fileID: 1200143049} + m_Layer: 0 + m_Name: Cube m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1153115432 -RectTransform: +--- !u!4 &1200143048 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1153115431} - m_LocalRotation: {x: 0, y: 0, z: -0.38268343, w: 0.92387956} + m_GameObject: {fileID: 1200143047} + serializedVersion: 2 + 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_LocalScale: {x: 0.03, y: 0.03, z: 0.03} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 250523948} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -45} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -32, y: -32} - m_SizeDelta: {x: 60, y: 10} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1153115433 -MonoBehaviour: + m_Father: {fileID: 817740333} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1200143049 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1153115431} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_GameObject: {fileID: 1200143047} 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_text: SMG - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 486ee658982eb7942baf2f4be1cd42e6, type: 2} - m_sharedMaterial: {fileID: 9121442033925837271, guid: 486ee658982eb7942baf2f4be1cd42e6, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: + m_IncludeLayers: serializedVersion: 2 - rgba: 4278190335 - m_fontColor: {r: 1, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: + m_Bits: 0 + m_ExcludeLayers: serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 10 - m_fontSizeBase: 10 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1153115434 -CanvasRenderer: + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1200143050 +MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1153115431} - m_CullTransparentMesh: 1 + m_GameObject: {fileID: 1200143047} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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!33 &1200143051 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1200143047} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1330552222 GameObject: m_ObjectHideFlags: 0 @@ -1559,16 +1302,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1330552222} - m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} + 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: 127360597} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 32, y: -32} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 60, y: 10} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1330552224 @@ -1753,7 +1496,7 @@ Transform: - {fileID: 330585546} m_Father: {fileID: 1440101455} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1940118161 +--- !u!1 &1849942750 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1761,133 +1504,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1940118162} - - component: {fileID: 1940118164} - - component: {fileID: 1940118163} - m_Layer: 5 - m_Name: Pistol (TMP) + - component: {fileID: 1849942752} + - component: {fileID: 1849942751} + m_Layer: 0 + m_Name: ControlsManager m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1940118162 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1940118161} - 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: 250523948} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 36} - m_SizeDelta: {x: 60, y: 10} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1940118163 +--- !u!114 &1849942751 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1940118161} + m_GameObject: {fileID: 1849942750} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: 9657709e2f928b54e868f036ac086edf, 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_text: PISTOL - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 486ee658982eb7942baf2f4be1cd42e6, type: 2} - m_sharedMaterial: {fileID: 9121442033925837271, guid: 486ee658982eb7942baf2f4be1cd42e6, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190335 - m_fontColor: {r: 1, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 10 - m_fontSizeBase: 10 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1940118164 -CanvasRenderer: +--- !u!4 &1849942752 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1940118161} - m_CullTransparentMesh: 1 + m_GameObject: {fileID: 1849942750} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.0165733, y: -0.88677, z: -2.789637} + 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} --- !u!1 &2119851486 GameObject: m_ObjectHideFlags: 0 @@ -1898,6 +1550,7 @@ GameObject: m_Component: - component: {fileID: 2119851487} - component: {fileID: 2119851488} + - component: {fileID: 2119851489} m_Layer: 0 m_Name: Hand (R) m_TagString: Untagged @@ -1918,7 +1571,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 127360597} + - {fileID: 3039834} m_Father: {fileID: 1440101455} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2119851488 @@ -1939,11 +1592,25 @@ MonoBehaviour: m_TrackingType: 0 m_UpdateType: 0 m_UseRelativeTransform: 0 +--- !u!114 &2119851489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2119851486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f36f224393c30a4a9d367e704e551b8, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 410087041} - {fileID: 832575519} + - {fileID: 1849942752} - {fileID: 1440101455} + - {fileID: 127360597} - {fileID: 331359761} diff --git a/Assets/Scripts/ControlsManager.cs b/Assets/Scripts/ControlsManager.cs new file mode 100644 index 0000000..69c3294 --- /dev/null +++ b/Assets/Scripts/ControlsManager.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using UnityEngine; + +namespace Assets.Scripts +{ + internal class ControlsManager : MonoBehaviour + { + public static Controls Controls; + + public void Awake() + { + if (Controls == null) + Controls = new Controls(); + else + Destroy(this); + + Controls.Enable(); + } + + public void Update() + { + Debug.Log(Controls.LeftHand.WeaponSelect.WasPressedThisFrame()); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/ControlsManager.cs.meta b/Assets/Scripts/ControlsManager.cs.meta new file mode 100644 index 0000000..bcdfefa --- /dev/null +++ b/Assets/Scripts/ControlsManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9657709e2f928b54e868f036ac086edf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/Hand.cs b/Assets/Scripts/Player/Hand.cs new file mode 100644 index 0000000..5d4903f --- /dev/null +++ b/Assets/Scripts/Player/Hand.cs @@ -0,0 +1,29 @@ +using Assets.Scripts; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Hand : MonoBehaviour +{ + private WeaponSelectMenu weaponSelectMenu; + + // Start is called before the first frame update + private void Start() + { + weaponSelectMenu = GameObject.FindObjectOfType(); + } + + // Update is called once per frame + private void Update() + { + if (ControlsManager.Controls.RightHand.WeaponSelect.WasPressedThisFrame()) + { + weaponSelectMenu.Show(this); + } + + if (ControlsManager.Controls.RightHand.WeaponSelect.WasReleasedThisFrame()) + { + weaponSelectMenu.Hide(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Player/Hand.cs.meta b/Assets/Scripts/Player/Hand.cs.meta new file mode 100644 index 0000000..96fa763 --- /dev/null +++ b/Assets/Scripts/Player/Hand.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0f36f224393c30a4a9d367e704e551b8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/WeaponSelectMenu.cs b/Assets/Scripts/Player/WeaponSelectMenu.cs index 1ac55a8..5e1ab1e 100644 --- a/Assets/Scripts/Player/WeaponSelectMenu.cs +++ b/Assets/Scripts/Player/WeaponSelectMenu.cs @@ -1,76 +1,96 @@ using System.Collections; using System.Collections.Generic; +using Unity.VisualScripting; using UnityEngine; using UnityEngine.InputSystem; +using UnityEngine.XR; +using static UnityEngine.GraphicsBuffer; public class WeaponSelectMenu : MonoBehaviour { - public InputActionReference MenuOpenAction; - public float OpenTime = 1.0f; + public Transform headTransform; + public Transform imageTransform; - private Vector3 startScale; + private Vector3 originalScale; + private Coroutine currentTransition; - private Coroutine activeCoroutine; + private Hand activeHand; + + private void Awake() + { + originalScale = transform.localScale; + } private void Start() { - startScale = transform.localScale; - - //MenuOpenAction.action.performed += Action_Open; - //MenuOpenAction.action.canceled += Action_Canceled; - - MenuOpenAction.action.actionMap.Enable(); + Hide(); } - private void Action_Open(InputAction.CallbackContext obj) + public void Update() { - if (activeCoroutine == null) - activeCoroutine = StartCoroutine(OpenMenu(OpenTime, startScale)); - } + transform.rotation = Quaternion.LookRotation(transform.position - headTransform.position); - private void Action_Canceled(InputAction.CallbackContext obj) - { - if (activeCoroutine != null) + if (activeHand != null) { - StopCoroutine(activeCoroutine); - activeCoroutine = null; + Vector3 relative = transform.InverseTransformPoint(activeHand.transform.position); + float angle = Mathf.Atan2(relative.x, relative.z) * Mathf.Rad2Deg; + imageTransform.localRotation = Quaternion.Euler(0f, 0f, angle); + } + } + + public void Show(Hand hand) + { + activeHand = hand; + + transform.position = hand.transform.position; + + foreach (Transform t in transform) + { + t.gameObject.SetActive(true); } - activeCoroutine = StartCoroutine(OpenMenu(OpenTime, startScale)); + CancelCurrentTransition(); + currentTransition = StartCoroutine(Co_ScaleTransition(false, 0.3f)); } - private void Update() + public void Hide() { - Vector3 targetScale; + activeHand = null; - if (MenuOpenAction.action.ReadValue() > 0.1f) - { - targetScale = startScale; - } - else - { - targetScale = Vector3.zero; - } - - transform.localScale = Vector3.Lerp(transform.localScale, targetScale, Time.deltaTime * OpenTime); + CancelCurrentTransition(); + currentTransition = StartCoroutine(Co_ScaleTransition(true, 0.3f)); } - private IEnumerator OpenMenu(float duration, Vector3 targetScale) + public void CancelCurrentTransition() { - Vector3 startScale = transform.localScale; - Vector3 endScale = targetScale; + if (currentTransition != null) + StopCoroutine(currentTransition); + } - float t = 0.0f; - while (t < duration) + private IEnumerator Co_ScaleTransition(bool hide, float duration) + { + float timeElapsed = 0; + do { - t += Time.deltaTime; - float normalizedTime = t / duration; - normalizedTime = Easing.Exponential.Out(normalizedTime); + timeElapsed += Time.deltaTime; + float normalizedTime = timeElapsed / duration; - Vector3 scale = Vector3.Lerp(startScale, endScale, normalizedTime); - transform.localScale = scale; + if (hide) + { + transform.localScale = Vector3.Lerp(transform.localScale, Vector3.zero, Easing.Cubic.In(normalizedTime)); + } + else + { + transform.localScale = Vector3.Lerp(transform.localScale, originalScale, Easing.Cubic.Out(normalizedTime)); + } yield return null; } + while (timeElapsed < duration); + + foreach (Transform t in transform) + { + t.gameObject.SetActive(!hide); + } } } \ No newline at end of file diff --git a/Assets/Settings/SampleSceneProfile.asset b/Assets/Settings/SampleSceneProfile.asset index 37e401d..6b87c7d 100644 --- a/Assets/Settings/SampleSceneProfile.asset +++ b/Assets/Settings/SampleSceneProfile.asset @@ -13,81 +13,40 @@ MonoBehaviour: m_Name: Bloom m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 - threshold: - m_OverrideState: 1 - m_Value: 1 - min: 0 - intensity: - m_OverrideState: 1 - m_Value: 1 - min: 0 - scatter: - m_OverrideState: 0 - m_Value: 0.7 - min: 0 - max: 1 - clamp: - m_OverrideState: 0 - m_Value: 65472 - min: 0 - tint: - m_OverrideState: 0 - m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 - highQualityFiltering: - m_OverrideState: 0 - m_Value: 0 skipIterations: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 16 + threshold: + m_OverrideState: 1 + m_Value: 1 + intensity: + m_OverrideState: 1 + m_Value: 1 + scatter: + m_OverrideState: 0 + m_Value: 0.7 + clamp: + m_OverrideState: 0 + m_Value: 65472 + tint: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + highQualityFiltering: + m_OverrideState: 0 + m_Value: 0 + downscale: + m_OverrideState: 0 + m_Value: 0 + maxIterations: + m_OverrideState: 0 + m_Value: 6 dirtTexture: m_OverrideState: 0 m_Value: {fileID: 0} + dimension: 1 dirtIntensity: m_OverrideState: 0 m_Value: 0 - min: 0 ---- !u!114 &-7011558710299706105 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 11500000, guid: 899c54efeace73346a0a16faa3afe726, type: 3} - m_Name: Vignette - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - color: - m_OverrideState: 0 - m_Value: {r: 0, g: 0, b: 0, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 - center: - m_OverrideState: 0 - m_Value: {x: 0.5, y: 0.5} - intensity: - m_OverrideState: 1 - m_Value: 0.25 - min: 0 - max: 1 - smoothness: - m_OverrideState: 1 - m_Value: 0.4 - min: 0.01 - max: 1 - rounded: - m_OverrideState: 0 - m_Value: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -103,7 +62,6 @@ MonoBehaviour: components: - {fileID: 849379129802519247} - {fileID: -7893295128165547882} - - {fileID: -7011558710299706105} --- !u!114 &849379129802519247 MonoBehaviour: m_ObjectHideFlags: 3 @@ -117,7 +75,30 @@ MonoBehaviour: m_Name: Tonemapping m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 1 + neutralHDRRangeReductionMode: + m_OverrideState: 0 + m_Value: 2 + acesPreset: + m_OverrideState: 0 + m_Value: 3 + hueShiftAmount: + m_OverrideState: 0 + m_Value: 0 + detectPaperWhite: + m_OverrideState: 0 + m_Value: 0 + paperWhite: + m_OverrideState: 0 + m_Value: 300 + detectBrightnessLimits: + m_OverrideState: 0 + m_Value: 1 + minNits: + m_OverrideState: 0 + m_Value: 0.005 + maxNits: + m_OverrideState: 0 + m_Value: 1000