1
0
mirror of synced 2024-11-23 22:30:56 +01:00

Fix TouchSampleRate not working issue; Prepare for new touch system

This commit is contained in:
xpeng 2023-05-12 18:03:45 +02:00
parent b4a78058f2
commit 364c9fde40
22 changed files with 9428 additions and 249 deletions

View File

@ -35,7 +35,6 @@ MonoBehaviour:
features:
- {fileID: 7581227243671795047}
- {fileID: -3687958811547312280}
- {fileID: 5471978460094067691}
- {fileID: -660904743828199304}
- {fileID: 587458779450762736}
- {fileID: 2332717924642193878}
@ -43,6 +42,7 @@ MonoBehaviour:
- {fileID: 6760998554925213443}
- {fileID: 3607529374417723074}
- {fileID: 2518257850819104886}
- {fileID: 5471978460094067691}
- {fileID: -9221150314526244616}
m_renderMode: 1
m_depthSubmissionMode: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3487ad0d6389f9d4098e0379af2a7bdc
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,435 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6454538435848927911
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6454538435848927908}
- component: {fileID: 6454538435848927909}
m_Layer: 0
m_Name: Trigger
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6454538435848927908
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6454538435848927911}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 6454538437449875549}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!135 &6454538435848927909
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6454538435848927911}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &6454538436114447007
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6454538436114447004}
m_Layer: 0
m_Name: FrontMarker
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6454538436114447004
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6454538436114447007}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -0.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4295453007505732795}
m_Father: {fileID: 6454538437449875549}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6454538436512006510
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6454538436512006511}
m_Layer: 0
m_Name: Center
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6454538436512006511
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6454538436512006510}
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: 1
m_Children:
- {fileID: 5314117124353818492}
m_Father: {fileID: 6454538437449875549}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6454538437449875548
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6454538437449875549}
- component: {fileID: 6454538437449875546}
- component: {fileID: 6454538437449875547}
m_Layer: 0
m_Name: RadialTouchSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6454538437449875549
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6454538437449875548}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 6454538436114447004}
- {fileID: 6454538437505571571}
- {fileID: 6454538436512006511}
- {fileID: 6454538435848927908}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &6454538437449875546
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6454538437449875548}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &6454538437449875547
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6454538437449875548}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c1179a93b7ed6e3489dfc4ff44f9e7ed, type: 3}
m_Name:
m_EditorClassIdentifier:
Hand: {fileID: 0}
TriggerTransform: {fileID: 6454538435848927908}
FrontCircle: {fileID: 6454538436114447004}
BackCircle: {fileID: 6454538437505571571}
Center: {fileID: 6454538436512006511}
--- !u!1 &6454538437505571570
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6454538437505571571}
m_Layer: 0
m_Name: BackMarker
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6454538437505571571
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6454538437505571570}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.5}
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 5314117126094408932}
m_Father: {fileID: 6454538437449875549}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &3148062441657291909
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6454538436114447004}
m_Modifications:
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4819219486183475463, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_Name
value: VisualCircle
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e3e84c8e92061f540bb6b5de45f6a253, type: 3}
--- !u!4 &4295453007505732795 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
m_PrefabInstance: {fileID: 3148062441657291909}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6454538436011728706
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6454538436512006511}
m_Modifications:
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4819219486183475463, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_Name
value: VisualCircle
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e3e84c8e92061f540bb6b5de45f6a253, type: 3}
--- !u!4 &5314117124353818492 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
m_PrefabInstance: {fileID: 6454538436011728706}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6454538437492288730
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6454538437505571571}
m_Modifications:
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4819219486183475463, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
propertyPath: m_Name
value: VisualCircle
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e3e84c8e92061f540bb6b5de45f6a253, type: 3}
--- !u!4 &5314117126094408932 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
type: 3}
m_PrefabInstance: {fileID: 6454538437492288730}
m_PrefabAsset: {fileID: 0}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3815330c4b5f3ed4cb791195ffa02d47
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,100 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4819219486183475463
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1165493166082121790}
- component: {fileID: 4622111974141767723}
- component: {fileID: 1142653059288628402}
- component: {fileID: 3239989892916474361}
m_Layer: 0
m_Name: VisualCircle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1165493166082121790
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4819219486183475463}
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0.287}
m_LocalScale: {x: 1, y: 0, z: 1}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!33 &4622111974141767723
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4819219486183475463}
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &1142653059288628402
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4819219486183475463}
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!64 &3239989892916474361
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4819219486183475463}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e3e84c8e92061f540bb6b5de45f6a253
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -14,7 +14,8 @@ public class TouchSettingManager : MonoBehaviour
sampleDropdown.onValueChanged.AddListener((int value) => {
string fpsString = Enum.GetName(typeof(CEnum.FPS), value);
Time.fixedDeltaTime = 1 / int.Parse(fpsString.Remove(0, 3));
Time.fixedDeltaTime = 1f / Convert.ToInt32(fpsString.Remove(0, 3));
Debug.Log("Time:" + fpsString);
});
sampleDropdown.onValueChanged?.Invoke(sampleDropdown.value);

