From 8a9fe6d33a1a54f30e5e92249b35fa377c36f98d Mon Sep 17 00:00:00 2001 From: xpeng <1216772231@qq.com> Date: Fri, 19 Aug 2022 00:08:42 +0200 Subject: [PATCH] fix fixedtime issue and small adjustment --- Assets/Scenes/MainScene.unity | 383 +++++++++++++++++- Assets/Scripts/ButtonSettingManager.cs | 18 + .../Configurations/CaptureSettingManager.cs | 2 +- .../Configurations/TouchSettingManager.cs | 16 +- Assets/Scripts/RayManager.cs | 3 +- ProjectSettings/ProjectSettings.asset | 6 + 6 files changed, 399 insertions(+), 29 deletions(-) create mode 100644 Assets/Scripts/ButtonSettingManager.cs diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 5bdbeb4..1211659 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -1066,6 +1066,41 @@ RectTransform: m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &183219644 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -6754674874353905211, guid: 4557494e9d4b8ab47b2842d4bf045f25, + type: 3} + m_PrefabInstance: {fileID: 1319828927} + m_PrefabAsset: {fileID: 0} +--- !u!54 &183219648 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183219644} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &183219649 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183219644} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.030000007, y: 0.049999997, z: 1.4210854e-15} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &193094108 GameObject: m_ObjectHideFlags: 0 @@ -1914,6 +1949,41 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 5573111016483601148, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} +--- !u!1 &395035403 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2550463727306718371, guid: 4557494e9d4b8ab47b2842d4bf045f25, + type: 3} + m_PrefabInstance: {fileID: 1319828927} + m_PrefabAsset: {fileID: 0} +--- !u!54 &395035407 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 395035403} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &395035408 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 395035403} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.030000007, y: 0.049999997, z: 1.4210854e-15} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &397456397 GameObject: m_ObjectHideFlags: 0 @@ -2758,6 +2828,41 @@ MonoBehaviour: LHandTransform: {fileID: 475555733} RHandTransform: {fileID: 437658497} PlayerTransform: {fileID: 0} +--- !u!1 &451591346 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7072164525233944939, guid: 4557494e9d4b8ab47b2842d4bf045f25, + type: 3} + m_PrefabInstance: {fileID: 1319828927} + m_PrefabAsset: {fileID: 0} +--- !u!54 &451591350 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 451591346} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &451591351 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 451591346} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0, y: 0.049999997, z: 0.029999994} + m_Center: {x: 0.0000000037252903, y: -1.110223e-16, z: 0} --- !u!1 &452961286 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2009740602367058978, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, @@ -3589,9 +3694,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e988983f96fe1dd48800bcdfc82f23e9, type: 3} m_Name: m_EditorClassIdentifier: - m_LineWidth: 0.005 + m_LineWidth: 0.007 m_OverrideInteractorLineLength: 1 - m_LineLength: 5 + m_LineLength: 4 m_WidthCurve: serializedVersion: 2 m_Curve: @@ -3600,7 +3705,7 @@ MonoBehaviour: value: 1 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 34 weightedMode: 0 inWeight: 0 outWeight: 0 @@ -3609,7 +3714,7 @@ MonoBehaviour: value: 1 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 34 weightedMode: 0 inWeight: 0 outWeight: 0 @@ -3619,7 +3724,7 @@ MonoBehaviour: m_ValidColorGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 0, g: 0.27472398, b: 0.5188679, a: 1} + key1: {r: 0, g: 0.21072307, b: 0.46226418, a: 1} key2: {r: 0, g: 0, b: 0, a: 0} key3: {r: 0, g: 0, b: 0, a: 0} key4: {r: 0, g: 0, b: 0, a: 0} @@ -3648,7 +3753,7 @@ MonoBehaviour: m_InvalidColorGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 0.0025987383, g: 0.47049266, b: 0.6886792, a: 1} + key1: {r: 0.2584905, g: 0.7615539, b: 1, a: 1} key2: {r: 0, g: 0, b: 0, a: 0} key3: {r: 0, g: 0, b: 0, a: 0} key4: {r: 0, g: 0, b: 0, a: 0} @@ -3719,7 +3824,7 @@ LineRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 32767 m_Positions: - {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 1} @@ -3868,7 +3973,7 @@ MonoBehaviour: m_HapticHoverCancelDuration: 0 m_LineType: 0 m_BlendVisualLinePoints: 1 - m_MaxRaycastDistance: 5 + m_MaxRaycastDistance: 4 m_RayOriginTransform: {fileID: 0} m_ReferenceFrame: {fileID: 0} m_Velocity: 16 @@ -4086,6 +4191,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: RaySwitch: 1 + Distance: 0.3 --- !u!1 &580914738 GameObject: m_ObjectHideFlags: 0 @@ -4689,6 +4795,41 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1000, y: 400} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &653750607 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7824128036929741958, guid: 4557494e9d4b8ab47b2842d4bf045f25, + type: 3} + m_PrefabInstance: {fileID: 1319828927} + m_PrefabAsset: {fileID: 0} +--- !u!54 &653750611 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 653750607} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &653750612 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 653750607} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.030000007, y: 8.5265126e-16, z: 0.029999994} + m_Center: {x: 0, y: 0.0000000055879354, z: 0} --- !u!1 &654768017 GameObject: m_ObjectHideFlags: 0 @@ -5595,12 +5736,12 @@ PrefabInstance: - target: {fileID: -717511211058055674, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} propertyPath: m_LocalPosition.y - value: 1.4213 + value: 1.425 objectReference: {fileID: 0} - target: {fileID: -717511211058055674, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} propertyPath: m_LocalPosition.z - value: 0.0719 + value: 0.0706 objectReference: {fileID: 0} - target: {fileID: -380595139111555720, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} @@ -7688,6 +7829,41 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4857189026497640345, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} +--- !u!1 &968833264 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3187005833135410440, guid: 4557494e9d4b8ab47b2842d4bf045f25, + type: 3} + m_PrefabInstance: {fileID: 1319828927} + m_PrefabAsset: {fileID: 0} +--- !u!54 &968833268 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 968833264} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &968833269 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 968833264} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0, y: 0.049999997, z: 0.029999994} + m_Center: {x: -0.0000000037252903, y: 1.110223e-16, z: 0} --- !u!1 &983884837 GameObject: m_ObjectHideFlags: 0 @@ -9896,6 +10072,104 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1260148051 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1260148052} + - component: {fileID: 1260148055} + - component: {fileID: 1260148054} + - component: {fileID: 1260148053} + m_Layer: 0 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1260148052 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260148051} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0, z: 0.678} + m_LocalScale: {x: 0.79999995, y: 0.2, z: 0.79999995} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1585482469} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!136 &1260148053 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260148051} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5000001 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} +--- !u!23 &1260148054 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260148051} + 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 &1260148055 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260148051} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1266541162 GameObject: m_ObjectHideFlags: 0 @@ -10985,6 +11259,41 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0.5, y: 1} +--- !u!1 &1357623540 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7153084331841287435, guid: 4557494e9d4b8ab47b2842d4bf045f25, + type: 3} + m_PrefabInstance: {fileID: 1319828927} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1357623544 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357623540} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &1357623545 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357623540} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.030000007, y: 8.5265126e-16, z: 0.029999994} + m_Center: {x: 0, y: -0.0000000055879354, z: 0} --- !u!1 &1357819456 GameObject: m_ObjectHideFlags: 0 @@ -11129,6 +11438,40 @@ MonoBehaviour: m_Image: {fileID: 0} - m_Text: 144 m_Image: {fileID: 0} + - m_Text: 144 + m_Image: {fileID: 0} + - m_Text: 144 + m_Image: {fileID: 0} + - m_Text: 144 + m_Image: {fileID: 0} + - m_Text: 144 + m_Image: {fileID: 0} + - m_Text: 144 + m_Image: {fileID: 0} + - m_Text: 144 + m_Image: {fileID: 0} + - m_Text: 144 + m_Image: {fileID: 0} + - m_Text: 144 + m_Image: {fileID: 0} + - m_Text: 144 + m_Image: {fileID: 0} + - m_Text: 144 + m_Image: {fileID: 0} + - m_Text: 144 + m_Image: {fileID: 0} + - m_Text: 144 + m_Image: {fileID: 0} + - m_Text: 144 + m_Image: {fileID: 0} + - m_Text: 144 + m_Image: {fileID: 0} + - m_Text: 144 + m_Image: {fileID: 0} + - m_Text: 144 + m_Image: {fileID: 0} + - m_Text: 144 + m_Image: {fileID: 0} m_OnValueChanged: m_PersistentCalls: m_Calls: @@ -12658,9 +13001,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e988983f96fe1dd48800bcdfc82f23e9, type: 3} m_Name: m_EditorClassIdentifier: - m_LineWidth: 0.005 + m_LineWidth: 0.007 m_OverrideInteractorLineLength: 1 - m_LineLength: 5 + m_LineLength: 4 m_WidthCurve: serializedVersion: 2 m_Curve: @@ -12669,7 +13012,7 @@ MonoBehaviour: value: 1 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 34 weightedMode: 0 inWeight: 0 outWeight: 0 @@ -12678,7 +13021,7 @@ MonoBehaviour: value: 1 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 34 weightedMode: 0 inWeight: 0 outWeight: 0 @@ -12688,7 +13031,7 @@ MonoBehaviour: m_ValidColorGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 0, g: 0.27472398, b: 0.5188679, a: 1} + key1: {r: 0, g: 0.21072307, b: 0.46226418, a: 1} key2: {r: 0, g: 0, b: 0, a: 0} key3: {r: 0, g: 0, b: 0, a: 0} key4: {r: 0, g: 0, b: 0, a: 0} @@ -12717,7 +13060,7 @@ MonoBehaviour: m_InvalidColorGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 0.0025987383, g: 0.47049266, b: 0.6886792, a: 1} + key1: {r: 0.2584905, g: 0.7615539, b: 1, a: 1} key2: {r: 0, g: 0, b: 0, a: 0} key3: {r: 0, g: 0, b: 0, a: 0} key4: {r: 0, g: 0, b: 0, a: 0} @@ -12788,7 +13131,7 @@ LineRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 32767 m_Positions: - {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 1} @@ -12937,7 +13280,7 @@ MonoBehaviour: m_HapticHoverCancelDuration: 0 m_LineType: 0 m_BlendVisualLinePoints: 1 - m_MaxRaycastDistance: 5 + m_MaxRaycastDistance: 4 m_RayOriginTransform: {fileID: 0} m_ReferenceFrame: {fileID: 0} m_Velocity: 16 @@ -13155,6 +13498,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: RaySwitch: 1 + Distance: 0.3 --- !u!1 &1481035871 GameObject: m_ObjectHideFlags: 0 @@ -13650,7 +13994,8 @@ Transform: m_LocalPosition: {x: -1.137, y: 1.998, z: 0.2993} m_LocalScale: {x: 0.1, y: 0.1, z: 0.10000001} m_ConstrainProportionsScale: 1 - m_Children: [] + m_Children: + - {fileID: 1260148052} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/ButtonSettingManager.cs b/Assets/Scripts/ButtonSettingManager.cs new file mode 100644 index 0000000..8c649b7 --- /dev/null +++ b/Assets/Scripts/ButtonSettingManager.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ButtonSettingManager : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/Configurations/CaptureSettingManager.cs b/Assets/Scripts/Configurations/CaptureSettingManager.cs index 1886a21..c713d7c 100644 --- a/Assets/Scripts/Configurations/CaptureSettingManager.cs +++ b/Assets/Scripts/Configurations/CaptureSettingManager.cs @@ -60,7 +60,7 @@ public class CaptureSettingManager : MonoBehaviour public void SetCPMode() { - WindowTexture.captureMode = (CaptureMode)Dropdown.value; + WindowTexture.captureMode = (CaptureMode)Dropdown.value - 1; JsonConfig.SetInt("CaptureMode", Dropdown.value); } diff --git a/Assets/Scripts/Configurations/TouchSettingManager.cs b/Assets/Scripts/Configurations/TouchSettingManager.cs index 2149431..7e82658 100644 --- a/Assets/Scripts/Configurations/TouchSettingManager.cs +++ b/Assets/Scripts/Configurations/TouchSettingManager.cs @@ -22,28 +22,28 @@ public class TouchSettingManager : MonoBehaviour switch (Dropdown.value) { case 0: - Time.fixedDeltaTime = 1 / 30; + Time.fixedDeltaTime = 1 / 30f; break; case 1: - Time.fixedDeltaTime = 1 / 60; + Time.fixedDeltaTime = 1 / 60f; break; case 2: - Time.fixedDeltaTime = 1 / 90; + Time.fixedDeltaTime = 1 / 90f; break; case 3: - Time.fixedDeltaTime = 1 / 120; + Time.fixedDeltaTime = 1 / 120f; break; case 4: - Time.fixedDeltaTime = 1 / 140; + Time.fixedDeltaTime = 1 / 140f; break; case 5: - Time.fixedDeltaTime = 1 / 160; + Time.fixedDeltaTime = 1 / 160f; break; case 6: - Time.fixedDeltaTime = 1 / 180; + Time.fixedDeltaTime = 1 / 180f; break; case 7: - Time.fixedDeltaTime = 1 / 200; + Time.fixedDeltaTime = 1 / 200f; break; } JsonConfig.SetInt("TouchFPS", Dropdown.value); diff --git a/Assets/Scripts/RayManager.cs b/Assets/Scripts/RayManager.cs index 7a7cacd..1da128f 100644 --- a/Assets/Scripts/RayManager.cs +++ b/Assets/Scripts/RayManager.cs @@ -6,6 +6,7 @@ using UnityEngine.XR.Interaction.Toolkit; public class RayManager : MonoBehaviour { public bool RaySwitch = true; + public float Distance = 0.3f; XRRayInteractor interactor; XRInteractorLineVisual lineVisual; LineRenderer lineRenderer; @@ -19,7 +20,7 @@ public class RayManager : MonoBehaviour // Update is called once per frame void Update() { - if (gameObject.transform.position.z > 0.2 || !RaySwitch) + if (gameObject.transform.position.z > Distance || !RaySwitch) { interactor.enabled = false; lineRenderer.enabled = false; diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e0def43..6dc7f54 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -149,6 +149,12 @@ PlayerSettings: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 6536100391545742739, guid: 55d1ec7a4296de343b6d3bb6f9a19731, type: 2} + - {fileID: 0} + - {fileID: -6018045015233401694, guid: 3999ab811e936714280a476b3a032d86, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1