diff --git a/Assets/Prefabs/Cartridge-Interactable.prefab b/Assets/Prefabs/Cartridge-Interactable.prefab index 954ebda..34c9dbd 100644 --- a/Assets/Prefabs/Cartridge-Interactable.prefab +++ b/Assets/Prefabs/Cartridge-Interactable.prefab @@ -1268,8 +1268,33 @@ MonoBehaviour: m_EditorClassIdentifier: scrollAxis: {x: 0, y: 1, z: 0} scrollScale: 1000 - rotator: {fileID: 6379944510940548408} - scalar: {fileID: 6619281814189739304} + scrollUpdated: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6379944510940548408} + m_TargetAssemblyTypeName: RotateTarget, Assembly-CSharp + m_MethodName: Rotate + 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_Target: {fileID: 6619281814189739304} + m_TargetAssemblyTypeName: ScaleTarget, Assembly-CSharp + m_MethodName: Scale + 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 --- !u!114 &5216593285795032141 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1675,7 +1700,7 @@ MonoBehaviour: target: {fileID: 1943633797168437857} minScale: 1 maxScale: 8 - scaleAxis: {x: 1, y: 1, z: 0} + scaleAxis: {x: 1, y: 0, z: 0} speed: 2 --- !u!1 &3184747893969138918 GameObject: diff --git a/Assets/Scenes/BasicScene.unity b/Assets/Scenes/BasicScene.unity index 4552aeb..28e35bb 100644 --- a/Assets/Scenes/BasicScene.unity +++ b/Assets/Scenes/BasicScene.unity @@ -123,108 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &129871410 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 129871411} - - component: {fileID: 129871414} - - component: {fileID: 129871413} - - component: {fileID: 129871412} - m_Layer: 0 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &129871411 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 129871410} - m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 3.333333, y: 3.333333, z: 3.333333} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 438642243} - m_Father: {fileID: 1727200547} - m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 1.69} - m_SizeDelta: {x: 0.62, y: 0.24} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &129871412 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 129871410} - 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: 4026531895 ---- !u!114 &129871413 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 129871410} - 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 &129871414 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 129871410} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - 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!20 &135570299 stripped Camera: m_CorrespondingSourceObject: {fileID: 731506051283350118, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} @@ -235,165 +133,6 @@ Light: m_CorrespondingSourceObject: {fileID: 4610388823093620668, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} m_PrefabInstance: {fileID: 1835422393} m_PrefabAsset: {fileID: 0} ---- !u!1 &438642242 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 438642243} - - component: {fileID: 438642245} - - component: {fileID: 438642244} - m_Layer: 0 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &438642243 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 438642242} - 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: - - {fileID: 1751926128} - m_Father: {fileID: 129871411} - 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!114 &438642244 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 438642242} - 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: 0} - 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 &438642245 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 438642242} - m_CullTransparentMesh: 1 ---- !u!1 &702377589 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 702377596} - - component: {fileID: 702377595} - - component: {fileID: 702377594} - m_Layer: 0 - m_Name: Cube (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!23 &702377594 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 702377589} - 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: 3627763037591626431, guid: 5daa2e3c4c8d7b948841d963f321a6bf, type: 3} - 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 &702377595 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 702377589} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &702377596 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 702377589} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.789, y: 0.838, z: -0.143} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1520454031 PrefabInstance: m_ObjectHideFlags: 0 @@ -451,457 +190,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3} ---- !u!1 &1727200543 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1727200547} - - component: {fileID: 1727200546} - - component: {fileID: 1727200545} - - component: {fileID: 1727200544} - - component: {fileID: 1727200549} - - component: {fileID: 1727200548} - - component: {fileID: 1727200550} - - component: {fileID: 1727200551} - m_Layer: 0 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!65 &1727200544 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1727200543} - 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 &1727200545 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1727200543} - 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: -1251457731659751925, guid: a013995b2ae21e544bcc487400f8dbd2, type: 3} - 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 &1727200546 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1727200543} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1727200547 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1727200543} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.789, y: 0.838, z: 0.366} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 129871411} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1727200548 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1727200543} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a35f6cfbfba9b548aaa00d52cfe8a50, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 9070320327174004475} - m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_InteractionLayers: - m_Bits: 1 - m_DistanceCalculationMode: 1 - m_SelectMode: 0 - m_FocusMode: 1 - m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 - m_FirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_LastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_HoverEntered: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1727200550} - m_TargetAssemblyTypeName: Interactions.XRScroll, Assembly-CSharp - m_MethodName: OnHoverEntered - 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_HoverExited: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1727200550} - m_TargetAssemblyTypeName: Interactions.XRScroll, Assembly-CSharp - m_MethodName: OnHoverExited - 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_FirstSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_LastSelectExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1727200550} - m_TargetAssemblyTypeName: Interactions.XRScroll, Assembly-CSharp - m_MethodName: OnSelected - 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_SelectExited: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1727200550} - m_TargetAssemblyTypeName: Interactions.XRScroll, Assembly-CSharp - m_MethodName: OnUnSelected - 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_FirstFocusEntered: - m_PersistentCalls: - m_Calls: [] - m_LastFocusExited: - m_PersistentCalls: - m_Calls: [] - m_FocusEntered: - m_PersistentCalls: - m_Calls: [] - m_FocusExited: - m_PersistentCalls: - m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1727200549 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1727200543} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 115f1a2a50d85cd4b9d6dad4c95622be, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Interactable: {fileID: 1727200548} - m_PokeCollider: {fileID: 1727200544} - m_PokeConfiguration: - m_UseConstant: 1 - m_ConstantValue: - m_PokeDirection: 4 - m_InteractionDepthOffset: 0 - m_EnablePokeAngleThreshold: 1 - m_PokeAngleThreshold: 45 - m_Variable: {fileID: 0} ---- !u!114 &1727200550 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1727200543} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3647f60f096e78e428aa74212dd78d08, type: 3} - m_Name: - m_EditorClassIdentifier: - scrollAxis: {x: 0, y: 1, z: 0} - rotator: {fileID: 1727200551} - meshRenderer: {fileID: 1727200545} - onMat: {fileID: 2100000, guid: 55fa12dc7870f1e46b6a7f8617949a86, type: 2} - offMat: {fileID: -1251457731659751925, guid: 44bf690a21e07544387a76c04371e784, type: 3} - text: {fileID: 1751926129} ---- !u!114 &1727200551 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1727200543} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc72b4f7852a9c74fabe878aee3e00dd, type: 3} - m_Name: - m_EditorClassIdentifier: - target: {fileID: 702377596} - speed: -40000 - inputValue: 0 - direction: 0 - invertDirection: 0 ---- !u!1 &1751926127 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1751926128} - - component: {fileID: 1751926130} - - component: {fileID: 1751926129} - m_Layer: 0 - m_Name: DebugText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1751926128 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1751926127} - 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: 438642243} - 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!114 &1751926129 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1751926127} - 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: New Text - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, 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: 0.03 - m_fontSizeBase: 0.03 - 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 &1751926130 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1751926127} - m_CullTransparentMesh: 1 --- !u!1001 &1835422393 PrefabInstance: m_ObjectHideFlags: 0 @@ -980,7 +268,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2193716159056342434, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 59.955 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2193716159056342434, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -1008,7 +296,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2628940897587494939, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2628940897587494939, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -1052,7 +340,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3793489966222958357, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 44.98 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3793489966222958357, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -1080,7 +368,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4781154059652532858, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 60.33 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4781154059652532858, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -1116,7 +404,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5285082825006261282, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5285082825006261282, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -1144,7 +432,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5286286915731469758, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5286286915731469758, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -1172,7 +460,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5333175030132145353, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 44.98 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5333175030132145353, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -1202,6 +490,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5827223565076819818, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6899455370481246272, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -1224,7 +516,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6899455371237737429, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 46.365 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6899455371237737429, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -1252,7 +544,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7343188253292949739, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 59.955 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7343188253292949739, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -1320,7 +612,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8078270248637806159, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8078270248637806159, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -1356,7 +648,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8730039991681176542, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 43.864998 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8730039991681176542, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -1448,17 +740,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} ---- !u!114 &9070320327174004475 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1652381695448977783, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} - m_PrefabInstance: {fileID: 9070320327174004474} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -1466,5 +747,3 @@ SceneRoots: - {fileID: 9070320327174004474} - {fileID: 1835422393} - {fileID: 1520454031} - - {fileID: 1727200547} - - {fileID: 702377596} diff --git a/Assets/Scripts/Interactions/XRScroll.cs b/Assets/Scripts/Interactions/XRScroll.cs index 2a28e8f..f354145 100644 --- a/Assets/Scripts/Interactions/XRScroll.cs +++ b/Assets/Scripts/Interactions/XRScroll.cs @@ -12,9 +12,8 @@ namespace Interactions [SerializeField] private Vector3 scrollAxis = Vector3.up; [SerializeField] private float scrollScale = 1000; - - public RotateTarget rotator; - public ScaleTarget scalar; + + public UnityEvent scrollUpdated; public void OnSelected(SelectEnterEventArgs args) { @@ -39,8 +38,7 @@ namespace Interactions float diffTotal = (diff.x + diff.y + diff.z) * scrollScale; previousPos = currentPos; - rotator.Rotate(diffTotal); - scalar.Scale(diffTotal); + scrollUpdated?.Invoke(diffTotal); } }