View File

@ -0,0 +1,49 @@
using UnityEngine;
using System.IO.Ports;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Collections;
public class DistanceToTouch : MonoBehaviour
{
public LightManager LightManager;
public Transform[] Hands;
private int _insideColliderCount = 0;
private int Area;
private void Start()
{
Area = Convert.ToInt32(gameObject.name);
}
private void Enter()
{
_insideColliderCount += 1;
TouchManager.SetTouch(Area, true);
LightManager.UpdateFadeLight(Area, true);
}
private void Exit()
{
_insideColliderCount -= 1;
_insideColliderCount = Mathf.Max(0, _insideColliderCount);
if (_insideColliderCount == 0)
{
TouchManager.SetTouch(Area, false);
LightManager.UpdateFadeLight(Area, false);
}
}
private void Update()
{
foreach (var hand in Hands)
{
var distance = Vector3.Distance(hand.position, transform.position);
if (distance < 0.1f)
{
//Enter();
//Debug.Log("Enter");
return;
}
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: e918af4dcb18e234c9a8fd3e5d0b5b82
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 163253812e6dfa848b9ba6343296bd21
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,57 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class RadialTouchManager : MonoBehaviour
{
[SerializeField] private Transform Hand;
[SerializeField] private Transform TriggerTransform;
[SerializeField] private Transform FrontCircle;
[SerializeField] private Transform BackCircle;
[SerializeField] private Transform Center;
private float FBScaleDiff = 0f;
private float TriggerDistance = 1f;
private float MaxDistance = 2f;
private float ZPosition = 0f;
void Start()
{
FBScaleDiff = FrontCircle.localScale.x - BackCircle.localScale.x;
}
void Update()
{
TriggerTransform.position = Hand.position;
SetCenterPosition();
SetMaxDistance();
}
private void SetCenterPosition()
{
ZPosition = Mathf.Clamp(TriggerTransform.localPosition.z, -0.5f, 0.5f);
Center.localPosition = new Vector3(
Center.localPosition.x,
Center.localPosition.x,
ZPosition
);
}
private void SetMaxDistance()
{
TriggerDistance = 1 - FBScaleDiff * (ZPosition + 0.5f);
Center.localScale = new Vector3(
TriggerDistance,
TriggerDistance,
TriggerDistance
);
}
private bool IsInRange(Vector3 position)
{
if (position.z < BackCircle.localPosition.z && position.z > FrontCircle.localPosition.z)
return true;
else
return false;
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c1179a93b7ed6e3489dfc4ff44f9e7ed
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -140,8 +140,6 @@ PlayerSettings:
bundleVersion: 0.1
preloadedAssets:
- {fileID: 11400000, guid: 74eeb7429f216ca45a7093c586513e98, type: 2}
- {fileID: -6348321304186183749, guid: 6460523340b221f4ea5611d2c011a26c, type: 2}
- {fileID: -6265376527240436808, guid: 5e2dc0db42cc5b3459a781fecb0b76f9, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1