diff --git a/BlueWater/Assets/01.Scenes/02.Main.unity b/BlueWater/Assets/01.Scenes/02.Main.unity index 5beef1f1a..9ddb9d161 100644 --- a/BlueWater/Assets/01.Scenes/02.Main.unity +++ b/BlueWater/Assets/01.Scenes/02.Main.unity @@ -17,7 +17,7 @@ RenderSettings: m_Fog: 1 m_FogColor: {r: 0.7989498, g: 0.8867924, b: 0.88501716, a: 1} m_FogMode: 3 - m_FogDensity: 0.007 + m_FogDensity: 0.003 m_LinearFogStart: 0 m_LinearFogEnd: 300 m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} @@ -142466,7 +142466,7 @@ Transform: - {fileID: 1019471549} - {fileID: 64749984} - {fileID: 800408618} - - {fileID: 965958328} + - {fileID: 1389301165} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &200595901 @@ -233069,7 +233069,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 100, z: -25} + m_FollowOffset: {x: 0, y: 150, z: -50} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -233168,7 +233168,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} m_Name: m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: -30, z: 0} + m_TrackedObjectOffset: {x: 0, y: -20, z: 0} m_LookaheadTime: 0 m_LookaheadSmoothing: 0 m_LookaheadIgnoreY: 0 @@ -233196,7 +233196,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 100, z: -25} + m_FollowOffset: {x: 0, y: 150, z: -50} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -387862,7 +387862,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 528996743} serializedVersion: 2 - m_LocalRotation: {x: 0.29885435, y: 0.6897434, z: -0.5355092, w: 0.38492864} + m_LocalRotation: {x: 0.36880785, y: 0.6289161, z: -0.44907466, w: 0.51650476} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -396405,7 +396405,7 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_YAxis: - Value: 0.5 + Value: 1 m_SpeedMode: 0 m_MaxSpeed: 0 m_AccelTime: 0.2 @@ -396460,11 +396460,11 @@ MonoBehaviour: m_SplineCurvature: 0.2 m_Orbits: - m_Height: 150 - m_Radius: 30 + m_Radius: 50 - m_Height: 100 - m_Radius: 25 + m_Radius: 60 - m_Height: 60 - m_Radius: 20 + m_Radius: 70 m_LegacyHeadingBias: 3.4028235e+38 m_Rigs: - {fileID: 1485085416} @@ -396479,7 +396479,7 @@ Transform: m_GameObject: {fileID: 541711047} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.277067, y: 100.5, z: -79.0742} + m_LocalPosition: {x: -33.046047, y: 150.5, z: -82.479645} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -444574,6 +444574,133 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 603140054} m_Mesh: {fileID: 4300950, guid: 02ded044b8e0963439276550f50be6f9, type: 3} +--- !u!1 &603250958 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 603250959} + - component: {fileID: 603250962} + - component: {fileID: 603250961} + - component: {fileID: 603250960} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &603250959 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 603250958} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 745028226} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &603250960 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 603250958} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: -10, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0 + m_VerticalDamping: 0 + m_ScreenX: 0.5 + m_ScreenY: 0.6 + m_DeadZoneWidth: 0 + m_DeadZoneHeight: 0 + m_SoftZoneWidth: 0.8 + m_SoftZoneHeight: 0.8 + m_BiasX: 0 + m_BiasY: 0 + m_CenterOnActivate: 1 +--- !u!114 &603250961 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 603250958} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 5 + m_FollowOffset: {x: 0, y: 150, z: -65} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 300 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_LegacyRadius: 3.4028235e+38 + m_LegacyHeightOffset: 3.4028235e+38 + m_LegacyHeadingBias: 3.4028235e+38 + m_HeadingIsSlave: 1 +--- !u!114 &603250962 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 603250958} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &603296481 GameObject: m_ObjectHideFlags: 0 @@ -453470,6 +453597,133 @@ SkinnedMeshRenderer: m_Center: {x: -0.095826715, y: 0.020665929, z: 0.00000014901161} m_Extent: {x: 0.54519904, y: 0.28676152, z: 0.7707151} m_DirtyAABB: 0 +--- !u!1 &616875523 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 616875524} + - component: {fileID: 616875527} + - component: {fileID: 616875526} + - component: {fileID: 616875525} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &616875524 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 616875523} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 957406934} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &616875525 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 616875523} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: -15, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0 + m_VerticalDamping: 0 + m_ScreenX: 0.5 + m_ScreenY: 0.55 + m_DeadZoneWidth: 0 + m_DeadZoneHeight: 0 + m_SoftZoneWidth: 0.8 + m_SoftZoneHeight: 0.8 + m_BiasX: 0 + m_BiasY: 0 + m_CenterOnActivate: 1 +--- !u!114 &616875526 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 616875523} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 5 + m_FollowOffset: {x: 0, y: 150, z: -65} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 300 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_LegacyRadius: 3.4028235e+38 + m_LegacyHeightOffset: 3.4028235e+38 + m_LegacyHeadingBias: 3.4028235e+38 + m_HeadingIsSlave: 1 +--- !u!114 &616875527 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 616875523} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &616932558 GameObject: m_ObjectHideFlags: 0 @@ -517473,133 +517727,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 706286134} m_Mesh: {fileID: 4300430, guid: 02ded044b8e0963439276550f50be6f9, type: 3} ---- !u!1 &706340499 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 706340500} - - component: {fileID: 706340503} - - component: {fileID: 706340502} - - component: {fileID: 706340501} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &706340500 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 706340499} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1261799588} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &706340501 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 706340499} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: -30, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.5 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!114 &706340502 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 706340499} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 60, z: -20} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &706340503 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 706340499} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &706613595 GameObject: m_ObjectHideFlags: 0 @@ -542124,6 +542251,85 @@ Transform: - {fileID: 1971272845} m_Father: {fileID: 1009272738} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &745028225 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 745028226} + - component: {fileID: 745028227} + m_Layer: 0 + m_Name: BottomRig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &745028226 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 745028225} + serializedVersion: 2 + m_LocalRotation: {x: 0.51935977, y: 0.15213497, z: -0.094561435, w: 0.8355708} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 603250959} + m_Father: {fileID: 1389301165} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &745028227 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 745028225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + - Header + - Extensions + - m_Priority + - m_Transitions + - m_Follow + - m_StandbyUpdate + - m_Lens + m_LockStageInInspector: 00000000 + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 40 + OrthographicSize: 10 + NearClipPlane: 0.1 + FarClipPlane: 5000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 603250959} --- !u!1 &745101041 GameObject: m_ObjectHideFlags: 0 @@ -561971,133 +562177,6 @@ SkinnedMeshRenderer: m_Center: {x: -0.088632286, y: 0.020660162, z: 0.00000014901161} m_Extent: {x: 0.5380046, y: 0.28675574, z: 0.7707151} m_DirtyAABB: 0 ---- !u!1 &770439149 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 770439150} - - component: {fileID: 770439153} - - component: {fileID: 770439152} - - component: {fileID: 770439151} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &770439150 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 770439149} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1828754146} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &770439151 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 770439149} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: -15, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.55 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!114 &770439152 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 770439149} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 60, z: -20} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &770439153 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 770439149} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &770462274 GameObject: m_ObjectHideFlags: 0 @@ -625553,7 +625632,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 855975650} serializedVersion: 2 - m_LocalRotation: {x: 0.2899814, y: 0.7017988, z: -0.51960987, w: 0.39165658} + m_LocalRotation: {x: 0.35711122, y: 0.63884616, z: -0.43483227, w: 0.52466005} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -701427,6 +701506,85 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &957406933 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 957406934} + - component: {fileID: 957406935} + m_Layer: 0 + m_Name: MiddleRig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &957406934 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 957406933} + serializedVersion: 2 + m_LocalRotation: {x: 0.538808, y: 0.14987604, z: -0.098102435, w: 0.8231641} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 616875524} + m_Father: {fileID: 1389301165} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &957406935 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 957406933} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + - Header + - Extensions + - m_Priority + - m_Transitions + - m_Follow + - m_StandbyUpdate + - m_Lens + m_LockStageInInspector: 00000000 + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 40 + OrthographicSize: 10 + NearClipPlane: 0.1 + FarClipPlane: 5000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 616875524} --- !u!1 &957662084 GameObject: m_ObjectHideFlags: 0 @@ -707614,146 +707772,6 @@ Transform: - {fileID: 1371259386} m_Father: {fileID: 1233045085} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &965958327 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 965958328} - - component: {fileID: 965958329} - m_Layer: 0 - m_Name: IslandCam - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &965958328 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 965958327} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 29.777853, y: 55.489998, z: -139.46535} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1261799588} - - {fileID: 1828754146} - - {fileID: 968560342} - m_Father: {fileID: 200595900} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &965958329 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 965958327} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 319d2fe34a804e245819465c9505ea59, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: - m_StreamingVersion: 20170927 - m_Priority: 0 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_CommonLens: 1 - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_YAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 2 - m_AccelTime: 0.2 - m_DecelTime: 0.1 - m_InputAxisName: Mouse Y - m_InputAxisValue: 0 - m_InvertInput: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_Wrap: 0 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_YAxisRecentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: Mouse X - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_BindingMode: 5 - m_SplineCurvature: 0.2 - m_Orbits: - - m_Height: 150 - m_Radius: 30 - - m_Height: 100 - m_Radius: 25 - - m_Height: 60 - m_Radius: 20 - m_LegacyHeadingBias: 3.4028235e+38 - m_Rigs: - - {fileID: 1261799589} - - {fileID: 1828754147} - - {fileID: 968560343} --- !u!1 &966111998 GameObject: m_ObjectHideFlags: 0 @@ -709344,85 +709362,6 @@ SkinnedMeshRenderer: m_Center: {x: -3.041955, y: -0.16242945, z: -0.0000010728836} m_Extent: {x: 1.6803727, y: 0.01321359, z: 0.9160816} m_DirtyAABB: 0 ---- !u!1 &968560341 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 968560342} - - component: {fileID: 968560343} - m_Layer: 0 - m_Name: BottomRig - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &968560342 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 968560341} - serializedVersion: 2 - m_LocalRotation: {x: 0.25302756, y: 0.7353853, z: -0.513882, w: 0.36209232} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1260490742} - m_Father: {fileID: 965958328} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &968560343 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 968560341} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 1260490742} --- !u!1 &968904897 GameObject: m_ObjectHideFlags: 0 @@ -760542,6 +760481,133 @@ Transform: - {fileID: 278220077} m_Father: {fileID: 910439240} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1038660712 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1038660713} + - component: {fileID: 1038660716} + - component: {fileID: 1038660715} + - component: {fileID: 1038660714} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1038660713 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038660712} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1354317159} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1038660714 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038660712} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: -20, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0 + m_VerticalDamping: 0 + m_ScreenX: 0.5 + m_ScreenY: 0.5 + m_DeadZoneWidth: 0 + m_DeadZoneHeight: 0 + m_SoftZoneWidth: 0.8 + m_SoftZoneHeight: 0.8 + m_BiasX: 0 + m_BiasY: 0 + m_CenterOnActivate: 1 +--- !u!114 &1038660715 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038660712} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 5 + m_FollowOffset: {x: 0, y: 150, z: -65} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 300 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_LegacyRadius: 3.4028235e+38 + m_LegacyHeightOffset: 3.4028235e+38 + m_LegacyHeadingBias: 3.4028235e+38 + m_HeadingIsSlave: 1 +--- !u!114 &1038660716 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038660712} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1038702561 GameObject: m_ObjectHideFlags: 0 @@ -928896,133 +928962,6 @@ SkinnedMeshRenderer: m_Center: {x: -2.450478, y: -0.037529632, z: -0.011102915} m_Extent: {x: 2.7497826, y: 0.20627628, z: 1.0783304} m_DirtyAABB: 0 ---- !u!1 &1260490741 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1260490742} - - component: {fileID: 1260490745} - - component: {fileID: 1260490744} - - component: {fileID: 1260490743} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1260490742 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1260490741} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 968560342} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1260490743 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1260490741} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: -10, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.6 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!114 &1260490744 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1260490741} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 60, z: -20} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &1260490745 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1260490741} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1260536961 GameObject: m_ObjectHideFlags: 0 @@ -929970,85 +929909,6 @@ SkinnedMeshRenderer: m_Center: {x: -0.06806499, y: -0.041668788, z: 0.00000014901161} m_Extent: {x: 0.5174373, y: 0.34905136, z: 0.7707151} m_DirtyAABB: 0 ---- !u!1 &1261799587 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1261799588} - - component: {fileID: 1261799589} - m_Layer: 0 - m_Name: TopRig - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1261799588 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1261799587} - serializedVersion: 2 - m_LocalRotation: {x: 0.27640846, y: 0.6998094, z: -0.5613672, w: 0.34457523} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 706340500} - m_Father: {fileID: 965958328} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1261799589 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1261799587} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 706340500} --- !u!1 &1261804938 GameObject: m_ObjectHideFlags: 0 @@ -932965,7 +932825,7 @@ Transform: m_GameObject: {fileID: 1266809188} serializedVersion: 2 m_LocalRotation: {x: 0.68862504, y: 0.030224524, z: -0.028751038, w: 0.7239167} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -1.1368684e-13, y: 0, z: -0.0000009536744} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1002233,6 +1002093,85 @@ SkinnedMeshRenderer: m_Center: {x: -0.06254879, y: 0.024880677, z: 0.00000011920929} m_Extent: {x: 0.5167997, y: 0.27444458, z: 0.7707152} m_DirtyAABB: 0 +--- !u!1 &1354317158 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1354317159} + - component: {fileID: 1354317160} + m_Layer: 0 + m_Name: TopRig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1354317159 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354317158} + serializedVersion: 2 + m_LocalRotation: {x: 0.5577791, y: 0.1475574, z: -0.10155658, w: 0.81042933} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1038660713} + m_Father: {fileID: 1389301165} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1354317160 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354317158} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + - Header + - Extensions + - m_Priority + - m_Transitions + - m_Follow + - m_StandbyUpdate + - m_Lens + m_LockStageInInspector: 00000000 + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 40 + OrthographicSize: 10 + NearClipPlane: 0.1 + FarClipPlane: 5000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 1038660713} --- !u!1 &1354500561 GameObject: m_ObjectHideFlags: 0 @@ -1027102,6 +1027041,146 @@ SkinnedMeshRenderer: m_Center: {x: -0.09097171, y: 0.007766843, z: 0.00000014901161} m_Extent: {x: 0.5620061, y: 0.2916174, z: 0.7707151} m_DirtyAABB: 0 +--- !u!1 &1389301164 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1389301165} + - component: {fileID: 1389301166} + m_Layer: 0 + m_Name: IslandCam + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1389301165 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1389301164} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 26.277973, y: 144.99, z: -21.115704} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1354317159} + - {fileID: 957406934} + - {fileID: 745028226} + m_Father: {fileID: 200595900} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1389301166 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1389301164} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 319d2fe34a804e245819465c9505ea59, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 0 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 483111653} + m_Follow: {fileID: 483111653} + m_CommonLens: 1 + m_Lens: + FieldOfView: 40 + OrthographicSize: 10 + NearClipPlane: 0.1 + FarClipPlane: 5000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_YAxis: + Value: 1 + m_SpeedMode: 0 + m_MaxSpeed: 0 + m_AccelTime: 0.2 + m_DecelTime: 0.1 + m_InputAxisName: Mouse Y + m_InputAxisValue: 0 + m_InvertInput: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_Wrap: 0 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_YAxisRecentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 0 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: Mouse X + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_BindingMode: 5 + m_SplineCurvature: 0.2 + m_Orbits: + - m_Height: 150 + m_Radius: 65 + - m_Height: 100 + m_Radius: 60 + - m_Height: 60 + m_Radius: 55 + m_LegacyHeadingBias: 3.4028235e+38 + m_Rigs: + - {fileID: 1354317160} + - {fileID: 957406935} + - {fileID: 745028227} --- !u!1 &1389312160 GameObject: m_ObjectHideFlags: 0 @@ -1097115,7 +1097194,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1485085414} serializedVersion: 2 - m_LocalRotation: {x: 0.31035134, y: 0.67324406, z: -0.55610996, w: 0.37572098} + m_LocalRotation: {x: 0.3802243, y: 0.61875445, z: -0.4629756, w: 0.5081595} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1195055,8 +1195134,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1625123128} serializedVersion: 2 - m_LocalRotation: {x: 0.6753436, y: 0.030742314, z: -0.02819636, w: 0.7363227} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.6753436, y: 0.030742254, z: -0.028196301, w: 0.7363227} + m_LocalPosition: {x: -1.1368684e-13, y: 0, z: -0.0000009536744} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1277551,7 +1277630,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 100, z: -25} + m_FollowOffset: {x: 0, y: 150, z: -50} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -1344060,85 +1344139,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1828426795} m_Mesh: {fileID: 4300936, guid: 02ded044b8e0963439276550f50be6f9, type: 3} ---- !u!1 &1828754145 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1828754146} - - component: {fileID: 1828754147} - m_Layer: 0 - m_Name: MiddleRig - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1828754146 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1828754145} - serializedVersion: 2 - m_LocalRotation: {x: 0.2627075, y: 0.72124887, z: -0.53354126, w: 0.35513183} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 770439150} - m_Father: {fileID: 965958328} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1828754147 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1828754145} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 770439150} --- !u!1 &1828982574 GameObject: m_ObjectHideFlags: 0 diff --git a/BlueWater/Assets/02.Scripts/BlueWater.cs b/BlueWater/Assets/02.Scripts/BlueWater.cs index 2ba2f83b2..80b904d70 100644 --- a/BlueWater/Assets/02.Scripts/BlueWater.cs +++ b/BlueWater/Assets/02.Scripts/BlueWater.cs @@ -127,7 +127,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ""path"": ""/w"", ""interactions"": """", ""processors"": """", - ""groups"": ""Keyboard"", + ""groups"": ""Keyboard&Mouse"", ""action"": ""Move"", ""isComposite"": false, ""isPartOfComposite"": true @@ -138,7 +138,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ""path"": ""/s"", ""interactions"": """", ""processors"": """", - ""groups"": ""Keyboard"", + ""groups"": ""Keyboard&Mouse"", ""action"": ""Move"", ""isComposite"": false, ""isPartOfComposite"": true @@ -149,7 +149,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ""path"": ""/a"", ""interactions"": """", ""processors"": """", - ""groups"": ""Keyboard"", + ""groups"": ""Keyboard&Mouse"", ""action"": ""Move"", ""isComposite"": false, ""isPartOfComposite"": true @@ -160,7 +160,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ""path"": ""/d"", ""interactions"": """", ""processors"": """", - ""groups"": ""Keyboard"", + ""groups"": ""Keyboard&Mouse"", ""action"": ""Move"", ""isComposite"": false, ""isPartOfComposite"": true @@ -171,7 +171,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ""path"": ""/v"", ""interactions"": """", ""processors"": """", - ""groups"": ""Keyboard"", + ""groups"": ""Keyboard&Mouse"", ""action"": ""AssaultMode"", ""isComposite"": false, ""isPartOfComposite"": false @@ -182,7 +182,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ""path"": ""/f"", ""interactions"": """", ""processors"": """", - ""groups"": ""Keyboard"", + ""groups"": ""Keyboard&Mouse"", ""action"": ""Interaction"", ""isComposite"": false, ""isPartOfComposite"": false @@ -193,7 +193,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ""path"": ""/f"", ""interactions"": """", ""processors"": """", - ""groups"": ""Keyboard"", + ""groups"": ""Keyboard&Mouse"", ""action"": ""InteractionHold"", ""isComposite"": false, ""isPartOfComposite"": false @@ -204,7 +204,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ""path"": ""/z"", ""interactions"": """", ""processors"": """", - ""groups"": ""Keyboard"", + ""groups"": ""Keyboard&Mouse"", ""action"": ""Zkey"", ""isComposite"": false, ""isPartOfComposite"": false @@ -215,7 +215,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ""path"": ""/space"", ""interactions"": """", ""processors"": """", - ""groups"": ""Keyboard"", + ""groups"": ""Keyboard&Mouse"", ""action"": ""TakeAim"", ""isComposite"": false, ""isPartOfComposite"": false @@ -226,7 +226,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ""path"": ""/e"", ""interactions"": """", ""processors"": """", - ""groups"": ""Keyboard"", + ""groups"": ""Keyboard&Mouse"", ""action"": ""InteractionE"", ""isComposite"": false, ""isPartOfComposite"": false @@ -237,7 +237,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ""path"": ""/q"", ""interactions"": """", ""processors"": """", - ""groups"": ""Keyboard"", + ""groups"": ""Keyboard&Mouse"", ""action"": ""Targeting"", ""isComposite"": false, ""isPartOfComposite"": false @@ -248,7 +248,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ""path"": ""/q"", ""interactions"": """", ""processors"": """", - ""groups"": ""Keyboard"", + ""groups"": ""Keyboard&Mouse"", ""action"": ""TargetingHold"", ""isComposite"": false, ""isPartOfComposite"": false @@ -365,8 +365,8 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ], ""controlSchemes"": [ { - ""name"": ""Keyboard"", - ""bindingGroup"": ""Keyboard"", + ""name"": ""Keyboard&Mouse"", + ""bindingGroup"": ""Keyboard&Mouse"", ""devices"": [ { ""devicePath"": """", @@ -379,6 +379,17 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ""isOR"": false } ] + }, + { + ""name"": ""Gamepad"", + ""bindingGroup"": ""Gamepad"", + ""devices"": [ + { + ""devicePath"": """", + ""isOptional"": false, + ""isOR"": false + } + ] } ] }"); @@ -676,13 +687,22 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable } } public UnitActions @Unit => new UnitActions(this); - private int m_KeyboardSchemeIndex = -1; - public InputControlScheme KeyboardScheme + private int m_KeyboardMouseSchemeIndex = -1; + public InputControlScheme KeyboardMouseScheme { get { - if (m_KeyboardSchemeIndex == -1) m_KeyboardSchemeIndex = asset.FindControlSchemeIndex("Keyboard"); - return asset.controlSchemes[m_KeyboardSchemeIndex]; + if (m_KeyboardMouseSchemeIndex == -1) m_KeyboardMouseSchemeIndex = asset.FindControlSchemeIndex("Keyboard&Mouse"); + return asset.controlSchemes[m_KeyboardMouseSchemeIndex]; + } + } + private int m_GamepadSchemeIndex = -1; + public InputControlScheme GamepadScheme + { + get + { + if (m_GamepadSchemeIndex == -1) m_GamepadSchemeIndex = asset.FindControlSchemeIndex("Gamepad"); + return asset.controlSchemes[m_GamepadSchemeIndex]; } } public interface IPlayerActions diff --git a/BlueWater/Assets/02.Scripts/BlueWater.inputactions b/BlueWater/Assets/02.Scripts/BlueWater.inputactions index a5153be35..db7fd9bcd 100644 --- a/BlueWater/Assets/02.Scripts/BlueWater.inputactions +++ b/BlueWater/Assets/02.Scripts/BlueWater.inputactions @@ -105,7 +105,7 @@ "path": "/w", "interactions": "", "processors": "", - "groups": "Keyboard", + "groups": "Keyboard&Mouse", "action": "Move", "isComposite": false, "isPartOfComposite": true @@ -116,7 +116,7 @@ "path": "/s", "interactions": "", "processors": "", - "groups": "Keyboard", + "groups": "Keyboard&Mouse", "action": "Move", "isComposite": false, "isPartOfComposite": true @@ -127,7 +127,7 @@ "path": "/a", "interactions": "", "processors": "", - "groups": "Keyboard", + "groups": "Keyboard&Mouse", "action": "Move", "isComposite": false, "isPartOfComposite": true @@ -138,7 +138,7 @@ "path": "/d", "interactions": "", "processors": "", - "groups": "Keyboard", + "groups": "Keyboard&Mouse", "action": "Move", "isComposite": false, "isPartOfComposite": true @@ -149,7 +149,7 @@ "path": "/v", "interactions": "", "processors": "", - "groups": "Keyboard", + "groups": "Keyboard&Mouse", "action": "AssaultMode", "isComposite": false, "isPartOfComposite": false @@ -160,7 +160,7 @@ "path": "/f", "interactions": "", "processors": "", - "groups": "Keyboard", + "groups": "Keyboard&Mouse", "action": "Interaction", "isComposite": false, "isPartOfComposite": false @@ -171,7 +171,7 @@ "path": "/f", "interactions": "", "processors": "", - "groups": "Keyboard", + "groups": "Keyboard&Mouse", "action": "InteractionHold", "isComposite": false, "isPartOfComposite": false @@ -182,7 +182,7 @@ "path": "/z", "interactions": "", "processors": "", - "groups": "Keyboard", + "groups": "Keyboard&Mouse", "action": "Zkey", "isComposite": false, "isPartOfComposite": false @@ -193,7 +193,7 @@ "path": "/space", "interactions": "", "processors": "", - "groups": "Keyboard", + "groups": "Keyboard&Mouse", "action": "TakeAim", "isComposite": false, "isPartOfComposite": false @@ -204,7 +204,7 @@ "path": "/e", "interactions": "", "processors": "", - "groups": "Keyboard", + "groups": "Keyboard&Mouse", "action": "InteractionE", "isComposite": false, "isPartOfComposite": false @@ -215,7 +215,7 @@ "path": "/q", "interactions": "", "processors": "", - "groups": "Keyboard", + "groups": "Keyboard&Mouse", "action": "Targeting", "isComposite": false, "isPartOfComposite": false @@ -226,7 +226,7 @@ "path": "/q", "interactions": "", "processors": "", - "groups": "Keyboard", + "groups": "Keyboard&Mouse", "action": "TargetingHold", "isComposite": false, "isPartOfComposite": false @@ -343,8 +343,8 @@ ], "controlSchemes": [ { - "name": "Keyboard", - "bindingGroup": "Keyboard", + "name": "Keyboard&Mouse", + "bindingGroup": "Keyboard&Mouse", "devices": [ { "devicePath": "", @@ -357,6 +357,17 @@ "isOR": false } ] + }, + { + "name": "Gamepad", + "bindingGroup": "Gamepad", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] } ] } \ No newline at end of file